359 files changed, 52719 insertions, 35239 deletions

diff --git a/.editorconfig b/.editorconfig
index 55a3c15..13868c6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,3 +7,13 @@ indent_style = space
 indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = false
+
+[**/Makefile*]
+indent_style = tab
+
+[build-outputs.mk]
+indent_style = tab
+
+[build/generator/templates/build-outputs.mk.ezt]
+indent_style = tab
+
diff --git a/.swig_pl_checked b/.swig_pl_checked
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.swig_pl_checked
diff --git a/.swig_py_checked b/.swig_py_checked
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.swig_py_checked
diff --git a/.swig_rb_checked b/.swig_rb_checked
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.swig_rb_checked
diff --git a/CHANGES b/CHANGES
index 66e5b64..08398a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,46 @@
 #   https://svn.apache.org/rXXXXXXX
 #
 # To view an issue listed as (issue #XXXX), visit:
-#   https://issues.apache.org/jira/browse/SVN-XXXX
+#   https://subversion.apache.org/issue-XXXX
+
+Version 1.14.0
+(6 May 2020, from /branches/1.14.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.14.0
+
+ User-visible changes:
+  - Minor new features and improvements:
+    * Experimental shelving feature is now disabled by default (r1875039)
+    * Reinstate support for experimental shelving v2 from SVN 1.11 (r1875037)
+    * Introduce 'svnadmin build-repcache' command (r1875921 et al)
+
+  - Client-side improvements and bugfixes:
+    * Add 'changelist' option to 'svn info --show-item' (r1869481)
+    * Allow simultaneous use of 'svn log' --quiet and --diff options (r1871916)
+    * Fix 'svn info' for file that was inside replaced directory (issue #4837)
+    * Don't abort if the server redirects to a non-canonical URL (r1873375)
+    * Fix merge assertion failure in svn_sort__array_insert (issue #4840)
+    * Escape filenames when invoking $SVN_EDITOR (r1874057 et al)
+    * Small performance optimization for FSFS rep-cache.db (r1875918)
+    * Fix a crash seen when using git-svn with kwallet (r1875680)
+
+  - Server-side improvements and bugfixes:
+    * Fix 'svnadmin load --normalize-props' for versioned properties (r1868203)
+    * mailer.py: prevent SMTP errors from impeding later emails (issue #1804)
+    * mailer.py: Add option to specify the SMTP port to connect to (r1872398)
+    * Make svn-backup-dump.py work on Python 3 
+    * validate-files.py: Fix handling for non-ASCII characters (r1874393)
+    * Fix an undefined behavior problem in FSFS caching code (r1876054)
+
+ Developer-visible changes:
+    * Require at least version 1.5 of APR (r1874094)
+    * Support Python3 in the py-swig bindings; requires py3c (r1869354 et al)
+    * Support building with SWIG 4 on Python 3.x (r1869853)
+    * Fix svnserveautocheck for Python 3 (r1868151)
+    * contribulyze.py: Support Python 3 in addition to Python 2 (r1871211)
+    * Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7 (r1876020)
 
 Version 1.13.0
-(16 Oct 2019, from /branches/1.13.x)
+(30 Oct 2019, from /branches/1.13.x)
 https://svn.apache.org/repos/asf/subversion/tags/1.13.0
 
  User-visible changes:
@@ -1293,7 +1329,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0
     * cache: fix premature eviction due to 64-bit underflows (r1567996 et al)
     * svnserve: fix potential integer overflow in Cyrus SASL support (r1570434)
     * bdb: fix potential integer overflow and underflow (r1570701)
-    * bdb: prevent silent propogation of some corruption (r1570778)
+    * bdb: prevent silent propagation of some corruption (r1570778)
     * svnadmin hotcopy: do not corrupt db/current contents when copying old
       FSFS repos (r1603485)
     * svnadmin hotcopy: don't produce broken copies when a concurrent pack
@@ -1553,7 +1589,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0
       ranges (r1569731)
     * svn_rangelist_inheritable2() and svn_mergeinfo_inheritable2(): fix a
       pool lifetime issue (r1569764)
-    * new APIs to support cancelation during unified diff output and
+    * new APIs to support cancellation during unified diff output and
       allow the context size to be specified (r1570149 et al)
     * APIs related to retrieving logs are now documented to be unlimited when
       a negative value is passed for the limit (r1570330, 1570335)
@@ -1671,7 +1707,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0
     * swig-py: Add close to the core.Stream class (r1619077)
     * javahl: add example clients that use the authn API (r1640533)
     * swig-py: implement dump stream parser (r1642813)
-    * swig-pl: remove some unneded cleanup code that triggered a cleanup
+    * swig-pl: remove some unneeded cleanup code that triggered a cleanup
       failure on windows (r1643072)
     * swig-pl: make cancel_func, cancel_baton parameter pairs work (r1648852)
     * javahl: expose whitespace diff parameters to blame method (issue #4475)
@@ -2002,7 +2038,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.9
   - Client-side bugfixes:
     * log: use proper peg revision over DAV (r1568872)
     * upgrade: allow upgrading from 1.7 with exclusive locks (r1572102 et al)
-    * proplist: resolve inconsitent inherited property results (r1575270 et al)
+    * proplist: resolve inconsistent inherited property results (r1575270 et al)
     * increase minimal timestamp sleep from 1ms to 10ms (r1581305 et al)
     * merge: automatic merge confused by subtree merge (issue #4481)
     * propget: report proper error on invalid revision for url (r1586255)
@@ -2044,7 +2080,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.9
  Developer-visible changes:
   - General:
     * improve consistency checks of DAV inherited property requests (r1498000)
-    * fix ocassional failure in autoprop_tests.py (r1567752)
+    * fix occasional failure in autoprop_tests.py (r1567752)
     * avoid duplicate sqlite analyze information rows (r1571214)
     * add Mavericks to our sysinfo output (r1573088)
     * bump copyright years to 2014 (r1555403)
@@ -2097,7 +2133,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.8
 
  Developer-visible changes:
   - General:
-    * fix ocassional failure of check_tests.py 12 (r1496127 et al)
+    * fix occasional failure of check_tests.py 12 (r1496127 et al)
     * fix failure with SQLite 3.8.1-3.8.3 when built with
       SQLITE_ENABLE_STAT3/4 due to bug in SQLite (r1567286, r1567392)
     * specify SQLite defaults that can be changed when SQLite is built
@@ -2203,7 +2239,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.3
   - Client- and server-side bugfixes:
     * translation updates for Swedish
     * enforce strict version equality between tools and libraries (r1502267)
-    * consistently output revisions as "r%ld" in error messags (r1499044 et al)
+    * consistently output revisions as "r%ld" in error messages (r1499044 et al)
 
   - Client-side bugfixes:
     * status: always use absolute paths in XML output (issue #4398)
@@ -2782,7 +2818,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.7.18
 
  Developer-visible changes:
   - General:
-    * fix ocassional failure in checkout_tests.py test 12. (r1496127)
+    * fix occasional failure in checkout_tests.py test 12. (r1496127)
     * disable building ZLib's assembly optimizations on Windows.
 
 
@@ -3397,7 +3433,7 @@ the 1.6 release:  http://subversion.apache.org/docs/release-notes/1.7.html
     * fixed: wc-to-wc copy of a switch source (issue #1802)
     * fixed: 'svn st' reports symlinks as obstructed items (issue #2284)
     * fixed: 'cd e:\; svn up e:\' fails (issue #2556)
-    * fixed: svn aborts on commiting from root dir on windows (issue #3346)
+    * fixed: svn aborts on committing from root dir on windows (issue #3346)
     * fixed: removing a dir scheduled for deletion corrupts wc (issue #2741)
     * fixed: 'svn cleanup' fails on obstructed paths (issue #2867)
     * fixed: case-only renames resulting from merges don't work (issue #3115)
@@ -3434,7 +3470,7 @@ the 1.6 release:  http://subversion.apache.org/docs/release-notes/1.7.html
     * fixed: 'svn info' returns parent info on missing dirs (issue #3178)
     * fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919)
     * fixed: 'svn --version' fails with non-existent $HOME (issue #3947)
-    * fixed: unforced export silently overwites existing file (issue #3799)
+    * fixed: unforced export silently overwrites existing file (issue #3799)
     * fixed: reverse merge which adds subtree mergeinfo fails (issue #3978)
     * fixed: 'svn up -r{R>HEAD}' hangs client over ra_svn (issue #3963)
     * fixed: 'svn up' updates file externals in target siblings (issue #3819)
@@ -3778,7 +3814,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.6.11
  Developer-visible changes:
   * disable checks for wc-ng working copies when running the test suite
   * on Windows, don't ignore move operation error codes (r896915)
-  * more precise reporting of errors occuring with sqlite init (r927323, -8)
+  * more precise reporting of errors occurring with sqlite init (r927323, -8)
   * ensure rangelist APIs are commutative (r923389, -91)
 
 
@@ -7141,7 +7177,7 @@ Version 0.9 (released 15 Feb 2002, revision 1302)
     - no more 'path styles' in path library
     - rewrite bootstrapping code for python test framework
     - rewrite commandline app's help-system and alias-system
-    - feedback table replaced with notfication callback
+    - feedback table replaced with notification callback
     - rewrite sorting of hashes
     - svnadmin internal rewrite
     - faster post-update processing
diff --git a/COMMITTERS b/COMMITTERS
index 0517bcc..0f982d7 100644
--- a/COMMITTERS
+++ b/COMMITTERS
@@ -63,6 +63,7 @@ Blanket commit access:
       luke1410   Stefan Hett <luke1410@posteo.de>
   troycurtisjr   Troy Curtis, Jr <troycurtisjr@gmail.com>
  hartmannathan   Nathan Hartman <hartman.nathan@gmail.com>
+      futatuki   Yasuhito Futatsuki <futatuki@yf.bsdclub.org>
 
 [[END ACTIVE FULL COMMITTERS.  LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
 
@@ -215,7 +216,6 @@ giorgio_valoti   Giorgio Valoti <giorgio_v@mac.com>          (po: it)
         holden   Holden Karau <holden@pigscanfly.ca>         (scheme-bindings br.)
          moklo   Morten Kloster <morklo@gmail.com>           (diff-improvements br.)
           vmpn   Vladimir Berezniker <vmpn@hitechman.com>    (javahl-ra br.)
-      futatuki   Yasuhito Futatsuki <futatuki@yf.bsdclub.org> (swig-py3 br.)
 
   Subprojects that are complete, abandoned or have moved elsewhere:
 
diff --git a/INSTALL b/INSTALL
index c43003c..64f821a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,7 +3,7 @@
                           A Quick Guide
                ======================================
 
-$LastChangedDate: 2019-06-07 15:01:45 +0000 (Fri, 07 Jun 2019) $
+$LastChangedDate: 2020-02-17 03:49:42 +0000 (Mon, 17 Feb 2020) $
 
 
 Contents:
@@ -96,6 +96,11 @@ I.    INTRODUCTION
          These diff streams are used everywhere -- over the network,
          in the repository, and in the client's working copy.
 
+      * utf8proc  (REQUIRED for client and server)
+      
+         Subversion uses utf8proc for UTF-8 support, including Unicode
+         normalization.
+
       * Apache Serf  (OPTIONAL for client)
 
          The Apache Serf library allows the Subversion client to send HTTP
@@ -116,21 +121,21 @@ I.    INTRODUCTION
 
       * Netwide Assembler (OPTIONAL for client and server)
 
-        The Netwide Assembler (NASM) is used to build the (optionally)
+        The Netwide Assembler (NASM) is used to build the (optional)
         assembler modules of OpenSSL.  As of OpenSSL 1.1.0 NASM is the
         only supported assembler.
 
-      * Berkeley DB (OPTIONAL for client and server)
+      * Berkeley DB (DEPRECATED and OPTIONAL for client and server)
 
-         There are two different repository 'back-end'
-         implementations.  One implementation stores data in a flat
-         filesystem (known as FSFS); the other implementation stores
-         data in a Berkeley DB database (known as BDB).  When you
-         create a repository, you have the option of specifying a
-         storage back-end.  The Berkeley DB back-end will only be
-         available if the BDB libraries are discovered at compile
-         time.  The Berkeley DB back-end has been deprecated and
-         is not recommend.
+         When you create a repository, you have the option of
+         specifying a storage 'back-end' implementation.  Currently,
+         there are two options.  The newer and recommended one, known
+         as FSFS, does not require Berkeley DB.  FSFS stores data in a
+         flat filesystem.  The older implementation, known as BDB, has
+         been deprecated and is not recommended for new repositories,
+         but is still available.  BDB stores data in a Berkeley DB
+         database.  This back-end will only be available if the BDB
+         libraries are discovered at compile time.
 
       * libsasl (OPTIONAL for client and server)
 
@@ -147,6 +152,11 @@ I.    INTRODUCTION
          for other languages, you need to have those languages
          available at build time.
 
+      * py3c (OPTIONAL, but REQUIRED for Python bindings)
+
+        The Python 3 Compatibility Layer for C Extensions is required
+        to build the Python language bindings.
+
       * KDE Framework 5, libsecret, GNOME Keyring (OPTIONAL for client)
 
          Subversion contains optional support for storing passwords in
@@ -162,6 +172,7 @@ I.    INTRODUCTION
          take precedence.
 
 
+
   C. Dependencies in Detail
 
       Subversion depends on a number of third party tools and libraries.
@@ -195,7 +206,7 @@ I.    INTRODUCTION
       commands described in section II.B before installing the following.
 
 
-      1.  Apache Portable Runtime 1.3 or newer  (REQUIRED)
+      1.  Apache Portable Runtime 1.5 or newer  (REQUIRED)
 
       Whenever you want to build any part of Subversion, you need the
       Apache Portable Runtime (APR) and the APR Utility (APR-util)
@@ -249,22 +260,55 @@ I.    INTRODUCTION
       configure script.
 
 
-      2. Zlib  (REQUIRED)
+      2.  SQLite  (REQUIRED)
 
-         Subversion's binary-differencing engine depends on zlib for
-         compression.   Most Unix systems have libz pre-installed, but
-         if you need it, you can get it from
+      Subversion requires SQLite version 3.8.2 or above.  You can meet this
+      dependency several ways:
+        * Use an SQLite amalgamation file.
+        * Specify an SQLite installation to use.
+        * Let Subversion find an installed SQLite.
+
+      To use an SQLite-provided amalgamation, just drop sqlite3.c into
+      Subversion's sqlite-amalgamation/ directory, or point to it with the
+      --with-sqlite configure option.  This file also ships with the Subversion
+      dependencies distribution, or you can download it from SQLite:
+
+          https://www.sqlite.org/download.html
 
-            http://www.zlib.net/
 
+      3.  Zlib  (REQUIRED)
 
-      3.  autoconf 2.59 or newer (Unix only)
+      Subversion's binary-differencing engine depends on zlib for
+      compression.  Most Unix systems have libz pre-installed, but if
+      you need it, you can get it from
+
+          http://www.zlib.net/
+
+
+      4.  utf8proc  (REQUIRED)
+
+      Subversion uses utf8proc for UTF-8 support.  Configure will
+      attempt to locate utf8proc by default using pkg-config and known
+      paths.
+
+      If it is installed in a non-standard location, then use:
+
+        --with-utf8proc=/path/to/libutf8proc
+
+      Alternatively, a copy of utf8proc comes bundled with the
+      Subversion sources.  If configure should use the bundled copy,
+      use:
+
+        --with-utf8proc=internal
+
+
+      5.  autoconf 2.59 or newer (Unix only)
 
       This is required only if you plan to build from the latest source
       (see section II.B). Generally only developers would be doing this.
 
 
-      4.  libtool 1.4 or newer (Unix only)
+      6.  libtool 1.4 or newer (Unix only)
 
       This is required only if you plan to build from the latest source
       (see section II.B).
@@ -273,7 +317,7 @@ I.    INTRODUCTION
       newer. The autogen.sh script knows about that.
 
 
-      5.  Apache Serf library 1.3.4 or newer (OPTIONAL)
+      7.  Apache Serf library 1.3.4 or newer (OPTIONAL)
 
       If you want your client to be able to speak to an Apache
       server (via a http:// or https:// URL), you must link against
@@ -288,12 +332,13 @@ I.    INTRODUCTION
       instead.
 
       Apache Serf can be obtained via your system's package distribution
-      system or directly from http://code.google.com/p/serf/.
+      system or directly from https://serf.apache.org/.
 
       For more information on Apache Serf and Subversion's ra_serf, see the
       file subversion/libsvn_ra_serf/README.
 
-      6. OpenSSL  (OPTIONAL)
+
+      8.  OpenSSL  (OPTIONAL)
 
       ### needs some updates. I think Apache Serf automagically handles
       ### finding OpenSSL, but we may need more docco here. and w.r.t
@@ -339,17 +384,25 @@ I.    INTRODUCTION
           https://www.openssl.org/
 
 
-      7.  Berkeley DB 4.X  (OPTIONAL)
+      9.  Berkeley DB 4.X  (DEPRECATED and OPTIONAL)
+
+      You need the Berkeley DB libraries only if you are building a
+      Subversion server that supports the older BDB repository storage
+      back-end, or a Subversion client that can access local BDB
+      repositories via the file:// URI scheme.
 
-      Berkeley DB is needed to build a Subversion server that supports
-      the BDB repository filesystem, or to access a BDB repository on
-      local disk.  If you will only use the FSFS repository filesystem,
-      or if you are building a Subversion client that will only speak
-      to remote (networked) repositories, you don't need it.
+      The BDB back-end has been deprecated and is not recommended for
+      new repositories.  BDB may be removed in Subversion 2.0.  We
+      recommend the newer FSFS back-end for all new repositories.
+      FSFS does not require the Berkeley DB libraries.
 
-      The current recommended version is 4.4.20 or newer, which brings
-      auto-recovery functionality to the Berkeley DB database
-      environment.
+      If in doubt, the 'svnadmin info' command, added in Subversion
+      1.9, can identify whether an existing repository uses BDB or
+      FSFS.
+
+      The current recommended version of Berkeley DB is 4.4.20 or
+      newer, which brings auto-recovery functionality to the Berkeley
+      DB database environment.
 
       If you must use an older version of Berkeley DB, we *strongly*
       recommend using 4.3 or 4.2 over the 4.1 or 4.0 versions.  Not
@@ -382,7 +435,7 @@ I.    INTRODUCTION
       Look in the "Releases > Windows > Windows BDB" section.
 
 
-      8.  Cyrus SASL library (OPTIONAL)
+      10. Cyrus SASL library (OPTIONAL)
 
       If the Simple Authentication and Security Layer (SASL) library
       is detected on your system, then the Subversion client and
@@ -393,7 +446,7 @@ I.    INTRODUCTION
          http://freshmeat.net/projects/cyrussasl/
 
 
-      9.  Apache Web Server 2.2.X or newer  (OPTIONAL)
+      11. Apache Web Server 2.2.X or newer  (OPTIONAL)
 
           (https://httpd.apache.org/download.cgi)
 
@@ -406,60 +459,81 @@ I.    INTRODUCTION
       is done: See section III for details.
 
 
-      10.  Python 2.7 or newer (https://www.python.org/)  (OPTIONAL)
+      12. Python 3.x or newer (https://www.python.org/)  (OPTIONAL)
 
-      If you want to run "make check" or build from the latest source
-      under Unix/Windows as described in section II.B, II.E and III.D,
-      install Python 2.7 or higher on your system. The majority of the
-      test suite is written in Python, as is part of Subversion's build
-      system.
+      Subversion does not require Python for its basic operation.
+      However, Python is required for building and testing Subversion
+      and for using Subversion's SWIG Python bindings or hook scripts
+      coded in Python.
 
-      Note that Python 3.x is not supported and most likely won't work.
+      The majority of Subversion's test suite is written in Python, as
+      is part of Subversion's build system.
 
+      In more detail, Python is required to do any of the following:
 
-      11. Perl 5.8 or newer (Windows only)  (OPTIONAL)
+      * Use the SWIG Python bindings.
+      * Use the ctypes Python bindings.
+      * Use hook scripts coded in Python.
+      * Build Subversion from a tarball on Unix-like systems and run
+        Subversion's test suite as described in section II.B.
+      * Build Subversion on Windows as described in section II.E.
+      * Build Subversion from a working copy checked out from
+        Subversion's own repository (whether or not running the test
+        suite).
+      * Build the SWIG Python bindings.
+      * Build the ctypes Python bindings.
+      * Testing as described in section III.D.
 
-      To build Subversion under any of the MS Windows platforms, you
-      will also need Perl 5.8 or newer to run apr-util's w32locatedb.pl
-      script.
+      The Python bindings are used by:
 
+      * Third-party programs (e.g., ViewVC)
+      * Scripts distributed with Subversion itself in the tools/
+        subdirectory.
+      * Any in-house scripts you may have.
 
-      12. SQLite  (REQUIRED)
+      Python is NOT required to do any of the following:
 
-      Subversion requires SQLite version 3.8.2 or above.  You can meet this
-      dependency several ways:
-        * Use an SQLite amalgamation file.
-        * Specify an SQLite installation to use.
-        * Let Subversion find an installed SQLite.
+      * Use the core command-line binaries (svn, svnadmin, svnsync,
+        etc.)
+      * Use Subversion's C libraries.
+      * Use any of Subversion's other language bindings.
+      * Build Subversion from a tarball on Unix-like systems without
+        running Subversion's test suite
 
-      To use an SQLite-provided amalgamation, just drop sqlite3.c into
-      Subversion's sqlite-amalgamation/ directory, or point to it with the
-      --with-sqlite configure option.  This file also ships with the Subversion
-      dependencies distribution, or you can download it from SQLite:
+      Although this section calls for Python 3.x, Subversion still
+      technically works with Python 2.7.  However, Support for Python
+      2.7 is being phased out.  As of 1 January 2020, Python 2.7 has
+      reached end of life.  All users are strongly encouraged to move
+      to Python 3.
 
-          https://www.sqlite.org/download.html
+
+      13. Perl 5.8 or newer (Windows only)  (OPTIONAL)
+
+      To build Subversion under any of the MS Windows platforms, you
+      will also need Perl 5.8 or newer to run apr-util's w32locatedb.pl
+      script.
 
 
-      13. pkg-config  (Unix only, OPTIONAL)
+      14. pkg-config  (Unix only, OPTIONAL)
 
       Subversion uses pkg-config to find appropriate options used
       at build time.
 
 
-      14. D-Bus  (Unix only, OPTIONAL)
+      15. D-Bus  (Unix only, OPTIONAL)
 
       D-Bus is a message bus system. D-Bus is required for support for KWallet
       and GNOME Keyring. pkg-config is needed to find D-Bus headers and library.
 
 
-      15. Qt 5 or Qt 4  (Unix only, OPTIONAL)
+      16. Qt 5 or Qt 4  (Unix only, OPTIONAL)
 
       Qt is a cross-platform application framework. QtCore, QtDBus and QtGui
       modules are required for support for KWallet. pkg-config is needed
       to find Qt headers and libraries.
 
 
-      16. KDE 5 Framework libraries or KDELibs 4  (Unix only, OPTIONAL)
+      17. KDE 5 Framework libraries or KDELibs 4  (Unix only, OPTIONAL)
 
       Subversion contains optional support for storing passwords in KWallet.
       Subversion will look for KF5Wallet, KF5CoreAddons, KF5I18n APIs by default,
@@ -474,13 +548,14 @@ I.    INTRODUCTION
 
           --with-kwallet=/path/to/KDE/prefix
 
-      17. GLib 2  (Unix only, OPTIONAL)
+
+      18. GLib 2  (Unix only, OPTIONAL)
 
       GLib is a general-purpose utility library. GLib is required for support
       for GNOME Keyring. pkg-config is needed to find GLib headers and library.
 
 
-      18. GNOME Keyring  (Unix only, OPTIONAL)
+      19. GNOME Keyring  (Unix only, OPTIONAL)
 
       Subversion contains optional support for storing passwords in GNOME Keyring.
       pkg-config is needed to find GNOME Keyring headers and library. D-Bus and
@@ -488,7 +563,7 @@ I.    INTRODUCTION
       then pass the '--with-gnome-keyring' option to `configure`.
 
 
-      19. Ctypesgen  (OPTIONAL)
+      20. Ctypesgen  (OPTIONAL)
 
       Ctypesgen is Python wrapper generator for ctypes. It is used to generate
       a part of Subversion Ctypes Python bindings (CSVN). If you want to build
@@ -499,7 +574,8 @@ I.    INTRODUCTION
 
       For more information on CSVN, see subversion/bindings/ctypes-python/README.
 
-      20. libmagic (OPTIONAL)
+
+      21. libmagic (OPTIONAL)
 
       Subversion's configure script attempts to find libmagic automatically.
       If it is installed in a non-standard location, then use:
@@ -520,6 +596,7 @@ I.    INTRODUCTION
 
         --with-libmagic
 
+
       22. LZ4 (OPTIONAL)
 
       Subversion uses LZ4 compression libary version r129 or above. Configure
@@ -533,6 +610,32 @@ I.    INTRODUCTION
       If configure should use the version bundled with the sources, use:
         --with-lz4=internal
 
+
+      23. py3c (OPTIONAL)
+
+      Subversion uses the Python 3 Compatibility Layer for C
+      Extensions (py3c) library when building the Python language
+      bindings.
+      
+      As py3c is a header-only library, it is needed only to build the
+      bindings, not to use them.
+
+      Configure will attempt to locate py3c by default using
+      pkg-config and known paths.
+
+      If it is installed in a non-standard location, then use:
+
+          --with-py3c=/path/to/py3c/prefix
+
+      The library can be downloaded from GitHub:
+
+          https://github.com/encukou/py3c
+      
+      On Unix systems, you can also use the provided get-deps.sh
+      script to download py3c and several other dependencies; see the
+      top of section I.C for more about get-deps.sh.
+
+
   D. Documentation
 
       The primary documentation for Subversion is the free book
@@ -724,13 +827,12 @@ II.   INSTALLATION
         Edition). Make sure you enable C++ support during setup.
       * Python 2.7 or higher, downloaded from https://www.python.org/ which is
         used to generate the project files.
-        Note that Python 3.x is not supported (yet).
       * Perl 5.8 or higher from https://www.perl.org/get.html
       * Awk (from https://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
         needed to compile Apache.  Note that this is the actual awk program,
         not an installer - just rename it to awk.exe and it is ready to use.
       * Apache apr, apr-util, and optionally apr-iconv libraries, version
-        1.3 or later (1.2 for apr-iconv). If you are building from a Subversion
+        1.5 or later (1.2 for apr-iconv). If you are building from a Subversion
         checkout and have not downloaded Apache 2, then get these 3 libraries
         from https://www.apache.org/dist/apr/.
       * SQLite 3.8.2 or higher from https://www.sqlite.org/download.html
@@ -911,7 +1013,7 @@ II.   INSTALLATION
       C:>nmake -f Makefile.win
       C:>nmake -f Makefile.win install
 
-      Please refere to the build instructions provided by the library source
+      Please refer to the build instructions provided by the library source
       for actual build instructions.
 
       ZLib
@@ -920,7 +1022,7 @@ II.   INSTALLATION
       Building ZLib using Visual Studio should be quite simple. Just open the
       appropriate solution and build the project zlibstat using the IDE.
 
-      Please refere to the build instructions provided by the library source
+      Please refer to the build instructions provided by the library source
       for actual build instructions.
 
       Note that you'd make sure to define ZLIB_WINAPI in the ZLib config
diff --git a/Makefile.in b/Makefile.in
index 17632f0..5eb6f45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -149,11 +149,13 @@ BOOST_TEST_LDFLAGS = @BOOST_LDFLAGS@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@
 
 SWIG = @SWIG@
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
-SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
+SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ @SVN_PY3C_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
 SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
 SWIG_PY_LINK = @SWIG_PY_LINK@
 SWIG_PY_LIBS = @SWIG_PY_LIBS@
+SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@
 SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
+SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@
 SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
 SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ -fno-strict-aliasing
 SWIG_RB_LINK = @SWIG_RB_LINK@
@@ -162,6 +164,7 @@ SWIG_RB_SITE_LIB_DIR = @SWIG_RB_SITE_LIB_DIR@
 SWIG_RB_SITE_ARCH_DIR = @SWIG_RB_SITE_ARCH_DIR@
 SWIG_RB_TEST_VERBOSE = @SWIG_RB_TEST_VERBOSE@
 SWIG_RB_RI_DATADIR = $(DESTDIR)$(datadir)/ri/$(RUBY_MAJOR).$(RUBY_MINOR)/site
+SWIG_RB_ERRMSG = @SWIG_RB_ERRMSG@
 
 CTYPESGEN = @CTYPESGEN@
 CTYPES_PYTHON_SRC_DIR = $(abs_srcdir)/subversion/bindings/ctypes-python
@@ -201,6 +204,7 @@ SWIG_FEATURES = @SWIG_FEATURES@
 SWIG_PY_FEATURES = @SWIG_PY_FEATURES@
 SWIG_PL_FEATURES = @SWIG_PL_FEATURES@
 SWIG_RB_FEATURES = @SWIG_RB_FEATURES@
+SWIG_PY_OPTS = @SWIG_PY_OPTS@
 
 COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
 COMPILE_NOWARN = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CNOWARNFLAGS) $(CFLAGS) $(INCLUDES)
@@ -687,7 +691,7 @@ gcov-reset:
 gcov-clean:
 	rm -f gcov-lcov.dat gcov-lcov.log gcov-genhtml.log
 	rm -rf gcov-report
-	find . -name "*.gcda" -o -name "*.gcno" -exec rm -f -- {} \;
+	find . \( -name "*.gcda" -o -name "*.gcno" \) -exec rm -f -- {} \;
 
 check-clean: gcov-clean
 	if [ -d subversion/tests/cmdline/svn-test-work ]; then \
@@ -909,6 +913,7 @@ EXTRACLEAN_SWIG_PL=rm -f $(SWIG_PL_SRC_DIR)/native/svn_*.c \
 # Makefile does not exist, DO NOT try to make it. But, if it doesn't exist,
 # then the directory is probably clean anyway.
 clean-swig-pl:
+	rm -f .swig_pl_checked
 	if test -z "$(RELEASE_MODE)"; then \
 	  $(EXTRACLEAN_SWIG_PL); \
 	fi
@@ -930,6 +935,7 @@ copy-swig-py: autogen-swig-py $(SWIG_PY_DIR)/libsvn
 	@for f in $(SWIG_PY_SRC_DIR)/*.py $(SWIG_PY_DIR)/*.py; do \
 	  ! [ -f "$$f" ] || cp -pf $$f $(SWIG_PY_DIR)/libsvn; \
 	done
+	@cd $(SWIG_PY_DIR)/libsvn;ln -sf ../.libs/*.so .
 	@touch $(SWIG_PY_DIR)/libsvn/__init__.py
 
 swig-py: autogen-swig-py copy-swig-py
@@ -939,9 +945,10 @@ check-swig-py: swig-py
 	cd $(SWIG_PY_DIR); \
 	  $(PYTHON) $(SWIG_PY_SRC_DIR)/tests/run_all.py
 
-EXTRACLEAN_SWIG_PY=rm -rf $(SWIG_PY_SRC_DIR)/svn_*.c $(SWIG_PY_SRC_DIR)/core.c \
-                          $(SWIG_PY_SRC_DIR)/[a-z]*.py
+EXTRACLEAN_SWIG_PY=rm -rf $(SWIG_PY_DIR)/svn_*.c $(SWIG_PY_DIR)/core.c \
+                          $(SWIG_PY_DIR)/[a-z]*.py
 clean-swig-py:
+	rm -f .swig_py_checked
 	rm -rf $(SWIG_PY_DIR)/libsvn
 	if test -z "$(RELEASE_MODE)"; then \
 	  $(EXTRACLEAN_SWIG_PY); \
@@ -974,6 +981,7 @@ check-swig-rb: swig-rb svnserve
 EXTRACLEAN_SWIG_RB=rm -f $(SWIG_RB_SRC_DIR)/svn_*.c $(SWIG_RB_SRC_DIR)/core.c
 
 clean-swig-rb:
+	rm -f .swig_rb_checked
 	rm -rf $(SWIG_RB_DIR)/test/repos $(SWIG_RB_DIR)/test/wc
 	if test -z "$(RELEASE_MODE)"; then \
 	  $(EXTRACLEAN_SWIG_RB); \
diff --git a/NOTICE b/NOTICE
index 7631b12..a3e794d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Subversion
-Copyright 2019 The Apache Software Foundation
+Copyright 2020 The Apache Software Foundation
 
 This product includes software developed by many people, and distributed
 under Contributor License Agreements to The Apache Software Foundation
diff --git a/aclocal.m4 b/aclocal.m4
index 44b5d03..e198ee6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -44,6 +44,7 @@ sinclude(build/ac-macros/java.m4)
 sinclude(build/ac-macros/sasl.m4)
 sinclude(build/ac-macros/serf.m4)
 sinclude(build/ac-macros/sqlite.m4)
+sinclude(build/ac-macros/py3c.m4)
 sinclude(build/ac-macros/swig.m4)
 sinclude(build/ac-macros/zlib.m4)
 sinclude(build/ac-macros/lz4.m4)
diff --git a/autogen.sh b/autogen.sh
index e1961d6..84a6e2c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -176,7 +176,7 @@ if test -n "$RELEASE_MODE"; then
   "$PYTHON" ./gen-make.py build.conf || gen_failed=1
 
   # Build the SWIG-related files
-  make -f autogen-standalone.mk autogen-swig
+  make -f autogen-standalone.mk autogen-swig || gen_failed=1
 
   # Remove the .swig_checked file
   rm -f .swig_checked
diff --git a/build-outputs.mk b/build-outputs.mk
index c6c07e0..aee2653 100644
--- a/build-outputs.mk
+++ b/build-outputs.mk
@@ -29,15 +29,15 @@ BDB_TEST_DEPS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion
 
 BDB_TEST_PROGRAMS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT)
 
-TEST_DEPS = subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/dav_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/mod_dav_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/pegrev_parse_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/shelf_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnfsfs_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmover_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py
+TEST_DEPS = subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/dav_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/mod_dav_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/pegrev_parse_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/shelf2_tests.py subversion/tests/cmdline/shelf_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnfsfs_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmover_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py
 
-TEST_PROGRAMS = subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/dav_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/mod_dav_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/pegrev_parse_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/shelf_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnfsfs_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmover_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py
+TEST_PROGRAMS = subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/dav_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/mod_dav_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/pegrev_parse_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/shelf2_tests.py subversion/tests/cmdline/shelf_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnfsfs_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmover_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py
 
 check-deps test-deps:  subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/lock-helper$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT)
 
 MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnmucc/svnmucc.1 subversion/svnrdump/svnrdump.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnsync/svnsync.1 subversion/svnversion/svnversion.1
 
-CLEAN_FILES = subversion/bindings/cxx/svnxx-tests$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svnbench/svnbench$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnfsfs/svnfsfs$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnmucc/svnmucc$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/authz_tests.pyc subversion/tests/cmdline/autoprop_tests.pyc subversion/tests/cmdline/basic_tests.pyc subversion/tests/cmdline/blame_tests.pyc subversion/tests/cmdline/cat_tests.pyc subversion/tests/cmdline/changelist_tests.pyc subversion/tests/cmdline/checkout_tests.pyc subversion/tests/cmdline/commit_tests.pyc subversion/tests/cmdline/copy_tests.pyc subversion/tests/cmdline/dav_tests.pyc subversion/tests/cmdline/depth_tests.pyc subversion/tests/cmdline/diff_tests.pyc subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/entries_tests.pyc subversion/tests/cmdline/export_tests.pyc subversion/tests/cmdline/externals_tests.pyc subversion/tests/cmdline/getopt_tests.pyc subversion/tests/cmdline/history_tests.pyc subversion/tests/cmdline/import_tests.pyc subversion/tests/cmdline/info_tests.pyc subversion/tests/cmdline/input_validation_tests.pyc subversion/tests/cmdline/iprop_authz_tests.pyc subversion/tests/cmdline/iprop_tests.pyc subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/cmdline/lock_tests.pyc subversion/tests/cmdline/log_tests.pyc subversion/tests/cmdline/merge_authz_tests.pyc subversion/tests/cmdline/merge_automatic_tests.pyc subversion/tests/cmdline/merge_reintegrate_tests.pyc subversion/tests/cmdline/merge_tests.pyc subversion/tests/cmdline/merge_tree_conflict_tests.pyc subversion/tests/cmdline/mergeinfo_tests.pyc subversion/tests/cmdline/mod_authz_svn_tests.pyc subversion/tests/cmdline/mod_dav_svn_tests.pyc subversion/tests/cmdline/move_tests.pyc subversion/tests/cmdline/patch_tests.pyc subversion/tests/cmdline/pegrev_parse_tests.pyc subversion/tests/cmdline/prop_tests.pyc subversion/tests/cmdline/redirect_tests.pyc subversion/tests/cmdline/relocate_tests.pyc subversion/tests/cmdline/resolve_tests.pyc subversion/tests/cmdline/revert_tests.pyc subversion/tests/cmdline/schedule_tests.pyc subversion/tests/cmdline/shelf_tests.pyc subversion/tests/cmdline/special_tests.pyc subversion/tests/cmdline/stat_tests.pyc subversion/tests/cmdline/svnadmin_tests.pyc subversion/tests/cmdline/svnauthz_tests.pyc subversion/tests/cmdline/svndumpfilter_tests.pyc subversion/tests/cmdline/svnfsfs_tests.pyc subversion/tests/cmdline/svnlook_tests.pyc subversion/tests/cmdline/svnmover_tests.pyc subversion/tests/cmdline/svnmucc_tests.pyc subversion/tests/cmdline/svnrdump_tests.pyc subversion/tests/cmdline/svnsync_authz_tests.pyc subversion/tests/cmdline/svnsync_tests.pyc subversion/tests/cmdline/svnversion_tests.pyc subversion/tests/cmdline/switch_tests.pyc subversion/tests/cmdline/trans_tests.pyc subversion/tests/cmdline/tree_conflict_tests.pyc subversion/tests/cmdline/update_tests.pyc subversion/tests/cmdline/upgrade_tests.pyc subversion/tests/cmdline/wc_tests.pyc subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/dev/x509-parser$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT)
+CLEAN_FILES = subversion/bindings/cxx/svnxx-tests$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svnbench/svnbench$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnfsfs/svnfsfs$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnmucc/svnmucc$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/authz_tests.pyc subversion/tests/cmdline/autoprop_tests.pyc subversion/tests/cmdline/basic_tests.pyc subversion/tests/cmdline/blame_tests.pyc subversion/tests/cmdline/cat_tests.pyc subversion/tests/cmdline/changelist_tests.pyc subversion/tests/cmdline/checkout_tests.pyc subversion/tests/cmdline/commit_tests.pyc subversion/tests/cmdline/copy_tests.pyc subversion/tests/cmdline/dav_tests.pyc subversion/tests/cmdline/depth_tests.pyc subversion/tests/cmdline/diff_tests.pyc subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/entries_tests.pyc subversion/tests/cmdline/export_tests.pyc subversion/tests/cmdline/externals_tests.pyc subversion/tests/cmdline/getopt_tests.pyc subversion/tests/cmdline/history_tests.pyc subversion/tests/cmdline/import_tests.pyc subversion/tests/cmdline/info_tests.pyc subversion/tests/cmdline/input_validation_tests.pyc subversion/tests/cmdline/iprop_authz_tests.pyc subversion/tests/cmdline/iprop_tests.pyc subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/cmdline/lock_tests.pyc subversion/tests/cmdline/log_tests.pyc subversion/tests/cmdline/merge_authz_tests.pyc subversion/tests/cmdline/merge_automatic_tests.pyc subversion/tests/cmdline/merge_reintegrate_tests.pyc subversion/tests/cmdline/merge_tests.pyc subversion/tests/cmdline/merge_tree_conflict_tests.pyc subversion/tests/cmdline/mergeinfo_tests.pyc subversion/tests/cmdline/mod_authz_svn_tests.pyc subversion/tests/cmdline/mod_dav_svn_tests.pyc subversion/tests/cmdline/move_tests.pyc subversion/tests/cmdline/patch_tests.pyc subversion/tests/cmdline/pegrev_parse_tests.pyc subversion/tests/cmdline/prop_tests.pyc subversion/tests/cmdline/redirect_tests.pyc subversion/tests/cmdline/relocate_tests.pyc subversion/tests/cmdline/resolve_tests.pyc subversion/tests/cmdline/revert_tests.pyc subversion/tests/cmdline/schedule_tests.pyc subversion/tests/cmdline/shelf2_tests.pyc subversion/tests/cmdline/shelf_tests.pyc subversion/tests/cmdline/special_tests.pyc subversion/tests/cmdline/stat_tests.pyc subversion/tests/cmdline/svnadmin_tests.pyc subversion/tests/cmdline/svnauthz_tests.pyc subversion/tests/cmdline/svndumpfilter_tests.pyc subversion/tests/cmdline/svnfsfs_tests.pyc subversion/tests/cmdline/svnlook_tests.pyc subversion/tests/cmdline/svnmover_tests.pyc subversion/tests/cmdline/svnmucc_tests.pyc subversion/tests/cmdline/svnrdump_tests.pyc subversion/tests/cmdline/svnsync_authz_tests.pyc subversion/tests/cmdline/svnsync_tests.pyc subversion/tests/cmdline/svnversion_tests.pyc subversion/tests/cmdline/switch_tests.pyc subversion/tests/cmdline/trans_tests.pyc subversion/tests/cmdline/tree_conflict_tests.pyc subversion/tests/cmdline/update_tests.pyc subversion/tests/cmdline/upgrade_tests.pyc subversion/tests/cmdline/wc_tests.pyc subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/dev/x509-parser$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT)
 EXTRACLEAN_FILES = subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_fs_x/rep-cache-db.h subversion/libsvn_subr/internal_statements.h subversion/libsvn_wc/wc-queries.h subversion/tests/libsvn_wc/wc-test-queries.h \
   $(abs_builddir)/subversion/libsvn_subr/errorcode.inc \
   $(abs_builddir)/subversion/libsvn_subr/config_keys.inc \
@@ -63,15 +63,45 @@ RELEASE_MODE = 1
 # Section 3: SWIG autogen rules
 ########################################
 
-autogen-swig-py: subversion/bindings/swig/python/core.c subversion/bindings/swig/python/svn_client.c subversion/bindings/swig/python/svn_delta.c subversion/bindings/swig/python/svn_diff.c subversion/bindings/swig/python/svn_fs.c subversion/bindings/swig/python/svn_ra.c subversion/bindings/swig/python/svn_repos.c subversion/bindings/swig/python/svn_wc.c
+.swig_py_checked:
+	@if [ -n "$(SWIG_PY_ERRMSG)" ]; then \
+	  echo "SWIG python disabled at configure time: $(SWIG_PY_ERRMSG)" >&2; \
+	  exit 1; \
+	fi
+	@touch $@
+
+autogen-swig-py: .swig_py_checked  subversion/bindings/swig/python/core.c subversion/bindings/swig/python/svn_client.c subversion/bindings/swig/python/svn_delta.c subversion/bindings/swig/python/svn_diff.c subversion/bindings/swig/python/svn_fs.c subversion/bindings/swig/python/svn_ra.c subversion/bindings/swig/python/svn_repos.c subversion/bindings/swig/python/svn_wc.c
 autogen-swig: autogen-swig-py
 
-autogen-swig-pl: subversion/bindings/swig/perl/native/core.c subversion/bindings/swig/perl/native/svn_client.c subversion/bindings/swig/perl/native/svn_delta.c subversion/bindings/swig/perl/native/svn_diff.c subversion/bindings/swig/perl/native/svn_fs.c subversion/bindings/swig/perl/native/svn_ra.c subversion/bindings/swig/perl/native/svn_repos.c subversion/bindings/swig/perl/native/svn_wc.c
+# Ensure the swig build targets depend on the configuration check
+swig-py: .swig_py_checked
+
+.swig_pl_checked:
+	@if [ -n "$(SWIG_PL_ERRMSG)" ]; then \
+	  echo "SWIG perl disabled at configure time: $(SWIG_PL_ERRMSG)" >&2; \
+	  exit 1; \
+	fi
+	@touch $@
+
+autogen-swig-pl: .swig_pl_checked  subversion/bindings/swig/perl/native/core.c subversion/bindings/swig/perl/native/svn_client.c subversion/bindings/swig/perl/native/svn_delta.c subversion/bindings/swig/perl/native/svn_diff.c subversion/bindings/swig/perl/native/svn_fs.c subversion/bindings/swig/perl/native/svn_ra.c subversion/bindings/swig/perl/native/svn_repos.c subversion/bindings/swig/perl/native/svn_wc.c
 autogen-swig: autogen-swig-pl
 
-autogen-swig-rb: subversion/bindings/swig/ruby/core.c subversion/bindings/swig/ruby/svn_client.c subversion/bindings/swig/ruby/svn_delta.c subversion/bindings/swig/ruby/svn_diff.c subversion/bindings/swig/ruby/svn_fs.c subversion/bindings/swig/ruby/svn_ra.c subversion/bindings/swig/ruby/svn_repos.c subversion/bindings/swig/ruby/svn_wc.c
+# Ensure the swig build targets depend on the configuration check
+swig-pl: .swig_pl_checked
+
+.swig_rb_checked:
+	@if [ -n "$(SWIG_RB_ERRMSG)" ]; then \
+	  echo "SWIG ruby disabled at configure time: $(SWIG_RB_ERRMSG)" >&2; \
+	  exit 1; \
+	fi
+	@touch $@
+
+autogen-swig-rb: .swig_rb_checked  subversion/bindings/swig/ruby/core.c subversion/bindings/swig/ruby/svn_client.c subversion/bindings/swig/ruby/svn_delta.c subversion/bindings/swig/ruby/svn_diff.c subversion/bindings/swig/ruby/svn_fs.c subversion/bindings/swig/ruby/svn_ra.c subversion/bindings/swig/ruby/svn_repos.c subversion/bindings/swig/ruby/svn_wc.c
 autogen-swig: autogen-swig-rb
 
+# Ensure the swig build targets depend on the configuration check
+swig-rb: .swig_rb_checked
+
 
 
 ########################################
@@ -274,10 +304,10 @@ subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT): $(fs_fs_pack_test_DEPS)
 	cd subversion/tests/libsvn_fs_fs && $(LINK) $(fs_fs_pack_test_LDFLAGS) -o fs-fs-pack-test$(EXEEXT)  $(fs_fs_pack_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la ../../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
 fs_fs_private_test_PATH = subversion/tests/libsvn_fs_fs
-fs_fs_private_test_DEPS = subversion/tests/libsvn_fs_fs/fs-fs-private-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_subr/libsvn_subr-1.la
+fs_fs_private_test_DEPS = subversion/tests/libsvn_fs_fs/fs-fs-private-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_fs_fs/libsvn_fs_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_subr/libsvn_subr-1.la
 fs_fs_private_test_OBJECTS = fs-fs-private-test.lo
 subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT): $(fs_fs_private_test_DEPS)
-	cd subversion/tests/libsvn_fs_fs && $(LINK) $(fs_fs_private_test_LDFLAGS) -o fs-fs-private-test$(EXEEXT)  $(fs_fs_private_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+	cd subversion/tests/libsvn_fs_fs && $(LINK) $(fs_fs_private_test_LDFLAGS) -o fs-fs-private-test$(EXEEXT)  $(fs_fs_private_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la ../../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
 fs_sequential_test_PATH = subversion/tests/libsvn_fs
 fs_sequential_test_DEPS = subversion/tests/libsvn_fs/fs-sequential-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_fs_util/libsvn_fs_util-1.la subversion/libsvn_subr/libsvn_subr-1.la
@@ -408,8 +438,8 @@ subversion/libsvn_auth_kwallet/libsvn_auth_kwallet-1.la: $(libsvn_auth_kwallet_D
 	cd subversion/libsvn_auth_kwallet && $(LINK_SHARED_ONLY_CXX_LIB) $(libsvn_auth_kwallet_LDFLAGS) -o libsvn_auth_kwallet-1.la $(LT_NO_UNDEFINED) $(libsvn_auth_kwallet_OBJECTS) ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(SVN_KWALLET_LIBS) $(LIBS)
 
 libsvn_client_PATH = subversion/libsvn_client
-libsvn_client_DEPS = subversion/libsvn_client/add.lo subversion/libsvn_client/blame.lo subversion/libsvn_client/cat.lo subversion/libsvn_client/changelist.lo subversion/libsvn_client/checkout.lo subversion/libsvn_client/cleanup.lo subversion/libsvn_client/cmdline.lo subversion/libsvn_client/commit.lo subversion/libsvn_client/commit_util.lo subversion/libsvn_client/compat_providers.lo subversion/libsvn_client/conflicts.lo subversion/libsvn_client/copy.lo subversion/libsvn_client/ctx.lo subversion/libsvn_client/delete.lo subversion/libsvn_client/deprecated.lo subversion/libsvn_client/diff.lo subversion/libsvn_client/diff_local.lo subversion/libsvn_client/diff_summarize.lo subversion/libsvn_client/export.lo subversion/libsvn_client/externals.lo subversion/libsvn_client/import.lo subversion/libsvn_client/info.lo subversion/libsvn_client/iprops.lo subversion/libsvn_client/layout.lo subversion/libsvn_client/list.lo subversion/libsvn_client/locking_commands.lo subversion/libsvn_client/log.lo subversion/libsvn_client/merge.lo subversion/libsvn_client/merge_elements.lo subversion/libsvn_client/mergeinfo.lo subversion/libsvn_client/mtcc.lo subversion/libsvn_client/patch.lo subversion/libsvn_client/prop_commands.lo subversion/libsvn_client/ra.lo subversion/libsvn_client/relocate.lo subversion/libsvn_client/repos_diff.lo subversion/libsvn_client/resolved.lo subversion/libsvn_client/revert.lo subversion/libsvn_client/revisions.lo subversion/libsvn_client/shelf.lo subversion/libsvn_client/status.lo subversion/libsvn_client/switch.lo subversion/libsvn_client/update.lo subversion/libsvn_client/upgrade.lo subversion/libsvn_client/url.lo subversion/libsvn_client/util.lo subversion/libsvn_client/version.lo subversion/libsvn_client/wc_editor.lo subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la
-libsvn_client_OBJECTS = add.lo blame.lo cat.lo changelist.lo checkout.lo cleanup.lo cmdline.lo commit.lo commit_util.lo compat_providers.lo conflicts.lo copy.lo ctx.lo delete.lo deprecated.lo diff.lo diff_local.lo diff_summarize.lo export.lo externals.lo import.lo info.lo iprops.lo layout.lo list.lo locking_commands.lo log.lo merge.lo merge_elements.lo mergeinfo.lo mtcc.lo patch.lo prop_commands.lo ra.lo relocate.lo repos_diff.lo resolved.lo revert.lo revisions.lo shelf.lo status.lo switch.lo update.lo upgrade.lo url.lo util.lo version.lo wc_editor.lo
+libsvn_client_DEPS = subversion/libsvn_client/add.lo subversion/libsvn_client/blame.lo subversion/libsvn_client/cat.lo subversion/libsvn_client/changelist.lo subversion/libsvn_client/checkout.lo subversion/libsvn_client/cleanup.lo subversion/libsvn_client/cmdline.lo subversion/libsvn_client/commit.lo subversion/libsvn_client/commit_util.lo subversion/libsvn_client/compat_providers.lo subversion/libsvn_client/conflicts.lo subversion/libsvn_client/copy.lo subversion/libsvn_client/ctx.lo subversion/libsvn_client/delete.lo subversion/libsvn_client/deprecated.lo subversion/libsvn_client/diff.lo subversion/libsvn_client/diff_local.lo subversion/libsvn_client/diff_summarize.lo subversion/libsvn_client/export.lo subversion/libsvn_client/externals.lo subversion/libsvn_client/import.lo subversion/libsvn_client/info.lo subversion/libsvn_client/iprops.lo subversion/libsvn_client/layout.lo subversion/libsvn_client/list.lo subversion/libsvn_client/locking_commands.lo subversion/libsvn_client/log.lo subversion/libsvn_client/merge.lo subversion/libsvn_client/merge_elements.lo subversion/libsvn_client/mergeinfo.lo subversion/libsvn_client/mtcc.lo subversion/libsvn_client/patch.lo subversion/libsvn_client/prop_commands.lo subversion/libsvn_client/ra.lo subversion/libsvn_client/relocate.lo subversion/libsvn_client/repos_diff.lo subversion/libsvn_client/resolved.lo subversion/libsvn_client/revert.lo subversion/libsvn_client/revisions.lo subversion/libsvn_client/shelf.lo subversion/libsvn_client/shelf2.lo subversion/libsvn_client/status.lo subversion/libsvn_client/switch.lo subversion/libsvn_client/update.lo subversion/libsvn_client/upgrade.lo subversion/libsvn_client/url.lo subversion/libsvn_client/util.lo subversion/libsvn_client/version.lo subversion/libsvn_client/wc_editor.lo subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la
+libsvn_client_OBJECTS = add.lo blame.lo cat.lo changelist.lo checkout.lo cleanup.lo cmdline.lo commit.lo commit_util.lo compat_providers.lo conflicts.lo copy.lo ctx.lo delete.lo deprecated.lo diff.lo diff_local.lo diff_summarize.lo export.lo externals.lo import.lo info.lo iprops.lo layout.lo list.lo locking_commands.lo log.lo merge.lo merge_elements.lo mergeinfo.lo mtcc.lo patch.lo prop_commands.lo ra.lo relocate.lo repos_diff.lo resolved.lo revert.lo revisions.lo shelf.lo shelf2.lo status.lo switch.lo update.lo upgrade.lo url.lo util.lo version.lo wc_editor.lo
 subversion/libsvn_client/libsvn_client-1.la: $(libsvn_client_DEPS)
 	cd subversion/libsvn_client && $(LINK_LIB) $(libsvn_client_LDFLAGS) -o libsvn_client-1.la $(LT_NO_UNDEFINED) $(libsvn_client_OBJECTS) ../../subversion/libsvn_wc/libsvn_wc-1.la ../../subversion/libsvn_ra/libsvn_ra-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_diff/libsvn_diff-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
@@ -858,8 +888,8 @@ subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT): $(subst_translate_te
 	cd subversion/tests/libsvn_subr && $(LINK) $(subst_translate_test_LDFLAGS) -o subst_translate-test$(EXEEXT)  $(subst_translate_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
 svn_PATH = subversion/svn
-svn_DEPS = subversion/svn/add-cmd.lo subversion/svn/auth-cmd.lo subversion/svn/blame-cmd.lo subversion/svn/cat-cmd.lo subversion/svn/changelist-cmd.lo subversion/svn/checkout-cmd.lo subversion/svn/cl-conflicts.lo subversion/svn/cleanup-cmd.lo subversion/svn/commit-cmd.lo subversion/svn/conflict-callbacks.lo subversion/svn/copy-cmd.lo subversion/svn/delete-cmd.lo subversion/svn/deprecated.lo subversion/svn/diff-cmd.lo subversion/svn/export-cmd.lo subversion/svn/file-merge.lo subversion/svn/filesize.lo subversion/svn/help-cmd.lo subversion/svn/import-cmd.lo subversion/svn/info-cmd.lo subversion/svn/list-cmd.lo subversion/svn/lock-cmd.lo subversion/svn/log-cmd.lo subversion/svn/merge-cmd.lo subversion/svn/mergeinfo-cmd.lo subversion/svn/mkdir-cmd.lo subversion/svn/move-cmd.lo subversion/svn/notify.lo subversion/svn/patch-cmd.lo subversion/svn/propdel-cmd.lo subversion/svn/propedit-cmd.lo subversion/svn/propget-cmd.lo subversion/svn/proplist-cmd.lo subversion/svn/props.lo subversion/svn/propset-cmd.lo subversion/svn/relocate-cmd.lo subversion/svn/resolve-cmd.lo subversion/svn/resolved-cmd.lo subversion/svn/revert-cmd.lo subversion/svn/shelf-cmd.lo subversion/svn/similarity.lo subversion/svn/status-cmd.lo subversion/svn/status.lo subversion/svn/svn.lo subversion/svn/switch-cmd.lo subversion/svn/unlock-cmd.lo subversion/svn/update-cmd.lo subversion/svn/upgrade-cmd.lo subversion/svn/util.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la
-svn_OBJECTS = add-cmd.lo auth-cmd.lo blame-cmd.lo cat-cmd.lo changelist-cmd.lo checkout-cmd.lo cl-conflicts.lo cleanup-cmd.lo commit-cmd.lo conflict-callbacks.lo copy-cmd.lo delete-cmd.lo deprecated.lo diff-cmd.lo export-cmd.lo file-merge.lo filesize.lo help-cmd.lo import-cmd.lo info-cmd.lo list-cmd.lo lock-cmd.lo log-cmd.lo merge-cmd.lo mergeinfo-cmd.lo mkdir-cmd.lo move-cmd.lo notify.lo patch-cmd.lo propdel-cmd.lo propedit-cmd.lo propget-cmd.lo proplist-cmd.lo props.lo propset-cmd.lo relocate-cmd.lo resolve-cmd.lo resolved-cmd.lo revert-cmd.lo shelf-cmd.lo similarity.lo status-cmd.lo status.lo svn.lo switch-cmd.lo unlock-cmd.lo update-cmd.lo upgrade-cmd.lo util.lo
+svn_DEPS = subversion/svn/add-cmd.lo subversion/svn/auth-cmd.lo subversion/svn/blame-cmd.lo subversion/svn/cat-cmd.lo subversion/svn/changelist-cmd.lo subversion/svn/checkout-cmd.lo subversion/svn/cl-conflicts.lo subversion/svn/cleanup-cmd.lo subversion/svn/commit-cmd.lo subversion/svn/conflict-callbacks.lo subversion/svn/copy-cmd.lo subversion/svn/delete-cmd.lo subversion/svn/deprecated.lo subversion/svn/diff-cmd.lo subversion/svn/export-cmd.lo subversion/svn/file-merge.lo subversion/svn/filesize.lo subversion/svn/help-cmd.lo subversion/svn/import-cmd.lo subversion/svn/info-cmd.lo subversion/svn/list-cmd.lo subversion/svn/lock-cmd.lo subversion/svn/log-cmd.lo subversion/svn/merge-cmd.lo subversion/svn/mergeinfo-cmd.lo subversion/svn/mkdir-cmd.lo subversion/svn/move-cmd.lo subversion/svn/notify.lo subversion/svn/patch-cmd.lo subversion/svn/propdel-cmd.lo subversion/svn/propedit-cmd.lo subversion/svn/propget-cmd.lo subversion/svn/proplist-cmd.lo subversion/svn/props.lo subversion/svn/propset-cmd.lo subversion/svn/relocate-cmd.lo subversion/svn/resolve-cmd.lo subversion/svn/resolved-cmd.lo subversion/svn/revert-cmd.lo subversion/svn/shelf-cmd.lo subversion/svn/shelf2-cmd.lo subversion/svn/similarity.lo subversion/svn/status-cmd.lo subversion/svn/status.lo subversion/svn/svn.lo subversion/svn/switch-cmd.lo subversion/svn/unlock-cmd.lo subversion/svn/update-cmd.lo subversion/svn/upgrade-cmd.lo subversion/svn/util.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la
+svn_OBJECTS = add-cmd.lo auth-cmd.lo blame-cmd.lo cat-cmd.lo changelist-cmd.lo checkout-cmd.lo cl-conflicts.lo cleanup-cmd.lo commit-cmd.lo conflict-callbacks.lo copy-cmd.lo delete-cmd.lo deprecated.lo diff-cmd.lo export-cmd.lo file-merge.lo filesize.lo help-cmd.lo import-cmd.lo info-cmd.lo list-cmd.lo lock-cmd.lo log-cmd.lo merge-cmd.lo mergeinfo-cmd.lo mkdir-cmd.lo move-cmd.lo notify.lo patch-cmd.lo propdel-cmd.lo propedit-cmd.lo propget-cmd.lo proplist-cmd.lo props.lo propset-cmd.lo relocate-cmd.lo resolve-cmd.lo resolved-cmd.lo revert-cmd.lo shelf-cmd.lo shelf2-cmd.lo similarity.lo status-cmd.lo status.lo svn.lo switch-cmd.lo unlock-cmd.lo update-cmd.lo upgrade-cmd.lo util.lo
 subversion/svn/svn$(EXEEXT): $(svn_DEPS)
 	cd subversion/svn && $(LINK) $(svn_LDFLAGS) -o svn$(EXEEXT)  $(svn_OBJECTS) ../../subversion/libsvn_client/libsvn_client-1.la ../../subversion/libsvn_wc/libsvn_wc-1.la ../../subversion/libsvn_ra/libsvn_ra-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_diff/libsvn_diff-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
@@ -2296,82 +2326,82 @@ subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChanne
 subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo: subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl__pre_perl.h subversion/bindings/swig/proxy/swig_perl_external_runtime.swg subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_SWIG_PL) $(canonicalized_srcdir)subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
 
-subversion/bindings/swig/perl/native/core.lo: subversion/bindings/swig/perl/native/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/perl/native/core.lo: subversion/bindings/swig/perl/native/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/core.c
 
-subversion/bindings/swig/perl/native/svn_client.lo: subversion/bindings/swig/perl/native/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
+subversion/bindings/swig/perl/native/svn_client.lo: subversion/bindings/swig/perl/native/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
 	$(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_client.c
 
-subversion/bindings/swig/perl/native/svn_delta.lo: subversion/bindings/swig/perl/native/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/perl/native/svn_delta.lo: subversion/bindings/swig/perl/native/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_delta.c
 
-subversion/bindings/swig/perl/native/svn_diff.lo: subversion/bindings/swig/perl/native/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/perl/native/svn_diff.lo: subversion/bindings/swig/perl/native/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_diff.c
 
-subversion/bindings/swig/perl/native/svn_fs.lo: subversion/bindings/swig/perl/native/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/perl/native/svn_fs.lo: subversion/bindings/swig/perl/native/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_fs.c
 
-subversion/bindings/swig/perl/native/svn_ra.lo: subversion/bindings/swig/perl/native/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/perl/native/svn_ra.lo: subversion/bindings/swig/perl/native/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_ra.c
 
-subversion/bindings/swig/perl/native/svn_repos.lo: subversion/bindings/swig/perl/native/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/perl/native/svn_repos.lo: subversion/bindings/swig/perl/native/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_repos.c
 
-subversion/bindings/swig/perl/native/svn_wc.lo: subversion/bindings/swig/perl/native/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
+subversion/bindings/swig/perl/native/svn_wc.lo: subversion/bindings/swig/perl/native/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
 	$(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_wc.c
 
-subversion/bindings/swig/python/core.lo: subversion/bindings/swig/python/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/python/core.lo: subversion/bindings/swig/python/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/core.c
 
-subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/proxy/swig_python_external_runtime.swg subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/proxy/swig_python_external_runtime.swg subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_SWIG_PY) $(canonicalized_srcdir)subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
 
-subversion/bindings/swig/python/svn_client.lo: subversion/bindings/swig/python/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
+subversion/bindings/swig/python/svn_client.lo: subversion/bindings/swig/python/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
 	$(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_client.c
 
-subversion/bindings/swig/python/svn_delta.lo: subversion/bindings/swig/python/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/python/svn_delta.lo: subversion/bindings/swig/python/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_delta.c
 
-subversion/bindings/swig/python/svn_diff.lo: subversion/bindings/swig/python/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/python/svn_diff.lo: subversion/bindings/swig/python/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_diff.c
 
-subversion/bindings/swig/python/svn_fs.lo: subversion/bindings/swig/python/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/python/svn_fs.lo: subversion/bindings/swig/python/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_fs.c
 
-subversion/bindings/swig/python/svn_ra.lo: subversion/bindings/swig/python/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/python/svn_ra.lo: subversion/bindings/swig/python/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_ra.c
 
-subversion/bindings/swig/python/svn_repos.lo: subversion/bindings/swig/python/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/python/svn_repos.lo: subversion/bindings/swig/python/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_repos.c
 
-subversion/bindings/swig/python/svn_wc.lo: subversion/bindings/swig/python/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
+subversion/bindings/swig/python/svn_wc.lo: subversion/bindings/swig/python/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
 	$(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_wc.c
 
-subversion/bindings/swig/ruby/core.lo: subversion/bindings/swig/ruby/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/ruby/core.lo: subversion/bindings/swig/ruby/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/core.c
 
 subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.lo: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_nls.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_SWIG_RB) $(canonicalized_srcdir)subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
 
-subversion/bindings/swig/ruby/svn_client.lo: subversion/bindings/swig/ruby/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
+subversion/bindings/swig/ruby/svn_client.lo: subversion/bindings/swig/ruby/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
 	$(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_client.c
 
-subversion/bindings/swig/ruby/svn_delta.lo: subversion/bindings/swig/ruby/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/ruby/svn_delta.lo: subversion/bindings/swig/ruby/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_delta.c
 
-subversion/bindings/swig/ruby/svn_diff.lo: subversion/bindings/swig/ruby/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/ruby/svn_diff.lo: subversion/bindings/swig/ruby/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_diff.c
 
-subversion/bindings/swig/ruby/svn_fs.lo: subversion/bindings/swig/ruby/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/ruby/svn_fs.lo: subversion/bindings/swig/ruby/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_fs.c
 
-subversion/bindings/swig/ruby/svn_ra.lo: subversion/bindings/swig/ruby/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/ruby/svn_ra.lo: subversion/bindings/swig/ruby/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_ra.c
 
-subversion/bindings/swig/ruby/svn_repos.lo: subversion/bindings/swig/ruby/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/bindings/swig/ruby/svn_repos.lo: subversion/bindings/swig/ruby/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
 	$(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_repos.c
 
-subversion/bindings/swig/ruby/svn_wc.lo: subversion/bindings/swig/ruby/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
+subversion/bindings/swig/ruby/svn_wc.lo: subversion/bindings/swig/ruby/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
 	$(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_wc.c
 
 subversion/libsvn_auth_gnome_keyring/gnome_keyring.lo: subversion/libsvn_auth_gnome_keyring/gnome_keyring.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/svn_private_config.h
@@ -2416,7 +2446,7 @@ subversion/libsvn_client/delete.lo: subversion/libsvn_client/delete.c subversion
 
 subversion/libsvn_client/deprecated.lo: subversion/libsvn_client/deprecated.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
 
-subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_client_shelf.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/diff_local.lo: subversion/libsvn_client/diff_local.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
@@ -2464,9 +2494,11 @@ subversion/libsvn_client/revert.lo: subversion/libsvn_client/revert.c subversion
 
 subversion/libsvn_client/revisions.lo: subversion/libsvn_client/revisions.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
-subversion/libsvn_client/shelf.lo: subversion/libsvn_client/shelf.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/shelf.lo: subversion/libsvn_client/shelf.c subversion/include/private/svn_client_private.h subversion/include/private/svn_client_shelf.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+
+subversion/libsvn_client/shelf2.lo: subversion/libsvn_client/shelf2.c subversion/include/private/svn_client_private.h subversion/include/private/svn_client_shelf2.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
-subversion/libsvn_client/status.lo: subversion/libsvn_client/status.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/status.lo: subversion/libsvn_client/status.c subversion/include/private/svn_client_private.h subversion/include/private/svn_client_shelf.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/switch.lo: subversion/libsvn_client/switch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
@@ -2622,7 +2654,7 @@ subversion/libsvn_fs_fs/dump-index.lo: subversion/libsvn_fs_fs/dump-index.c subv
 
 subversion/libsvn_fs_fs/fs.lo: subversion/libsvn_fs_fs/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/hotcopy.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/recovery.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_fs/verify.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h
 
-subversion/libsvn_fs_fs/fs_fs.lo: subversion/libsvn_fs_fs/fs_fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h
+subversion/libsvn_fs_fs/fs_fs.lo: subversion/libsvn_fs_fs/fs_fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_fs/hotcopy.lo: subversion/libsvn_fs_fs/hotcopy.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/hotcopy.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/recovery.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h
 
@@ -2968,7 +3000,7 @@ subversion/libsvn_subr/simple_providers.lo: subversion/libsvn_subr/simple_provid
 
 subversion/libsvn_subr/skel.lo: subversion/libsvn_subr/skel.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/private/svn_string_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h
 
-subversion/libsvn_subr/sorts.lo: subversion/libsvn_subr/sorts.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h
+subversion/libsvn_subr/sorts.lo: subversion/libsvn_subr/sorts.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h
 
 subversion/libsvn_subr/spillbuf.lo: subversion/libsvn_subr/spillbuf.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h
 
@@ -3284,7 +3316,9 @@ subversion/svn/resolved-cmd.lo: subversion/svn/resolved-cmd.c subversion/include
 
 subversion/svn/revert-cmd.lo: subversion/svn/revert-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
-subversion/svn/shelf-cmd.lo: subversion/svn/shelf-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
+subversion/svn/shelf-cmd.lo: subversion/svn/shelf-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_client_shelf.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn/shelf-cmd.h subversion/svn_private_config.h
+
+subversion/svn/shelf2-cmd.lo: subversion/svn/shelf2-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_client_shelf2.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn/shelf2-cmd.h subversion/svn_private_config.h
 
 subversion/svn/similarity.lo: subversion/svn/similarity.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
@@ -3292,7 +3326,7 @@ subversion/svn/status-cmd.lo: subversion/svn/status-cmd.c subversion/include/pri
 
 subversion/svn/status.lo: subversion/svn/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h
 
-subversion/svn/svn.lo: subversion/svn/svn.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
+subversion/svn/svn.lo: subversion/svn/svn.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn/shelf-cmd.h subversion/svn/shelf2-cmd.h subversion/svn_private_config.h
 
 subversion/svn/switch-cmd.lo: subversion/svn/switch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
@@ -3412,7 +3446,7 @@ subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.lo: subversion/tests/libsvn_fs_fs
 
 subversion/tests/libsvn_fs_fs/fs-fs-pack-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
 
-subversion/tests/libsvn_fs_fs/fs-fs-private-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-private-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_fs_fs/fs-fs-private-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-private-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_x/fs_init.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
 
 subversion/tests/libsvn_fs_x/fs-x-pack-test.lo: subversion/tests/libsvn_fs_x/fs-x-pack-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
 
@@ -3456,7 +3490,7 @@ subversion/tests/libsvn_subr/hashdump-test.lo: subversion/tests/libsvn_subr/hash
 
 subversion/tests/libsvn_subr/io-test.lo: subversion/tests/libsvn_subr/io-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
 
-subversion/tests/libsvn_subr/mergeinfo-test.lo: subversion/tests/libsvn_subr/mergeinfo-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h
+subversion/tests/libsvn_subr/mergeinfo-test.lo: subversion/tests/libsvn_subr/mergeinfo-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_error_private.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h
 
 subversion/tests/libsvn_subr/opt-test.lo: subversion/tests/libsvn_subr/opt-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h
 
diff --git a/build.conf b/build.conf
index 97218d7..16bd7b9 100644
--- a/build.conf
+++ b/build.conf
@@ -101,7 +101,7 @@ test-scripts =
 
 bdb-test-scripts =
 
-swig-python-opts = $(SWIG_FEATURES) -python $(SWIG_PY_FEATURES) -classic
+swig-python-opts = $(SWIG_FEATURES) $(SWIG_PY_OPTS) $(SWIG_PY_FEATURES)
 swig-perl-opts = $(SWIG_FEATURES) -perl $(SWIG_PL_FEATURES) -nopm -noproxy
 swig-ruby-opts = $(SWIG_FEATURES) -ruby $(SWIG_RB_FEATURES)
 swig-languages = python perl ruby
@@ -248,7 +248,7 @@ type = lib
 path = subversion/libsvn_client
 libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr aprutil apriconv apr
 install = lib
-msvc-export = svn_client.h private/svn_client_mtcc.h private/svn_client_private.h
+msvc-export = svn_client.h private/svn_client_mtcc.h private/svn_client_private.h private/svn_client_shelf.h private/svn_client_shelf2.h
 
 # Routines for binary diffing and tree-deltas
 [libsvn_delta]
@@ -831,7 +831,7 @@ type = exe
 path = subversion/tests/libsvn_fs_fs
 sources = fs-fs-private-test.c
 install = test
-libs = libsvn_test libsvn_fs libsvn_delta
+libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
        libsvn_repos libsvn_subr apriconv apr
 msvc-force-static = yes
 
diff --git a/build/ac-macros/py3c.m4 b/build/ac-macros/py3c.m4
new file mode 100644
index 0000000..f358cae
--- /dev/null
+++ b/build/ac-macros/py3c.m4
@@ -0,0 +1,105 @@
+dnl ===================================================================
+dnl   Licensed to the Apache Software Foundation (ASF) under one
+dnl   or more contributor license agreements.  See the NOTICE file
+dnl   distributed with this work for additional information
+dnl   regarding copyright ownership.  The ASF licenses this file
+dnl   to you under the Apache License, Version 2.0 (the
+dnl   "License"); you may not use this file except in compliance
+dnl   with the License.  You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl   Unless required by applicable law or agreed to in writing,
+dnl   software distributed under the License is distributed on an
+dnl   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl   KIND, either express or implied.  See the License for the
+dnl   specific language governing permissions and limitations
+dnl   under the License.
+dnl ===================================================================
+dnl
+dnl  SVN_PY3C
+dnl
+dnl  Check configure options and assign variables related to
+dnl  the py3c library.
+dnl
+dnl  If configuring via prefix, the ac_cv_python_includes variable needs
+dnl  to be set to the appropriate include configuration to build against
+dnl  the correct Python C interface.
+dnl
+
+AC_DEFUN(SVN_PY3C,
+[
+  py3c_found=no
+  py3c_skip=no
+
+  AC_ARG_WITH(py3c,AS_HELP_STRING([--with-py3c=PREFIX],
+                                  [py3c python extension compatibility library]),
+  [
+    if test "$withval" = "yes"; then
+      py3c_skip=no
+    elif test "$withval" = "no"; then
+      py3c_skip=yes
+    else
+      py3c_skip=no
+      py3c_prefix="$withval"
+    fi
+  ])
+
+  if test "$py3c_skip" = "yes"; then
+    AC_MSG_NOTICE([Skipping configure of py3c])
+  else
+    if test -n "$py3c_prefix"; then
+      AC_MSG_NOTICE([py3c library configuration via prefix $py3c_prefix])
+
+      dnl The standard Python headers are required to validate py3c.h
+      if test "$ac_cv_python_includes" = "none"; then
+        AC_MSG_WARN([py3c cannot be used without distutils module])
+      fi
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix/include"
+      AC_CHECK_HEADERS(py3c.h,[
+          py3c_found="yes"
+          SVN_PY3C_INCLUDES="-I$py3c_prefix/include"
+      ])
+      CPPFLAGS="$save_cppflags"
+    else
+      SVN_PY3C_PKG_CONFIG()
+
+      if test "$py3c_found" = "no"; then
+        AC_MSG_NOTICE([py3c library configuration without pkg-config])
+
+        dnl The standard Python headers are required to validate py3c.h
+        if test "$ac_cv_python_includes" = "none"; then
+          AC_MSG_WARN([py3c cannot be used without distutils module])
+        fi
+
+        save_cppflags="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+        AC_CHECK_HEADER(py3c.h, [
+          py3c_found="yes"
+        ])
+        CPPFLAGS="$save_cppflags"
+      fi
+    fi
+  fi
+
+  AC_SUBST(SVN_PY3C_INCLUDES)
+])
+
+dnl SVN_PY3C_PKG_CONFIG()
+dnl Use pkg-config to try and detect and configure py3c
+AC_DEFUN(SVN_PY3C_PKG_CONFIG,
+[
+  AC_MSG_NOTICE([py3c library configuration via pkg-config])
+  if test -n "$PKG_CONFIG"; then
+    AC_MSG_CHECKING([for py3c library])
+    if $PKG_CONFIG py3c --exists; then
+      AC_MSG_RESULT([yes])
+      py3c_found=yes
+      SVN_PY3C_INCLUDES=`$PKG_CONFIG py3c --cflags`
+    else
+      AC_MSG_RESULT([no])
+    fi
+  fi
+])
diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
index 4031462..fea7f0d 100644
--- a/build/ac-macros/swig.m4
+++ b/build/ac-macros/swig.m4
@@ -102,6 +102,8 @@ AC_DEFUN(SVN_FIND_SWIG,
  
   SWIG_PY_COMPILE="none"
   SWIG_PY_LINK="none"
+  SWIG_PY_OPTS="none"
+  SWIG_PY_ERRMSG="check config.log for details"
   if test "$PYTHON" != "none"; then
     AC_MSG_NOTICE([Configuring python swig binding])
 
@@ -112,25 +114,82 @@ AC_DEFUN(SVN_FIND_SWIG,
     SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) \$(PYTHON_INCLUDES)"
 
     if test "$ac_cv_python_includes" = "none"; then
+      SWIG_PY_ERRMSG="no distutils found"
       AC_MSG_WARN([python bindings cannot be built without distutils module])
-    fi
+    else
 
-    AC_CACHE_CHECK([for compiling Python extensions], [ac_cv_python_compile],[
-      ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
-    ])
-    SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+      python_header_found="no"
 
-    AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
-      ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
-    ])
-    SWIG_PY_LINK="$ac_cv_python_link"
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+      AC_CHECK_HEADER(Python.h, [
+        python_header_found="yes"
+      ])
+      CPPFLAGS="$save_cppflags"
+
+      if test "$python_header_found" = "no"; then
+        SWIG_PY_ERRMSG="no Python.h found"
+        AC_MSG_WARN([Python.h not found; disabling python swig bindings])
+      else
+        SVN_PY3C()
+
+        if test "$py3c_found" = "no"; then
+          SWIG_PY_ERRMSG="py3c library not found"
+          AC_MSG_WARN([py3c library not found; disabling python swig bindings])
+        else
+          AC_CACHE_CHECK([for compiling Python extensions], [ac_cv_python_compile],[
+            ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
+          ])
+          SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+      
+          AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
+            ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+          ])
+          SWIG_PY_LINK="$ac_cv_python_link"
+      
+          AC_CACHE_CHECK([for linking Python libraries], [ac_cv_python_libs],[
+            ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+          ])
+          SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
+
+          AC_CACHE_CHECK([for Python >= 3], [ac_cv_python_is_py3],[
+            ac_cv_python_is_py3="no"
+            $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \
+               ac_cv_python_is_py3="yes"
+          ])
+
+          if test "$ac_cv_python_is_py3" = "yes"; then
+            if test "$SWIG_VERSION" -ge "300010"; then
+              dnl SWIG Python bindings successfully configured, clear the error message dnl
+              SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              AC_MSG_WARN([Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer])
+            fi
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
+            else
+              SWIG_PY_OPTS="-python -py3 -nofastunpack"
+            fi
+          else
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -classic"
+              dnl SWIG Python bindings successfully configured, clear the error message dnl
+              SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_OPTS="-python -nofastunpack"
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              AC_MSG_WARN([Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0])
+            fi
+          fi
+        fi
+            
+      fi
+    fi
 
-    AC_CACHE_CHECK([for linking Python libraries], [ac_cv_python_libs],[
-      ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
-    ])
-    SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
   fi
 
+  SWIG_PL_ERRMSG="check config.log for details"
   if test "$PERL" != "none"; then
     AC_MSG_CHECKING([perl version])
     dnl Note that the q() bit is there to avoid unbalanced brackets
@@ -141,6 +200,9 @@ AC_DEFUN(SVN_FIND_SWIG,
       SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
       SWIG_PL_LINK="`$PERL -MExtUtils::Embed -e ldopts`"
       SWIG_PL_LINK="`SVN_REMOVE_STANDARD_LIB_DIRS($SWIG_PL_LINK)`"
+
+      dnl SWIG Perl bindings successfully configured, clear the error message
+      SWIG_PL_ERRMSG=""
     else
       AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.])
     fi
@@ -148,6 +210,7 @@ AC_DEFUN(SVN_FIND_SWIG,
 
   SWIG_RB_COMPILE="none"
   SWIG_RB_LINK="none"
+  SWIG_RB_ERRMSG="check config.log for details"
   if test "$RUBY" != "none"; then
     if test x"$SWIG_VERSION" = x"3""00""008"; then
       # Use a local variable to escape the '#' sign.
@@ -168,7 +231,7 @@ AC_DEFUN(SVN_FIND_SWIG,
     AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
     if test -d "$rbconfig_rubyhdrdir"; then
       dnl Ruby >=1.9
-      svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby/backward"
+      svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
       if test -d "$rbconfig_rubyarchhdrdir"; then
         dnl Ruby >=2.0
         svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
@@ -265,6 +328,9 @@ int main()
                   [svn_ruby_test_verbose="$svn_cv_ruby_test_verbose"])
       SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
       AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
+
+    dnl SWIG Ruby bindings successfully configured, clear the error message
+    SWIG_RB_ERRMSG=""
   fi
   AC_SUBST(SWIG)
   AC_SUBST(PYTHON_INCLUDES)
@@ -272,8 +338,11 @@ int main()
   AC_SUBST(SWIG_PY_COMPILE)
   AC_SUBST(SWIG_PY_LINK)
   AC_SUBST(SWIG_PY_LIBS)
+  AC_SUBST(SWIG_PY_OPTS)
+  AC_SUBST(SWIG_PY_ERRMSG)
   AC_SUBST(SWIG_PL_INCLUDES)
   AC_SUBST(SWIG_PL_LINK)
+  AC_SUBST(SWIG_PL_ERRMSG)
   AC_SUBST(SWIG_RB_LINK)
   AC_SUBST(SWIG_RB_LIBS)
   AC_SUBST(SWIG_RB_INCLUDES)
@@ -281,4 +350,5 @@ int main()
   AC_SUBST(SWIG_RB_SITE_LIB_DIR)
   AC_SUBST(SWIG_RB_SITE_ARCH_DIR)
   AC_SUBST(SWIG_RB_TEST_VERBOSE)
+  AC_SUBST(SWIG_RB_ERRMSG)
 ])
diff --git a/build/ac-macros/utf8proc.m4 b/build/ac-macros/utf8proc.m4
index fbd1e42..e929d6e 100644
--- a/build/ac-macros/utf8proc.m4
+++ b/build/ac-macros/utf8proc.m4
@@ -54,7 +54,7 @@ AC_DEFUN(SVN_UTF8PROC,
       SVN_UTF8PROC_PREFIX
     fi
     if test "$utf8proc_found" != "yes"; then
-      AC_MSG_ERROR([Subversion requires UTF8PROC])
+      AC_MSG_ERROR([Subversion requires UTF8PROC; install it or re-run configure with "--with-utf8proc=internal"])
     fi
   fi
   AC_SUBST(SVN_UTF8PROC_INCLUDES)
diff --git a/build/generator/gen_base.py b/build/generator/gen_base.py
index a5054aa..4d0e7f9 100644
--- a/build/generator/gen_base.py
+++ b/build/generator/gen_base.py
@@ -1274,7 +1274,8 @@ class IncludeDependencyInfo:
     Return a dictionary with included full file names as keys and None as
     values."""
     hdrs = { }
-    for line in fileinput.input(fname):
+
+    for line in fileinput.FileInput(fname, openhook=fileinput.hook_encoded("utf-8")):
       match = self._re_include.match(line)
       if not match:
         continue
diff --git a/build/generator/gen_make.py b/build/generator/gen_make.py
index bdb5d00..c532b02 100644
--- a/build/generator/gen_make.py
+++ b/build/generator/gen_make.py
@@ -208,7 +208,9 @@ class Generator(gen_base.GeneratorBase):
       swig_lang_deps[objname.lang].append(str(objname))
 
     for lang in self.swig.langs:
-      data.swig_langs.append(_eztdata(short=self.swig.short[lang],
+      data.swig_langs.append(_eztdata(name=lang,
+                                      short=self.swig.short[lang],
+                                      short_upper=self.swig.short[lang].upper(),
                                       deps=swig_lang_deps[lang]))
 
     ########################################
@@ -509,6 +511,7 @@ class Generator(gen_base.GeneratorBase):
     standalone.write('top_srcdir = .\n')
     standalone.write('top_builddir = .\n')
     standalone.write('SWIG = swig\n')
+    standalone.write('SWIG_PY_OPTS = -python -py3 -nofastunpack -modern\n')
     standalone.write('PYTHON = ' + sys.executable + '\n')
     standalone.write('\n')
     standalone.write(open("build-outputs.mk","r").read())
diff --git a/build/generator/gen_vcnet_vcproj.py b/build/generator/gen_vcnet_vcproj.py
index f34b280..31a2d7b 100644
--- a/build/generator/gen_vcnet_vcproj.py
+++ b/build/generator/gen_vcnet_vcproj.py
@@ -120,10 +120,13 @@ class Generator(gen_win.WinGeneratorBase):
       'instrument_purify_quantify' : self.instrument_purify_quantify,
       'version' : self.vcproj_version,
       'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
+      'user_macros': self.user_macros,
       }
 
     if self.vcproj_extension == '.vcproj':
       self.write_with_template(fname, 'templates/vcnet_vcproj.ezt', data)
+      self.write_with_template(os.path.splitext(fname)[0] + '.vsprops',
+                               'templates/vcnet_vsprops.ezt', data)
     else:
       self.write_with_template(fname, 'templates/vcnet_vcxproj.ezt', data)
       self.write_with_template(fname + '.filters', 'templates/vcnet_vcxproj_filters.ezt', data)
@@ -286,7 +289,7 @@ class Generator(gen_win.WinGeneratorBase):
 
   def quote_define(self, value):
     "Properly quote special characters in a define (if needed)"
-    
+
     if self.vcproj_extension == '.vcproj':
       return value.replace('"', '""')
     else:
diff --git a/build/generator/gen_win.py b/build/generator/gen_win.py
index 9d7350a..7565a9a 100644
--- a/build/generator/gen_win.py
+++ b/build/generator/gen_win.py
@@ -158,6 +158,13 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase):
     ### implement this from scratch using the algorithms described in
     ### http://www.webdav.org/specs/draft-leach-uuids-guids-01.txt
 
+    # Ensure data is in byte representation.  If it doesn't have an encode
+    # attribute, assume it is already in the correct form.
+    try:
+      data = data.encode('utf8')
+    except AttributeError:
+      pass
+
     myhash = hashlib_md5(data).hexdigest()
 
     guid = ("{%s-%s-%s-%s-%s}" % (myhash[0:8], myhash[8:12],
@@ -739,7 +746,7 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase):
       fakedefines.append(self.quote_define('SVN_WIN32_CRASHREPORT_EMAIL="users@subversion.apache.org"'))
 
     return fakedefines
-    
+
   def quote_define(self, value):
     "Properly quote special characters in a define (if needed)"
     return value
@@ -778,6 +785,10 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase):
       else:
         lang_subdir = target.lang
 
+      if target.lang == "python":
+        lib = self._libraries['py3c']
+        fakeincludes.extend(lib.include_dirs)
+
       # After the language specific includes include the generic libdir,
       # to allow overriding a generic with a per language include
       fakeincludes.append(os.path.join(self.swig_libdir, lang_subdir))
diff --git a/build/generator/gen_win_dependencies.py b/build/generator/gen_win_dependencies.py
index da59599..03048c0 100644
--- a/build/generator/gen_win_dependencies.py
+++ b/build/generator/gen_win_dependencies.py
@@ -32,6 +32,7 @@ import fnmatch
 import re
 import subprocess
 import string
+from collections import namedtuple
 
 if sys.version_info[0] >= 3:
   # Python >=3.0
@@ -46,6 +47,8 @@ else:
 import gen_base
 import ezt
 
+UserMacro = namedtuple('UserMacro', ['name', 'value'])
+
 class SVNCommonLibrary:
 
   def __init__(self, name, include_dirs, lib_dir, lib_name, version=None,
@@ -117,6 +120,7 @@ class GenDependenciesBase(gen_base.GeneratorBase):
         'swig',
         'perl',
         'python',
+        'py3c',
         'ruby',
         'java_sdk',
         'openssl',
@@ -148,6 +152,7 @@ class GenDependenciesBase(gen_base.GeneratorBase):
     self.jdk_path = None
     self.junit_path = None
     self.swig_path = None
+    self.py3c_path = None
     self.vs_version = '2002'
     self.sln_version = '7.00'
     self.vcproj_version = '7.00'
@@ -167,6 +172,7 @@ class GenDependenciesBase(gen_base.GeneratorBase):
     self.instrument_purify_quantify = None
     self.sasl_path = None
     self.cpp_defines = []
+    self.user_macros = []
 
     # NLS options
     self.enable_nls = None
@@ -198,6 +204,8 @@ class GenDependenciesBase(gen_base.GeneratorBase):
         self.zlib_path = val
       elif opt == '--with-swig':
         self.swig_path = val
+      elif opt == '--with-py3c':
+        self.py3c_path = val
       elif opt == '--with-sqlite':
         self.sqlite_path = val
       elif opt == '--with-sasl':
@@ -329,13 +337,15 @@ class GenDependenciesBase(gen_base.GeneratorBase):
     # Swig (optional) dependencies
     if self._find_swig(show_warnings):
       self._find_perl(show_warnings)
-      self._find_python(show_warnings)
+      # py3c is required to build python bindings, show check it first
+      if self._find_py3c(show_warnings):
+        self._find_python(show_warnings)
       self._find_ruby(show_warnings)
 
   def _find_apr(self):
     "Find the APR library and version"
 
-    minimal_apr_version = (1, 3, 0)
+    minimal_apr_version = (1, 5, 0)
 
     if not self.apr_path:
       sys.stderr.write("ERROR: Use '--with-apr' option to configure APR " + \
@@ -770,7 +780,7 @@ class GenDependenciesBase(gen_base.GeneratorBase):
 
     if self.bdb_path:
       bdb_path = self.bdb_path
-    
+
     inc_path = os.path.join(bdb_path, 'include')
     db_h_path = os.path.join(inc_path, 'db.h')
 
@@ -1027,9 +1037,52 @@ class GenDependenciesBase(gen_base.GeneratorBase):
     except ImportError:
       return
 
+    if sys.version_info[0] >= 3:
+      self.user_macros.append(UserMacro("SWIG_PY_OPTS", "-python -py3"))
+    else:
+      self.user_macros.append(UserMacro("SWIG_PY_OPTS", "-python -classic"))
+
     self._libraries['python'] = SVNCommonLibrary('python', inc_dir, lib_dir, None,
                                                  sys.version.split(' ')[0])
 
+  def _find_py3c(self, show_warnings):
+    "Find the py3c library which is used in SWIG python bindings"
+    show_warnings = True
+    # Assume a default path, unless otherwise specified
+    py3c_path = "py3c"
+
+    if self.py3c_path:
+      py3c_path = self.py3c_path
+
+    py3c_path = os.path.abspath(py3c_path)
+    inc_path = os.path.join(py3c_path, 'include')
+    py3c_hdr_path = os.path.join(inc_path, 'py3c.h')
+
+    pc_path = os.path.join(py3c_path, 'py3c.pc.in')
+
+    if not os.path.isfile(py3c_hdr_path):
+      if show_warnings:
+        print('WARNING: "%s" not found' % py3c_hdr_path)
+        print('Use "--with-py3c" to configure py3c location.')
+      return False
+
+    with open(pc_path) as fp:
+      txt = fp.read()
+
+    ver_match = re.search(r'Version:\s+([0-9.]+)', txt)
+
+    if not ver_match:
+      if show_warnings:
+        print("WARNING: Failed to find version in '%s'" % pc_path)
+      return False
+
+    py3c_version = ver_match.group(1)
+
+    self._libraries['py3c'] = SVNCommonLibrary('py3c', inc_path, None,
+                                               None, py3c_version)
+
+    return True
+
   def _find_jdk(self, show_warnings):
     "Find details about an installed jdk"
 
@@ -1080,7 +1133,7 @@ class GenDependenciesBase(gen_base.GeneratorBase):
       outfp = subprocess.Popen([os.path.join(jdk_path, 'bin', 'javac.exe'),
                                '-version'], stdout=subprocess.PIPE,
                                stderr=subprocess.STDOUT).stdout
-      line = outfp.read()
+      line = outfp.read().decode('utf8')
       if line:
         vermatch = re.search(r'(([0-9]+(\.[0-9]+)+)(_[._0-9]+)?)', line, re.M)
       else:
@@ -1138,7 +1191,7 @@ class GenDependenciesBase(gen_base.GeneratorBase):
     try:
       fp = subprocess.Popen([self.swig_exe, '-version'],
                             stdout=subprocess.PIPE).stdout
-      txt = fp.read()
+      txt = fp.read().decode('utf8')
       if txt:
         vermatch = re.search(r'^SWIG\ Version\ (\d+)\.(\d+)\.(\d+)', txt, re.M)
       else:
@@ -1166,7 +1219,7 @@ class GenDependenciesBase(gen_base.GeneratorBase):
     try:
       fp = subprocess.Popen([self.swig_exe, '-swiglib'],
                             stdout=subprocess.PIPE).stdout
-      lib_dir = fp.readline().strip()
+      lib_dir = fp.readline().decode('utf8').strip()
       fp.close()
     except OSError:
       lib_dir = None
diff --git a/build/generator/swig/__init__.py b/build/generator/swig/__init__.py
index 2ecfe4b..000524e 100644
--- a/build/generator/swig/__init__.py
+++ b/build/generator/swig/__init__.py
@@ -62,7 +62,7 @@ class Generator:
     if os.access(self.swig_path, os.X_OK):
       # ### TODO: What's the reason for this os.access() check?  It was added
       # ### in r873265 (== r33191).
-      self.swig_libdir = subprocess.check_output([self.swig_path, "-swiglib"]).strip()
+      self.swig_libdir = subprocess.check_output([self.swig_path, "-swiglib"]).decode('utf8').strip()
     else:
       self.swig_libdir = None
 
@@ -71,7 +71,7 @@ class Generator:
     """Get the version number of SWIG"""
 
     if not self._swigVersion:
-      swig_version = subprocess.check_output([self.swig_path, "-version"])
+      swig_version = subprocess.check_output([self.swig_path, "-version"]).decode('utf8')
       m = re.search("Version (\d+).(\d+).(\d+)", swig_version)
       if m:
         self._swigVersion = tuple(map(int, m.groups()))
diff --git a/build/generator/swig/header_wrappers.py b/build/generator/swig/header_wrappers.py
index 6c3533d..89b2802 100755
--- a/build/generator/swig/header_wrappers.py
+++ b/build/generator/swig/header_wrappers.py
@@ -265,7 +265,13 @@ class Generator(generator.swig.Generator):
       self.proxy_filename(base_fname))
 
     # Open a temporary output file
-    self.ofile = tempfile.TemporaryFile(dir=self.proxy_dir)
+    if sys.version_info[0] >= 3:
+      self.ofile = tempfile.TemporaryFile(dir=self.proxy_dir,
+                                          mode="w+",
+                                          encoding="utf8")
+    else:
+      self.ofile = tempfile.TemporaryFile(dir=self.proxy_dir)
+
     self.ofile.write('/* Proxy classes for %s\n' % base_fname)
     self.ofile.write(' * DO NOT EDIT -- AUTOMATICALLY GENERATED\n')
     self.ofile.write(' * BY build/generator/swig/header_wrappers.py */\n')
diff --git a/build/generator/templates/build-outputs.mk.ezt b/build/generator/templates/build-outputs.mk.ezt
index 8e52bdf..56d03d3 100644
--- a/build/generator/templates/build-outputs.mk.ezt
+++ b/build/generator/templates/build-outputs.mk.ezt
@@ -70,8 +70,18 @@ RELEASE_MODE = 1
 # Section 3: SWIG autogen rules
 ########################################
 [for swig_langs]
-autogen-swig-[swig_langs.short]:[for swig_langs.deps] [swig_langs.deps][end]
+.swig_[swig_langs.short]_checked:
+	@if [ -n "$(SWIG_[swig_langs.short_upper]_ERRMSG)" ]; then \
+	  echo "SWIG [swig_langs.name] disabled at configure time: $(SWIG_[swig_langs.short_upper]_ERRMSG)" >&2; \
+	  exit 1; \
+	fi
+	@touch $@
+
+autogen-swig-[swig_langs.short]: .swig_[swig_langs.short]_checked [for swig_langs.deps] [swig_langs.deps][end]
 autogen-swig: autogen-swig-[swig_langs.short]
+
+# Ensure the swig build targets depend on the configuration check
+swig-[swig_langs.short]: .swig_[swig_langs.short]_checked
 [end]
 
 
diff --git a/build/generator/templates/vcnet_vcproj.ezt b/build/generator/templates/vcnet_vcproj.ezt
index b12ed1a..f614f0a 100644
--- a/build/generator/templates/vcnet_vcproj.ezt
+++ b/build/generator/templates/vcnet_vcproj.ezt
@@ -33,6 +33,7 @@
 			OutputDirectory="..\..\..\[configs.name]\[target.output_dir]"
 			BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
 			IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]\[target.proj_name]"
+			InheritedPropertySheets=".\[target.proj_name].vsprops"
 			ConfigurationType="[target_type]"[is configs.name "Release"]
 			WholeProgramOptimization="FALSE"[end]>
 			<Tool
@@ -59,7 +60,7 @@
 				DisableSpecificWarnings="4100;4127;4206;4512;4701;4706;4800"
 				Detect64BitPortabilityProblems="FALSE"
 				AdditionalOptions="
-				/we4002 /we4003 /we4013 /we4020 /we4022 /we4024 /we4028 /we4029 /we4030 /we4031 /we4033 /we4047 /we4089 /we4113 /we4115 /we4204 /we4715"
+				/we4002 /we4003 /we4013 /we4020 /we4022 /we4024 /we4028 /we4029 /we4030 /we4031 /we4033 /we4047 /we4089 /we4113 /we4204 /we4715"
 				DebugInformationFormat="3"
 				ProgramDataBaseFileName="$(IntDir)\[target.output_pdb]"
 				[if-any configs.forced_include_files]ForcedIncludeFiles="[for configs.forced_include_files][configs.forced_include_files][if-index configs.forced_include_files last][else];[end][end]"
diff --git a/build/generator/templates/vcnet_vcxproj.ezt b/build/generator/templates/vcnet_vcxproj.ezt
index 41c8f08..144463f 100644
--- a/build/generator/templates/vcnet_vcxproj.ezt
+++ b/build/generator/templates/vcnet_vcxproj.ezt
@@ -43,7 +43,9 @@
 [for platforms][for configs]  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-[end][end]  <PropertyGroup Label="UserMacros" />
+[end][end]  <PropertyGroup Label="UserMacros">
+[for user_macros]    <[user_macros.name]>[user_macros.value]</[user_macros.name]>
+[end]  </PropertyGroup>
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">
     <OutDir>$(SolutionDir)[configs.name]\[target.output_dir]\</OutDir>
     <IntDir>$(SolutionDir)[configs.name]\obj\[target.intermediate_dir]\[target.proj_name]\</IntDir>
@@ -63,7 +65,7 @@
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4100;4127;4206;4512;4701;4706;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4115;4133;4204;4700;4715;4789;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+      <TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4133;4204;4700;4715;4789;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
 [if-any configs.forced_include_files]      <ForcedIncludeFiles>[for configs.forced_include_files][configs.forced_include_files];[end]%(ForcedIncludeFiles)</ForcedIncludeFiles>
 [end]    </ClCompile>
     <ResourceCompile>
diff --git a/build/generator/templates/vcnet_vsprops.ezt b/build/generator/templates/vcnet_vsprops.ezt
new file mode 100644
index 0000000..4aff513
--- /dev/null
+++ b/build/generator/templates/vcnet_vsprops.ezt
@@ -0,0 +1,31 @@
+[#

+<!--

+     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.

+-->

+]<?xml version="1.0" encoding = "Windows-1252"?>

+[format "xml"]<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="[target.proj_name]"

+    >

+    [for user_macros]<UserMacro

+      Name="[user_macros.name]"

+      Value="[user_macros.value]"

+    />[end]

+</VisualStudioPropertySheet> 

+[end]

diff --git a/build/get-py-info.py b/build/get-py-info.py
index 29a6c0a..95bad41 100644
--- a/build/get-py-info.py
+++ b/build/get-py-info.py
@@ -81,20 +81,8 @@ def link_options():
   # Initialize config variables
   assert os.name == "posix"
   options = sysconfig.get_config_var('LDSHARED').split()
-  fwdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
 
-  if fwdir and fwdir != "no-framework":
-
-    # Setup the framework prefix
-    fwprefix = sysconfig.get_config_var('PYTHONFRAMEWORKPREFIX')
-    if fwprefix != "/System/Library/Frameworks":
-      add_option_if_missing(options, "-F%s" % fwprefix)
-
-    # Load in the framework
-    fw = sysconfig.get_config_var('PYTHONFRAMEWORK')
-    add_option(options, "-framework", fw)
-
-  elif sys.platform == 'darwin':
+  if sys.platform == 'darwin':
 
     # Load bundles from python
     python_exe = os.path.join(sysconfig.get_config_var("BINDIR"),
diff --git a/build/run_tests.py b/build/run_tests.py
index 7760d81..5a661af 100755
--- a/build/run_tests.py
+++ b/build/run_tests.py
@@ -50,7 +50,7 @@ separated list of test numbers; the default is to run all the tests in it.
 import os, sys, shutil, codecs
 import re
 import logging
-import optparse, subprocess, imp, threading, traceback
+import optparse, subprocess, threading, traceback
 from datetime import datetime
 
 try:
@@ -64,6 +64,13 @@ if sys.version_info < (3, 0):
   # Python >= 3.0 already has this build in
   import exceptions
 
+if sys.version_info < (3, 5):
+  import imp
+else:
+  # The imp module is deprecated since Python 3.4; the replacement we use,
+  # module_from_spec(), is available since Python 3.5.
+  import importlib.util
+
 # Ensure the compiled C tests use a known locale (Python tests set the locale
 # explicitly).
 os.environ['LC_ALL'] = 'C'
@@ -383,7 +390,7 @@ class TestHarness:
       lines = prog.stdout.readlines()
 
       for i in range(0, len(lines) - 2):
-        self.result.append(TestHarness.Job(i + 1, True, progabs, 
+        self.result.append(TestHarness.Job(i + 1, True, progabs,
                                            progdir, progbase))
       prog.wait()
 
@@ -713,9 +720,11 @@ class TestHarness:
 
     # Summary.
     if failed or xpassed or failed_list:
-      print("SUMMARY: Some tests failed.\n")
+      summary = "Some tests failed"
     else:
-      print("SUMMARY: All tests successful.\n")
+      summary = "All tests successful"
+    print("Python version: %d.%d.%d." % sys.version_info[:3])
+    print("SUMMARY: %s\n" % summary)
 
     self._close_log()
     return failed
@@ -819,10 +828,15 @@ class TestHarness:
       if sys.version_info < (3, 0):
         prog_mod = imp.load_module(progbase[:-3], open(progabs, 'r'), progabs,
                                    ('.py', 'U', imp.PY_SOURCE))
-      else:
+      elif sys.version_info < (3, 5):
         prog_mod = imp.load_module(progbase[:-3],
                                    open(progabs, 'r', encoding="utf-8"),
                                    progabs, ('.py', 'U', imp.PY_SOURCE))
+      else:
+         spec = importlib.util.spec_from_file_location(progbase[:-3], progabs)
+         prog_mod = importlib.util.module_from_spec(spec)
+         sys.modules[progbase[:-3]] = prog_mod
+         spec.loader.exec_module(prog_mod)
     except:
       print("\nError loading test (details in following traceback): " + progbase)
       traceback.print_exc()
diff --git a/configure b/configure
index 3417eeb..4666c5d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for subversion 1.13.0.
+# Generated by GNU Autoconf 2.69 for subversion 1.14.0.
 #
 # Report bugs to <http://subversion.apache.org/>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='subversion'
 PACKAGE_TARNAME='subversion'
-PACKAGE_VERSION='1.13.0'
-PACKAGE_STRING='subversion 1.13.0'
+PACKAGE_VERSION='1.14.0'
+PACKAGE_STRING='subversion 1.14.0'
 PACKAGE_BUGREPORT='http://subversion.apache.org/'
 PACKAGE_URL=''
 
@@ -658,6 +658,7 @@ SWIG_PY_FEATURES
 SWIG_PL_FEATURES
 SWIG_RB_FEATURES
 SWIG_FEATURES
+SWIG_RB_ERRMSG
 SWIG_RB_TEST_VERBOSE
 SWIG_RB_SITE_ARCH_DIR
 SWIG_RB_SITE_LIB_DIR
@@ -665,12 +666,16 @@ SWIG_RB_COMPILE
 SWIG_RB_INCLUDES
 SWIG_RB_LIBS
 SWIG_RB_LINK
+SWIG_PL_ERRMSG
 SWIG_PL_LINK
 SWIG_PL_INCLUDES
+SWIG_PY_ERRMSG
+SWIG_PY_OPTS
 SWIG_PY_LIBS
 SWIG_PY_LINK
 SWIG_PY_COMPILE
 SWIG_PY_INCLUDES
+SVN_PY3C_INCLUDES
 SWIG
 RUBY_TEENY
 RUBY_MINOR
@@ -927,6 +932,7 @@ enable_gprof
 with_jdk
 with_jikes
 with_swig
+with_py3c
 with_ruby_sitedir
 with_ruby_test_verbose
 with_ctypesgen
@@ -953,6 +959,7 @@ CCC
 CPP
 LT_SYS_LIBRARY_PATH
 CXXCPP
+PYTHON
 SWIG_FEATURES
 SWIG_RB_FEATURES
 SWIG_PL_FEATURES
@@ -1497,7 +1504,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures subversion 1.13.0 to adapt to many kinds of systems.
+\`configure' configures subversion 1.14.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1563,7 +1570,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of subversion 1.13.0:";;
+     short | recursive ) echo "Configuration of subversion 1.14.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1702,6 +1709,7 @@ Optional Packages:
   --with-swig=PATH        Try to use 'PATH/bin/swig' to build the swig
                           bindings. If PATH is not specified, look for a
                           'swig' binary in your PATH.
+  --with-py3c=PREFIX      py3c python extension compatibility library
   --with-ruby-sitedir=SITEDIR
                           install Ruby bindings in SITEDIR (default is same as
                           ruby's one)
@@ -1742,6 +1750,7 @@ Some influential environment variables:
   LT_SYS_LIBRARY_PATH
               User-defined run-time library search path.
   CXXCPP      C++ preprocessor
+  PYTHON      Python interpreter command
   SWIG_FEATURES
               SWIG feature flags common to all bindings
   SWIG_RB_FEATURES
@@ -1817,7 +1826,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-subversion configure 1.13.0
+subversion configure 1.14.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2361,7 +2370,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by subversion $as_me 1.13.0, which was
+It was created by subversion $as_me 1.14.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2741,8 +2750,8 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.13.0" >&5
-$as_echo "$as_me: Configuring Subversion 1.13.0" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.14.0" >&5
+$as_echo "$as_me: Configuring Subversion 1.14.0" >&6;}
 
 abs_srcdir="`cd $srcdir && pwd`"
 
@@ -4764,7 +4773,7 @@ fi
 # ==== Libraries, for which we may have source to build ======================
 
 
-APR_VER_REGEXES="1\.[3-9]\. 2\."
+APR_VER_REGEXES="1\.[5-9]\. 2\."
 
 
   APR_WANTED_REGEXES="$APR_VER_REGEXES"
@@ -23268,7 +23277,7 @@ fi
 
     fi
     if test "$utf8proc_found" != "yes"; then
-      as_fn_error $? "Subversion requires UTF8PROC" "$LINENO" 5
+      as_fn_error $? "Subversion requires UTF8PROC; install it or re-run configure with \"--with-utf8proc=internal\"" "$LINENO" 5
     fi
   fi
 
@@ -24249,6 +24258,8 @@ $as_echo "$as_me: WARNING: Subversion requires SWIG >= 1.3.24" >&2;}
 
   SWIG_PY_COMPILE="none"
   SWIG_PY_LINK="none"
+  SWIG_PY_OPTS="none"
+  SWIG_PY_ERRMSG="check config.log for details"
   if test "$PYTHON" != "none"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring python swig binding" >&5
 $as_echo "$as_me: Configuring python swig binding" >&6;}
@@ -24267,48 +24278,170 @@ $as_echo "$ac_cv_python_includes" >&6; }
     SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
 
     if test "$ac_cv_python_includes" = "none"; then
+      SWIG_PY_ERRMSG="no distutils found"
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python bindings cannot be built without distutils module" >&5
 $as_echo "$as_me: WARNING: python bindings cannot be built without distutils module" >&2;}
+    else
+
+      python_header_found="no"
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+      ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
+if test "x$ac_cv_header_Python_h" = xyes; then :
+
+        python_header_found="yes"
+
+fi
+
+
+      CPPFLAGS="$save_cppflags"
+
+      if test "$python_header_found" = "no"; then
+        SWIG_PY_ERRMSG="no Python.h found"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python.h not found; disabling python swig bindings" >&5
+$as_echo "$as_me: WARNING: Python.h not found; disabling python swig bindings" >&2;}
+      else
+
+  py3c_found=no
+  py3c_skip=no
+
+
+# Check whether --with-py3c was given.
+if test "${with_py3c+set}" = set; then :
+  withval=$with_py3c;
+    if test "$withval" = "yes"; then
+      py3c_skip=no
+    elif test "$withval" = "no"; then
+      py3c_skip=yes
+    else
+      py3c_skip=no
+      py3c_prefix="$withval"
     fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
+fi
+
+
+  if test "$py3c_skip" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Skipping configure of py3c" >&5
+$as_echo "$as_me: Skipping configure of py3c" >&6;}
+  else
+    if test -n "$py3c_prefix"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration via prefix $py3c_prefix" >&5
+$as_echo "$as_me: py3c library configuration via prefix $py3c_prefix" >&6;}
+
+            if test "$ac_cv_python_includes" = "none"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c cannot be used without distutils module" >&5
+$as_echo "$as_me: WARNING: py3c cannot be used without distutils module" >&2;}
+      fi
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix/include"
+      for ac_header in py3c.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
+if test "x$ac_cv_header_py3c_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PY3C_H 1
+_ACEOF
+
+          py3c_found="yes"
+          SVN_PY3C_INCLUDES="-I$py3c_prefix/include"
+
+fi
+
+done
+
+      CPPFLAGS="$save_cppflags"
+    else
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration via pkg-config" >&5
+$as_echo "$as_me: py3c library configuration via pkg-config" >&6;}
+  if test -n "$PKG_CONFIG"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for py3c library" >&5
+$as_echo_n "checking for py3c library... " >&6; }
+    if $PKG_CONFIG py3c --exists; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      py3c_found=yes
+      SVN_PY3C_INCLUDES=`$PKG_CONFIG py3c --cflags`
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  fi
+
+
+      if test "$py3c_found" = "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration without pkg-config" >&5
+$as_echo "$as_me: py3c library configuration without pkg-config" >&6;}
+
+                if test "$ac_cv_python_includes" = "none"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c cannot be used without distutils module" >&5
+$as_echo "$as_me: WARNING: py3c cannot be used without distutils module" >&2;}
+        fi
+
+        save_cppflags="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+        ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
+if test "x$ac_cv_header_py3c_h" = xyes; then :
+
+          py3c_found="yes"
+
+fi
+
+
+        CPPFLAGS="$save_cppflags"
+      fi
+    fi
+  fi
+
+
+
+
+        if test "$py3c_found" = "no"; then
+          SWIG_PY_ERRMSG="py3c library not found"
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c library not found; disabling python swig bindings" >&5
+$as_echo "$as_me: WARNING: py3c library not found; disabling python swig bindings" >&2;}
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
 $as_echo_n "checking for compiling Python extensions... " >&6; }
 if ${ac_cv_python_compile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
+            ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
 $as_echo "$ac_cv_python_compile" >&6; }
-    SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+          SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
 $as_echo_n "checking for linking Python extensions... " >&6; }
 if ${ac_cv_python_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+            ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
 $as_echo "$ac_cv_python_link" >&6; }
-    SWIG_PY_LINK="$ac_cv_python_link"
+          SWIG_PY_LINK="$ac_cv_python_link"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
 $as_echo_n "checking for linking Python libraries... " >&6; }
 if ${ac_cv_python_libs+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+            ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
 $as_echo "$ac_cv_python_libs" >&6; }
-    SWIG_PY_LIBS="`
+          SWIG_PY_LIBS="`
   input_flags="$ac_cv_python_libs"
   output_flags=""
   filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -24328,8 +24461,53 @@ $as_echo "$ac_cv_python_libs" >&6; }
     printf "%s" "${output_flags# }"
   fi
 `"
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5
+$as_echo_n "checking for Python >= 3... " >&6; }
+if ${ac_cv_python_is_py3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            ac_cv_python_is_py3="no"
+            $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \
+               ac_cv_python_is_py3="yes"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_is_py3" >&5
+$as_echo "$ac_cv_python_is_py3" >&6; }
+
+          if test "$ac_cv_python_is_py3" = "yes"; then
+            if test "$SWIG_VERSION" -ge "300010"; then
+                            SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5
+$as_echo "$as_me: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&2;}
+            fi
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
+            else
+              SWIG_PY_OPTS="-python -py3 -nofastunpack"
+            fi
+          else
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -classic"
+                            SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_OPTS="-python -nofastunpack"
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5
+$as_echo "$as_me: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&2;}
+            fi
+          fi
+        fi
+
+      fi
+    fi
+
   fi
 
+  SWIG_PL_ERRMSG="check config.log for details"
   if test "$PERL" != "none"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5
 $as_echo_n "checking perl version... " >&6; }
@@ -24359,6 +24537,8 @@ $as_echo "$PERL_VERSION" >&6; }
     printf "%s" "${output_flags# }"
   fi
 `"
+
+            SWIG_PL_ERRMSG=""
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
 $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
@@ -24367,6 +24547,7 @@ $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
 
   SWIG_RB_COMPILE="none"
   SWIG_RB_LINK="none"
+  SWIG_RB_ERRMSG="check config.log for details"
   if test "$RUBY" != "none"; then
     if test x"$SWIG_VERSION" = x"3""00""008"; then
       # Use a local variable to escape the '#' sign.
@@ -24393,7 +24574,7 @@ if ${svn_cv_ruby_includes+:} false; then :
 else
 
     if test -d "$rbconfig_rubyhdrdir"; then
-            svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+            svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
       if test -d "$rbconfig_rubyarchhdrdir"; then
                 svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
       else
@@ -24589,6 +24770,8 @@ fi
       SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_TEST_VERBOSE" >&5
 $as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
+
+        SWIG_RB_ERRMSG=""
   fi
 
 
@@ -24605,6 +24788,10 @@ $as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
 
 
 
+
+
+
+
       ;;
       "yes")
 
@@ -24702,6 +24889,8 @@ $as_echo "$as_me: WARNING: Subversion requires SWIG >= 1.3.24" >&2;}
 
   SWIG_PY_COMPILE="none"
   SWIG_PY_LINK="none"
+  SWIG_PY_OPTS="none"
+  SWIG_PY_ERRMSG="check config.log for details"
   if test "$PYTHON" != "none"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring python swig binding" >&5
 $as_echo "$as_me: Configuring python swig binding" >&6;}
@@ -24720,48 +24909,170 @@ $as_echo "$ac_cv_python_includes" >&6; }
     SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
 
     if test "$ac_cv_python_includes" = "none"; then
+      SWIG_PY_ERRMSG="no distutils found"
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python bindings cannot be built without distutils module" >&5
 $as_echo "$as_me: WARNING: python bindings cannot be built without distutils module" >&2;}
+    else
+
+      python_header_found="no"
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+      ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
+if test "x$ac_cv_header_Python_h" = xyes; then :
+
+        python_header_found="yes"
+
+fi
+
+
+      CPPFLAGS="$save_cppflags"
+
+      if test "$python_header_found" = "no"; then
+        SWIG_PY_ERRMSG="no Python.h found"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python.h not found; disabling python swig bindings" >&5
+$as_echo "$as_me: WARNING: Python.h not found; disabling python swig bindings" >&2;}
+      else
+
+  py3c_found=no
+  py3c_skip=no
+
+
+# Check whether --with-py3c was given.
+if test "${with_py3c+set}" = set; then :
+  withval=$with_py3c;
+    if test "$withval" = "yes"; then
+      py3c_skip=no
+    elif test "$withval" = "no"; then
+      py3c_skip=yes
+    else
+      py3c_skip=no
+      py3c_prefix="$withval"
+    fi
+
+fi
+
+
+  if test "$py3c_skip" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Skipping configure of py3c" >&5
+$as_echo "$as_me: Skipping configure of py3c" >&6;}
+  else
+    if test -n "$py3c_prefix"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration via prefix $py3c_prefix" >&5
+$as_echo "$as_me: py3c library configuration via prefix $py3c_prefix" >&6;}
+
+            if test "$ac_cv_python_includes" = "none"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c cannot be used without distutils module" >&5
+$as_echo "$as_me: WARNING: py3c cannot be used without distutils module" >&2;}
+      fi
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix/include"
+      for ac_header in py3c.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
+if test "x$ac_cv_header_py3c_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PY3C_H 1
+_ACEOF
+
+          py3c_found="yes"
+          SVN_PY3C_INCLUDES="-I$py3c_prefix/include"
+
+fi
+
+done
+
+      CPPFLAGS="$save_cppflags"
+    else
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration via pkg-config" >&5
+$as_echo "$as_me: py3c library configuration via pkg-config" >&6;}
+  if test -n "$PKG_CONFIG"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for py3c library" >&5
+$as_echo_n "checking for py3c library... " >&6; }
+    if $PKG_CONFIG py3c --exists; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      py3c_found=yes
+      SVN_PY3C_INCLUDES=`$PKG_CONFIG py3c --cflags`
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
+  fi
+
+
+      if test "$py3c_found" = "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration without pkg-config" >&5
+$as_echo "$as_me: py3c library configuration without pkg-config" >&6;}
+
+                if test "$ac_cv_python_includes" = "none"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c cannot be used without distutils module" >&5
+$as_echo "$as_me: WARNING: py3c cannot be used without distutils module" >&2;}
+        fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
+        save_cppflags="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+        ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
+if test "x$ac_cv_header_py3c_h" = xyes; then :
+
+          py3c_found="yes"
+
+fi
+
+
+        CPPFLAGS="$save_cppflags"
+      fi
+    fi
+  fi
+
+
+
+
+        if test "$py3c_found" = "no"; then
+          SWIG_PY_ERRMSG="py3c library not found"
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c library not found; disabling python swig bindings" >&5
+$as_echo "$as_me: WARNING: py3c library not found; disabling python swig bindings" >&2;}
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
 $as_echo_n "checking for compiling Python extensions... " >&6; }
 if ${ac_cv_python_compile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
+            ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
 $as_echo "$ac_cv_python_compile" >&6; }
-    SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+          SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
 $as_echo_n "checking for linking Python extensions... " >&6; }
 if ${ac_cv_python_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+            ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
 $as_echo "$ac_cv_python_link" >&6; }
-    SWIG_PY_LINK="$ac_cv_python_link"
+          SWIG_PY_LINK="$ac_cv_python_link"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
 $as_echo_n "checking for linking Python libraries... " >&6; }
 if ${ac_cv_python_libs+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+            ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
 $as_echo "$ac_cv_python_libs" >&6; }
-    SWIG_PY_LIBS="`
+          SWIG_PY_LIBS="`
   input_flags="$ac_cv_python_libs"
   output_flags=""
   filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -24781,8 +25092,53 @@ $as_echo "$ac_cv_python_libs" >&6; }
     printf "%s" "${output_flags# }"
   fi
 `"
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5
+$as_echo_n "checking for Python >= 3... " >&6; }
+if ${ac_cv_python_is_py3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            ac_cv_python_is_py3="no"
+            $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \
+               ac_cv_python_is_py3="yes"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_is_py3" >&5
+$as_echo "$ac_cv_python_is_py3" >&6; }
+
+          if test "$ac_cv_python_is_py3" = "yes"; then
+            if test "$SWIG_VERSION" -ge "300010"; then
+                            SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5
+$as_echo "$as_me: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&2;}
+            fi
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
+            else
+              SWIG_PY_OPTS="-python -py3 -nofastunpack"
+            fi
+          else
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -classic"
+                            SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_OPTS="-python -nofastunpack"
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5
+$as_echo "$as_me: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&2;}
+            fi
+          fi
+        fi
+
+      fi
+    fi
+
   fi
 
+  SWIG_PL_ERRMSG="check config.log for details"
   if test "$PERL" != "none"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5
 $as_echo_n "checking perl version... " >&6; }
@@ -24812,6 +25168,8 @@ $as_echo "$PERL_VERSION" >&6; }
     printf "%s" "${output_flags# }"
   fi
 `"
+
+            SWIG_PL_ERRMSG=""
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
 $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
@@ -24820,6 +25178,7 @@ $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
 
   SWIG_RB_COMPILE="none"
   SWIG_RB_LINK="none"
+  SWIG_RB_ERRMSG="check config.log for details"
   if test "$RUBY" != "none"; then
     if test x"$SWIG_VERSION" = x"3""00""008"; then
       # Use a local variable to escape the '#' sign.
@@ -24846,7 +25205,7 @@ if ${svn_cv_ruby_includes+:} false; then :
 else
 
     if test -d "$rbconfig_rubyhdrdir"; then
-            svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+            svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
       if test -d "$rbconfig_rubyarchhdrdir"; then
                 svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
       else
@@ -25042,6 +25401,8 @@ fi
       SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_TEST_VERBOSE" >&5
 $as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
+
+        SWIG_RB_ERRMSG=""
   fi
 
 
@@ -25058,6 +25419,10 @@ $as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
 
 
 
+
+
+
+
       ;;
       *)
 
@@ -25155,6 +25520,8 @@ $as_echo "$as_me: WARNING: Subversion requires SWIG >= 1.3.24" >&2;}
 
   SWIG_PY_COMPILE="none"
   SWIG_PY_LINK="none"
+  SWIG_PY_OPTS="none"
+  SWIG_PY_ERRMSG="check config.log for details"
   if test "$PYTHON" != "none"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring python swig binding" >&5
 $as_echo "$as_me: Configuring python swig binding" >&6;}
@@ -25173,48 +25540,170 @@ $as_echo "$ac_cv_python_includes" >&6; }
     SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
 
     if test "$ac_cv_python_includes" = "none"; then
+      SWIG_PY_ERRMSG="no distutils found"
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python bindings cannot be built without distutils module" >&5
 $as_echo "$as_me: WARNING: python bindings cannot be built without distutils module" >&2;}
+    else
+
+      python_header_found="no"
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+      ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
+if test "x$ac_cv_header_Python_h" = xyes; then :
+
+        python_header_found="yes"
+
+fi
+
+
+      CPPFLAGS="$save_cppflags"
+
+      if test "$python_header_found" = "no"; then
+        SWIG_PY_ERRMSG="no Python.h found"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python.h not found; disabling python swig bindings" >&5
+$as_echo "$as_me: WARNING: Python.h not found; disabling python swig bindings" >&2;}
+      else
+
+  py3c_found=no
+  py3c_skip=no
+
+
+# Check whether --with-py3c was given.
+if test "${with_py3c+set}" = set; then :
+  withval=$with_py3c;
+    if test "$withval" = "yes"; then
+      py3c_skip=no
+    elif test "$withval" = "no"; then
+      py3c_skip=yes
+    else
+      py3c_skip=no
+      py3c_prefix="$withval"
+    fi
+
+fi
+
+
+  if test "$py3c_skip" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Skipping configure of py3c" >&5
+$as_echo "$as_me: Skipping configure of py3c" >&6;}
+  else
+    if test -n "$py3c_prefix"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration via prefix $py3c_prefix" >&5
+$as_echo "$as_me: py3c library configuration via prefix $py3c_prefix" >&6;}
+
+            if test "$ac_cv_python_includes" = "none"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c cannot be used without distutils module" >&5
+$as_echo "$as_me: WARNING: py3c cannot be used without distutils module" >&2;}
+      fi
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix/include"
+      for ac_header in py3c.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
+if test "x$ac_cv_header_py3c_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PY3C_H 1
+_ACEOF
+
+          py3c_found="yes"
+          SVN_PY3C_INCLUDES="-I$py3c_prefix/include"
+
+fi
+
+done
+
+      CPPFLAGS="$save_cppflags"
+    else
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration via pkg-config" >&5
+$as_echo "$as_me: py3c library configuration via pkg-config" >&6;}
+  if test -n "$PKG_CONFIG"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for py3c library" >&5
+$as_echo_n "checking for py3c library... " >&6; }
+    if $PKG_CONFIG py3c --exists; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      py3c_found=yes
+      SVN_PY3C_INCLUDES=`$PKG_CONFIG py3c --cflags`
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
+  fi
+
+
+      if test "$py3c_found" = "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration without pkg-config" >&5
+$as_echo "$as_me: py3c library configuration without pkg-config" >&6;}
+
+                if test "$ac_cv_python_includes" = "none"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c cannot be used without distutils module" >&5
+$as_echo "$as_me: WARNING: py3c cannot be used without distutils module" >&2;}
+        fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
+        save_cppflags="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+        ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
+if test "x$ac_cv_header_py3c_h" = xyes; then :
+
+          py3c_found="yes"
+
+fi
+
+
+        CPPFLAGS="$save_cppflags"
+      fi
+    fi
+  fi
+
+
+
+
+        if test "$py3c_found" = "no"; then
+          SWIG_PY_ERRMSG="py3c library not found"
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c library not found; disabling python swig bindings" >&5
+$as_echo "$as_me: WARNING: py3c library not found; disabling python swig bindings" >&2;}
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
 $as_echo_n "checking for compiling Python extensions... " >&6; }
 if ${ac_cv_python_compile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
+            ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
 $as_echo "$ac_cv_python_compile" >&6; }
-    SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+          SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
 $as_echo_n "checking for linking Python extensions... " >&6; }
 if ${ac_cv_python_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+            ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
 $as_echo "$ac_cv_python_link" >&6; }
-    SWIG_PY_LINK="$ac_cv_python_link"
+          SWIG_PY_LINK="$ac_cv_python_link"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
 $as_echo_n "checking for linking Python libraries... " >&6; }
 if ${ac_cv_python_libs+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+            ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
 $as_echo "$ac_cv_python_libs" >&6; }
-    SWIG_PY_LIBS="`
+          SWIG_PY_LIBS="`
   input_flags="$ac_cv_python_libs"
   output_flags=""
   filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -25234,8 +25723,53 @@ $as_echo "$ac_cv_python_libs" >&6; }
     printf "%s" "${output_flags# }"
   fi
 `"
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5
+$as_echo_n "checking for Python >= 3... " >&6; }
+if ${ac_cv_python_is_py3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            ac_cv_python_is_py3="no"
+            $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \
+               ac_cv_python_is_py3="yes"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_is_py3" >&5
+$as_echo "$ac_cv_python_is_py3" >&6; }
+
+          if test "$ac_cv_python_is_py3" = "yes"; then
+            if test "$SWIG_VERSION" -ge "300010"; then
+                            SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5
+$as_echo "$as_me: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&2;}
+            fi
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
+            else
+              SWIG_PY_OPTS="-python -py3 -nofastunpack"
+            fi
+          else
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -classic"
+                            SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_OPTS="-python -nofastunpack"
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5
+$as_echo "$as_me: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&2;}
+            fi
+          fi
+        fi
+
+      fi
+    fi
+
   fi
 
+  SWIG_PL_ERRMSG="check config.log for details"
   if test "$PERL" != "none"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5
 $as_echo_n "checking perl version... " >&6; }
@@ -25265,6 +25799,8 @@ $as_echo "$PERL_VERSION" >&6; }
     printf "%s" "${output_flags# }"
   fi
 `"
+
+            SWIG_PL_ERRMSG=""
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
 $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
@@ -25273,6 +25809,7 @@ $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
 
   SWIG_RB_COMPILE="none"
   SWIG_RB_LINK="none"
+  SWIG_RB_ERRMSG="check config.log for details"
   if test "$RUBY" != "none"; then
     if test x"$SWIG_VERSION" = x"3""00""008"; then
       # Use a local variable to escape the '#' sign.
@@ -25299,7 +25836,7 @@ if ${svn_cv_ruby_includes+:} false; then :
 else
 
     if test -d "$rbconfig_rubyhdrdir"; then
-            svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+            svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
       if test -d "$rbconfig_rubyarchhdrdir"; then
                 svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
       else
@@ -25495,6 +26032,8 @@ fi
       SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_TEST_VERBOSE" >&5
 $as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
+
+        SWIG_RB_ERRMSG=""
   fi
 
 
@@ -25511,6 +26050,10 @@ $as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
 
 
 
+
+
+
+
       ;;
     esac
 
@@ -25611,6 +26154,8 @@ $as_echo "$as_me: WARNING: Subversion requires SWIG >= 1.3.24" >&2;}
 
   SWIG_PY_COMPILE="none"
   SWIG_PY_LINK="none"
+  SWIG_PY_OPTS="none"
+  SWIG_PY_ERRMSG="check config.log for details"
   if test "$PYTHON" != "none"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring python swig binding" >&5
 $as_echo "$as_me: Configuring python swig binding" >&6;}
@@ -25629,48 +26174,170 @@ $as_echo "$ac_cv_python_includes" >&6; }
     SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
 
     if test "$ac_cv_python_includes" = "none"; then
+      SWIG_PY_ERRMSG="no distutils found"
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python bindings cannot be built without distutils module" >&5
 $as_echo "$as_me: WARNING: python bindings cannot be built without distutils module" >&2;}
+    else
+
+      python_header_found="no"
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+      ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
+if test "x$ac_cv_header_Python_h" = xyes; then :
+
+        python_header_found="yes"
+
+fi
+
+
+      CPPFLAGS="$save_cppflags"
+
+      if test "$python_header_found" = "no"; then
+        SWIG_PY_ERRMSG="no Python.h found"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python.h not found; disabling python swig bindings" >&5
+$as_echo "$as_me: WARNING: Python.h not found; disabling python swig bindings" >&2;}
+      else
+
+  py3c_found=no
+  py3c_skip=no
+
+
+# Check whether --with-py3c was given.
+if test "${with_py3c+set}" = set; then :
+  withval=$with_py3c;
+    if test "$withval" = "yes"; then
+      py3c_skip=no
+    elif test "$withval" = "no"; then
+      py3c_skip=yes
+    else
+      py3c_skip=no
+      py3c_prefix="$withval"
+    fi
+
+fi
+
+
+  if test "$py3c_skip" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Skipping configure of py3c" >&5
+$as_echo "$as_me: Skipping configure of py3c" >&6;}
+  else
+    if test -n "$py3c_prefix"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration via prefix $py3c_prefix" >&5
+$as_echo "$as_me: py3c library configuration via prefix $py3c_prefix" >&6;}
+
+            if test "$ac_cv_python_includes" = "none"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c cannot be used without distutils module" >&5
+$as_echo "$as_me: WARNING: py3c cannot be used without distutils module" >&2;}
+      fi
+
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix/include"
+      for ac_header in py3c.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
+if test "x$ac_cv_header_py3c_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PY3C_H 1
+_ACEOF
+
+          py3c_found="yes"
+          SVN_PY3C_INCLUDES="-I$py3c_prefix/include"
+
+fi
+
+done
+
+      CPPFLAGS="$save_cppflags"
+    else
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration via pkg-config" >&5
+$as_echo "$as_me: py3c library configuration via pkg-config" >&6;}
+  if test -n "$PKG_CONFIG"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for py3c library" >&5
+$as_echo_n "checking for py3c library... " >&6; }
+    if $PKG_CONFIG py3c --exists; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      py3c_found=yes
+      SVN_PY3C_INCLUDES=`$PKG_CONFIG py3c --cflags`
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
+  fi
+
+
+      if test "$py3c_found" = "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: py3c library configuration without pkg-config" >&5
+$as_echo "$as_me: py3c library configuration without pkg-config" >&6;}
+
+                if test "$ac_cv_python_includes" = "none"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c cannot be used without distutils module" >&5
+$as_echo "$as_me: WARNING: py3c cannot be used without distutils module" >&2;}
+        fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
+        save_cppflags="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $ac_cv_python_includes"
+        ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
+if test "x$ac_cv_header_py3c_h" = xyes; then :
+
+          py3c_found="yes"
+
+fi
+
+
+        CPPFLAGS="$save_cppflags"
+      fi
+    fi
+  fi
+
+
+
+
+        if test "$py3c_found" = "no"; then
+          SWIG_PY_ERRMSG="py3c library not found"
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: py3c library not found; disabling python swig bindings" >&5
+$as_echo "$as_me: WARNING: py3c library not found; disabling python swig bindings" >&2;}
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
 $as_echo_n "checking for compiling Python extensions... " >&6; }
 if ${ac_cv_python_compile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
+            ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
 $as_echo "$ac_cv_python_compile" >&6; }
-    SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+          SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
 $as_echo_n "checking for linking Python extensions... " >&6; }
 if ${ac_cv_python_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+            ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
 $as_echo "$ac_cv_python_link" >&6; }
-    SWIG_PY_LINK="$ac_cv_python_link"
+          SWIG_PY_LINK="$ac_cv_python_link"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
 $as_echo_n "checking for linking Python libraries... " >&6; }
 if ${ac_cv_python_libs+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+            ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
 $as_echo "$ac_cv_python_libs" >&6; }
-    SWIG_PY_LIBS="`
+          SWIG_PY_LIBS="`
   input_flags="$ac_cv_python_libs"
   output_flags=""
   filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -25690,8 +26357,53 @@ $as_echo "$ac_cv_python_libs" >&6; }
     printf "%s" "${output_flags# }"
   fi
 `"
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5
+$as_echo_n "checking for Python >= 3... " >&6; }
+if ${ac_cv_python_is_py3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            ac_cv_python_is_py3="no"
+            $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \
+               ac_cv_python_is_py3="yes"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_is_py3" >&5
+$as_echo "$ac_cv_python_is_py3" >&6; }
+
+          if test "$ac_cv_python_is_py3" = "yes"; then
+            if test "$SWIG_VERSION" -ge "300010"; then
+                            SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5
+$as_echo "$as_me: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&2;}
+            fi
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
+            else
+              SWIG_PY_OPTS="-python -py3 -nofastunpack"
+            fi
+          else
+            if test "$SWIG_VERSION" -lt "400000"; then
+              SWIG_PY_OPTS="-python -classic"
+                            SWIG_PY_ERRMSG=""
+            else
+              SWIG_PY_OPTS="-python -nofastunpack"
+              SWIG_PY_ERRMSG="SWIG version is not suitable"
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5
+$as_echo "$as_me: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&2;}
+            fi
+          fi
+        fi
+
+      fi
+    fi
+
   fi
 
+  SWIG_PL_ERRMSG="check config.log for details"
   if test "$PERL" != "none"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5
 $as_echo_n "checking perl version... " >&6; }
@@ -25721,6 +26433,8 @@ $as_echo "$PERL_VERSION" >&6; }
     printf "%s" "${output_flags# }"
   fi
 `"
+
+            SWIG_PL_ERRMSG=""
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
 $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
@@ -25729,6 +26443,7 @@ $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
 
   SWIG_RB_COMPILE="none"
   SWIG_RB_LINK="none"
+  SWIG_RB_ERRMSG="check config.log for details"
   if test "$RUBY" != "none"; then
     if test x"$SWIG_VERSION" = x"3""00""008"; then
       # Use a local variable to escape the '#' sign.
@@ -25755,7 +26470,7 @@ if ${svn_cv_ruby_includes+:} false; then :
 else
 
     if test -d "$rbconfig_rubyhdrdir"; then
-            svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+            svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
       if test -d "$rbconfig_rubyarchhdrdir"; then
                 svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
       else
@@ -25951,6 +26666,8 @@ fi
       SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_TEST_VERBOSE" >&5
 $as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
+
+        SWIG_RB_ERRMSG=""
   fi
 
 
@@ -25968,6 +26685,10 @@ $as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
 
 
 
+
+
+
+
 fi
 
 
@@ -27120,7 +27841,7 @@ fi
 
 
 # Ensure that SWIG is checked after reconfiguration.
-rm -f .swig_checked
+rm -f .swig_checked .swig_pl_checked .swig_py_checked .swig_rb_checked
 
 
 cat >>confdefs.h <<_ACEOF
@@ -27640,7 +28361,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by subversion $as_me 1.13.0, which was
+This file was extended by subversion $as_me 1.14.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27706,7 +28427,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-subversion config.status 1.13.0
+subversion config.status 1.14.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 232334d..a2e343a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ AC_SUBST([MKDIR])
 dnl verify apr version and set apr flags
 dnl These regular expressions should not contain "\(" and "\)".
 
-APR_VER_REGEXES=["1\.[3-9]\. 2\."]
+APR_VER_REGEXES=["1\.[5-9]\. 2\."]
 
 SVN_LIB_APR($APR_VER_REGEXES)
 
@@ -1273,7 +1273,7 @@ AS_HELP_STRING([--enable-gprof],
 # Scripting and Bindings languages
 
 # Python: Used for testsuite, and bindings
-
+AC_ARG_VAR([PYTHON], [Python interpreter command])
 
 PYTHON="`$abs_srcdir/build/find_python.sh`"
 if test -z "$PYTHON"; then
@@ -1641,7 +1641,7 @@ fi
 AC_SUBST(SVN_CONFIG_SCRIPT_FILES)
 
 # Ensure that SWIG is checked after reconfiguration.
-rm -f .swig_checked
+rm -f .swig_checked .swig_pl_checked .swig_py_checked .swig_rb_checked
 
 dnl Provide ${host} for use in compiled code (for svn --version)
 AC_DEFINE_UNQUOTED([SVN_BUILD_HOST], "${host}",
diff --git a/debian/changelog b/debian/changelog
index 390b476..000228d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,48 @@
+subversion (1.14.0-1) unstable; urgency=medium
+
+  * Update to new upstream version 1.14.0.
+  * Install NOTICE as required by Apache license
+  * rules: Disable dh_auto_test for Arch: all builds
+
+ -- James McCoy <jamessan@debian.org>  Wed, 03 Jun 2020 22:21:57 -0400
+
+subversion (1.14.0~rc2-3) experimental; urgency=medium
+
+  * copyright: Add details for build/ac-macros/ax_boost_*
+  * Stop installing NOTICE, since debian/copyright has all the information
+
+ -- James McCoy <jamessan@debian.org>  Wed, 22 Apr 2020 07:57:45 -0400
+
+subversion (1.14.0~rc2-2) experimental; urgency=medium
+
+  * Ship svnshell as an example, not under /usr/bin/
+  * Switch to using dh instead of plain debhelper
+  * Fix an error leak in debian/patches/last-changed-date-charset.  Thanks to
+    Daniel Shahaf for the patch.  (Closes: #956921)
+
+ -- James McCoy <jamessan@debian.org>  Tue, 21 Apr 2020 23:05:17 -0400
+
+subversion (1.14.0~rc2-1) experimental; urgency=medium
+
+  * Update to new upstream version 1.14.0~rc2.
+    + Fix crash when using git-svn with kwallet.  (Closes: #945443)
+    + Escape filenames when invoking $SVN_EDITOR.  (Closes: #577118)
+    + Transition Python bindings from python 2 to python 3.  (Closes: #739790, #938578)
+  * Remove python-subversion from subversion-tool's Recommends, since nothing
+    uses the Python bindings.
+  * Replace python-subversion with python3-subversion
+    + Build-Depend on swig (>= 3.0.10), instead of swig3.0 (Closes: #954866)
+    + Add new Build-Depends on py3c
+    + Build-Depend on python3-all-dev instead of python-all-dev
+  * rules: Run tests in parallel according to DEB_BUILD_OPTIONS setting
+  * libsvn1.symbols: Update for 1.14 API changes
+  * Add support for pkg.subversion.noruby Build-Profile
+  * Build-Conflict against incompatible libsvn1/libsvn-dev
+  * lintian: Override concatenated-upstream-signatures
+  * Update release notes for 1.9 - 1.13 and add 1.14
+
+ -- James McCoy <jamessan@debian.org>  Sun, 12 Apr 2020 15:37:14 -0400
+
 subversion (1.13.0-4) unstable; urgency=medium
 
   * Disable building python-subversion if SWIG 4.0 is installed
diff --git a/debian/control b/debian/control
index edf4c37..88acde8 100644
--- a/debian/control
+++ b/debian/control
@@ -27,14 +27,18 @@ Build-Depends: autoconf,
                libtool,
                libutf8proc-dev,
                perl,
-# Minimum version required to run tests
-               python-all-dev (>= 2.7),
+               py3c-dev,
+               python3-all-dev,
                rename,
-               ruby,
-               ruby-dev,
-               swig,
+               ruby <!pkg.subversion.noruby>,
+               ruby-dev <!pkg.subversion.noruby>,
+               swig (>= 3.0.10),
                zlib1g-dev
-Build-Conflicts: libsvn-dev (<< 1.13~)
+Build-Conflicts:
+ libsvn-dev (<< 1.14~),
+ libsvn-dev (>= 1.15~),
+ libsvn1 (<< 1.14~),
+ libsvn1 (>= 1.15~),
 Rules-Requires-Root: no
 Homepage: http://subversion.apache.org/
 Vcs-Git: https://salsa.debian.org/jamessan/subversion.git
@@ -106,15 +110,15 @@ Description: Apache Subversion server modules for Apache httpd
  server backend, to serve repositories over the http and https
  protocols.  See the 'subversion' package for more information.
 
-Package: python-subversion
+Package: python3-subversion
 Section: python
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
-Description: Python bindings for Apache Subversion
- This is a set of Python interfaces to libsvn, the Apache Subversion
- libraries.  It is useful if you want to, for example, write a Python
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
+Description: Python3 bindings for Apache Subversion
+ This is a set of Python3 interfaces to libsvn, the Apache Subversion
+ libraries.  It is useful if you want to, for example, write a Python3
  script that manipulates a Subversion repository or working copy.  See
  the 'subversion' package for more information.
 
@@ -173,6 +177,7 @@ Description: Perl bindings for Apache Subversion
 Package: ruby-svn
 Section: ruby
 Architecture: any
+Build-Profiles: <!pkg.subversion.noruby>
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ruby, ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/copyright b/debian/copyright
index b774170..94f4490 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -75,6 +75,12 @@ Copyright: 2010-2013, Peter Noordhuis <pcnoordhuis at gmail dot com>
            2010-2014, Salvatore Sanfilippo <anitrez at gmail dot com>
 License: BSD-2-clause
 
+Files: build/ac-macros/ax_boost_base.m4
+       build/ac-macros/ax_boost_unit_test_framework.m4
+Copyright: 2008 Thome Porschberg <thomas@randspringer.de>
+           2009 Peter Adolphs
+License: BoostAcMacros
+
 License: GPL-2+
  On Debian systems, the complete text of the GPL version 2 license can be
  found in `/usr/share/common-licenses/GPL-2'.
@@ -394,3 +400,9 @@ License: AFL-3
      open source software unless your Modified License has been
      approved by Open Source Initiative (OSI) and You comply with its
      license review and certification process.
+
+License: BoostAcMacros
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved. This file is offered as-is, without any
+ warranty.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 02e9206..9cb745d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -7,7 +7,7 @@ pristine-tar = False
 pristine-tar-commit = False
 
 [import-orig]
-merge-mode = merge
+merge = False
 
 [pq]
 patch-numbers = False
diff --git a/debian/libsvn1.symbols b/debian/libsvn1.symbols
index 6f95d74..eb24ad1 100644
--- a/debian/libsvn1.symbols
+++ b/debian/libsvn1.symbols
@@ -532,6 +532,7 @@ libsvn_ra-1.so.1 libsvn1 #MINVER#
  svn_ra_open2@Base 1.4
  svn_ra_open3@Base 1.5
  svn_ra_open4@Base 1.7
+ svn_ra_open5@Base 1.14
  svn_ra_open@Base 1.4
  svn_ra_print_modules@Base 1.4
  svn_ra_print_ra_libraries@Base 1.4
diff --git a/debian/patches/apr-abi b/debian/patches/apr-abi
index 059e7c1..ec28190 100644
--- a/debian/patches/apr-abi
+++ b/debian/patches/apr-abi
@@ -16,7 +16,7 @@ be ABI-compatible again if and when we move to apr-2.x.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 4a3683c..232334d 100644
+index 07103e5..a2e343a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -106,7 +106,7 @@ if test `expr $apr_version : 2` -ne 0; then
diff --git a/debian/patches/build-fixes b/debian/patches/build-fixes
index f588703..066e303 100644
--- a/debian/patches/build-fixes
+++ b/debian/patches/build-fixes
@@ -12,10 +12,10 @@ Fix some build problems:
  2 files changed, 6 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index faf2a70..8c876b5 100644
+index 48a14bf..1390a69 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -913,8 +913,7 @@ clean-swig-pl:
+@@ -918,8 +918,7 @@ clean-swig-pl:
  	fi
  	for d in $(SWIG_PL_DIR)/libsvn_swig_perl; \
  	do \
@@ -25,7 +25,7 @@ index faf2a70..8c876b5 100644
  	done
  	if [ -f "$(SWIG_PL_DIR)/native/Makefile" ]; then \
  	  cd $(SWIG_PL_DIR)/native; $(MAKE) clean; \
-@@ -948,7 +947,7 @@ clean-swig-py:
+@@ -955,7 +954,7 @@ clean-swig-py:
  	fi
  	for d in $(SWIG_PY_DIR) $(SWIG_PY_DIR)/libsvn_swig_py; \
  	do \
@@ -34,7 +34,7 @@ index faf2a70..8c876b5 100644
  	done
  	find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) -name "*.pyc" -exec rm {} ';'
  
-@@ -980,8 +979,7 @@ clean-swig-rb:
+@@ -988,8 +987,7 @@ clean-swig-rb:
  	fi
  	for d in $(SWIG_RB_DIR) $(SWIG_RB_DIR)/libsvn_swig_ruby; \
  	do \
@@ -45,7 +45,7 @@ index faf2a70..8c876b5 100644
  
  extraclean-swig-rb: clean-swig-rb
 diff --git a/build.conf b/build.conf
-index 7631a61..29c2b60 100644
+index 1f0d2d8..2e3697a 100644
 --- a/build.conf
 +++ b/build.conf
 @@ -189,7 +189,7 @@ path = subversion/svnserve
@@ -64,7 +64,7 @@ index 7631a61..29c2b60 100644
 -libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr apriconv apr
 +libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr aprutil apriconv apr
  install = lib
- msvc-export = svn_client.h private/svn_client_mtcc.h private/svn_client_private.h
+ msvc-export = svn_client.h private/svn_client_mtcc.h private/svn_client_private.h private/svn_client_shelf.h private/svn_client_shelf2.h
  
 @@ -323,7 +323,7 @@ msvc-export = private/svn_fs_util.h
  description = Subversion General Repository Access Library
diff --git a/debian/patches/last-changed-date-charset b/debian/patches/last-changed-date-charset
index fd156c8..9f759f9 100644
--- a/debian/patches/last-changed-date-charset
+++ b/debian/patches/last-changed-date-charset
@@ -12,7 +12,7 @@ Not accepted upstream: http://svn.haxx.se/dev/archive-2006-04/0730.shtml
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/subversion/libsvn_subr/subst.c b/subversion/libsvn_subr/subst.c
-index c8c3018..b69f90a 100644
+index c8c3018..a1213cb 100644
 --- a/subversion/libsvn_subr/subst.c
 +++ b/subversion/libsvn_subr/subst.c
 @@ -210,8 +210,12 @@ keyword_printf(const char *fmt,
@@ -21,10 +21,10 @@ index c8c3018..b69f90a 100644
            if (date)
 -            svn_stringbuf_appendcstr(value,
 -                                     svn_time_to_human_cstring(date, pool));
-+	    {
++            {
 +              char *date_keyword;
-+              char *date_utf8 = svn_time_to_human_cstring (date, pool);
-+              svn_utf_cstring_from_utf8(&date_keyword, date_utf8, pool);
++              char *date_utf8 = svn_time_to_human_cstring(date, pool);
++              SVN_ERR(svn_utf_cstring_from_utf8(&date_keyword, date_utf8, pool));
 +              svn_stringbuf_appendcstr(value, date_keyword);
 +            }
            break;
diff --git a/debian/patches/python-builds b/debian/patches/python-builds
index f55d7b7..30d79ab 100644
--- a/debian/patches/python-builds
+++ b/debian/patches/python-builds
@@ -14,7 +14,7 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
  3 files changed, 13 insertions(+), 10 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index d6a173a..17632f0 100644
+index cee3c00..5eb6f45 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -148,6 +148,7 @@ BOOST_TEST_CPPFLAGS = @BOOST_CPPFLAGS@ -DBOOST_TEST_DYN_LINK -DBOOST_TEST_NO_MAI
@@ -22,11 +22,11 @@ index d6a173a..17632f0 100644
  
  SWIG = @SWIG@
 +PYTHON_INCLUDES = @PYTHON_INCLUDES@
- SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
+ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ @SVN_PY3C_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
  SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
  SWIG_PY_LINK = @SWIG_PY_LINK@
 diff --git a/build.conf b/build.conf
-index 0c631bd..97218d7 100644
+index 53c0138..16bd7b9 100644
 --- a/build.conf
 +++ b/build.conf
 @@ -498,7 +498,7 @@ external-project = svn_locale
@@ -109,10 +109,10 @@ index 0c631bd..97218d7 100644
  lang = python
  path = subversion/bindings/swig/python/libsvn_swig_py
 diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
-index 2963872..3c05797 100644
+index c707a8c..fea7f0d 100644
 --- a/build/ac-macros/swig.m4
 +++ b/build/ac-macros/swig.m4
-@@ -108,7 +108,8 @@ AC_DEFUN(SVN_FIND_SWIG,
+@@ -110,7 +110,8 @@ AC_DEFUN(SVN_FIND_SWIG,
      AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
        ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
      ])
@@ -121,9 +121,9 @@ index 2963872..3c05797 100644
 +    SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) \$(PYTHON_INCLUDES)"
  
      if test "$ac_cv_python_includes" = "none"; then
-       AC_MSG_WARN([python bindings cannot be built without distutils module])
-@@ -266,6 +267,7 @@ int main()
-       AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
+       SWIG_PY_ERRMSG="no distutils found"
+@@ -332,6 +333,7 @@ int main()
+     SWIG_RB_ERRMSG=""
    fi
    AC_SUBST(SWIG)
 +  AC_SUBST(PYTHON_INCLUDES)
diff --git a/debian/patches/repos-templates b/debian/patches/repos-templates
index 2de5b12..e3fd6e5 100644
--- a/debian/patches/repos-templates
+++ b/debian/patches/repos-templates
@@ -12,7 +12,7 @@ hooks, not just use them in place.
  1 file changed, 18 insertions(+), 10 deletions(-)
 
 diff --git a/subversion/libsvn_repos/repos.c b/subversion/libsvn_repos/repos.c
-index f46b828..73f4022 100644
+index 2189de8..df87652 100644
 --- a/subversion/libsvn_repos/repos.c
 +++ b/subversion/libsvn_repos/repos.c
 @@ -276,7 +276,7 @@ create_locks(svn_repos_t *repos, apr_pool_t *pool)
diff --git a/debian/patches/rpath b/debian/patches/rpath
index 0265d71..423c298 100644
--- a/debian/patches/rpath
+++ b/debian/patches/rpath
@@ -13,7 +13,7 @@ patch by David Kimdon <dwhedon@debian.org>.  The basic theory is:
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/build.conf b/build.conf
-index 29c2b60..0c631bd 100644
+index 2e3697a..53c0138 100644
 --- a/build.conf
 +++ b/build.conf
 @@ -572,7 +572,7 @@ lang = python
@@ -35,7 +35,7 @@ index 29c2b60..0c631bd 100644
  # need special build rule to include
  compile-cmd = $(COMPILE_SWIG_RB)
 diff --git a/build/generator/gen_base.py b/build/generator/gen_base.py
-index 458545c..a5054aa 100644
+index f3041f9..4d0e7f9 100644
 --- a/build/generator/gen_base.py
 +++ b/build/generator/gen_base.py
 @@ -599,7 +599,7 @@ class TargetLinked(Target):
diff --git a/debian/patches/ruby-no-strict-aliasing b/debian/patches/ruby-no-strict-aliasing
index 85ff8a9..7e2d228 100644
--- a/debian/patches/ruby-no-strict-aliasing
+++ b/debian/patches/ruby-no-strict-aliasing
@@ -10,12 +10,12 @@ be real bugs with real consequences.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 8c876b5..d6a173a 100644
+index 1390a69..cee3c00 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -154,7 +154,7 @@ SWIG_PY_LINK = @SWIG_PY_LINK@
- SWIG_PY_LIBS = @SWIG_PY_LIBS@
+@@ -156,7 +156,7 @@ SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@
  SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
+ SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@
  SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
 -SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
 +SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ -fno-strict-aliasing
diff --git a/debian/patches/series b/debian/patches/series
index f8ccabd..d1e1ffb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,10 +5,8 @@ rpath
 ruby-no-strict-aliasing
 ruby-test-svnserve-race
 ssh-no-controlmaster
-svnshell
 apr-abi
 python-builds
 examples-compile-instructions
 workaround_EINVAL_on_kfreebsd
-use-python2-as-the-interpreter-now-for-tests-not-python.patch
-swig.m4-Do-not-include-ruby-include-subdir.patch
+use-python3-as-the-interpreter-now-for-tests-not-python.patch
diff --git a/debian/patches/ssh-no-controlmaster b/debian/patches/ssh-no-controlmaster
index f1b9067..04ab32b 100644
--- a/debian/patches/ssh-no-controlmaster
+++ b/debian/patches/ssh-no-controlmaster
@@ -24,7 +24,7 @@ connection sharing, but only if a ControlMaster is already present.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/subversion/libsvn_ra_svn/client.c b/subversion/libsvn_ra_svn/client.c
-index dd60dbe..afdd12a 100644
+index f484519..c6e3d77 100644
 --- a/subversion/libsvn_ra_svn/client.c
 +++ b/subversion/libsvn_ra_svn/client.c
 @@ -399,7 +399,7 @@ static svn_error_t *find_tunnel_agent(const char *tunnel,
diff --git a/debian/patches/svnshell b/debian/patches/svnshell
deleted file mode 100644
index dc204f6..0000000
--- a/debian/patches/svnshell
+++ /dev/null
@@ -1,34 +0,0 @@
-From: James McCoy <jamessan@debian.org>
-Date: Wed, 1 Aug 2018 20:44:36 -0400
-Subject: svnshell
-
-Bug #234462: The error messages that svnshell spits out for unknown
-Bug #234462: The error messages that svnshell spits out for unknown
-commands are confusing. They should be replaced by a "Unknown command."
-error message.  Upstream says we have no sense of humor.  (:
-
-Patch from Roland Illig <roland.illig@gmx.de>.
----
- tools/examples/svnshell.py | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/tools/examples/svnshell.py b/tools/examples/svnshell.py
-index 9c67af4..b05e7ef 100755
---- a/tools/examples/svnshell.py
-+++ b/tools/examples/svnshell.py
-@@ -56,14 +56,8 @@ class SVNShell(Cmd):
-   def postcmd(self, stop, line):
-     self._setup_prompt()
- 
--  _errors = ["Huh?",
--             "Whatchoo talkin' 'bout, Willis?",
--             "Say what?",
--             "Nope.  Not gonna do it.",
--             "Ehh...I don't think so, chief."]
--
-   def default(self, line):
--    print(self._errors[randint(0, len(self._errors) - 1)])
-+    print "Unknown command."
- 
-   def do_cat(self, arg):
-     """dump the contents of a file"""
diff --git a/debian/patches/swig.m4-Do-not-include-ruby-include-subdir.patch b/debian/patches/swig.m4-Do-not-include-ruby-include-subdir.patch
deleted file mode 100644
index 7b02d8b..0000000
--- a/debian/patches/swig.m4-Do-not-include-ruby-include-subdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Mon, 23 Mar 2020 23:41:41 -0400
-Subject: swig.m4: Do not include ruby include subdir
-
-It has headers that clash with standard ones, such as assert.h.
-
-Signed-off-by: James McCoy <jamessan@debian.org>
----
- build/ac-macros/swig.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
-index 3c05797..4031462 100644
---- a/build/ac-macros/swig.m4
-+++ b/build/ac-macros/swig.m4
-@@ -168,7 +168,7 @@ AC_DEFUN(SVN_FIND_SWIG,
-     AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
-     if test -d "$rbconfig_rubyhdrdir"; then
-       dnl Ruby >=1.9
--      svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
-+      svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby/backward"
-       if test -d "$rbconfig_rubyarchhdrdir"; then
-         dnl Ruby >=2.0
-         svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
diff --git a/debian/patches/use-python2-as-the-interpreter-now-for-tests-not-python.patch b/debian/patches/use-python3-as-the-interpreter-now-for-tests-not-python.patch
index e071826..505f52b 100644
--- a/debian/patches/use-python2-as-the-interpreter-now-for-tests-not-python.patch
+++ b/debian/patches/use-python3-as-the-interpreter-now-for-tests-not-python.patch
@@ -1,9 +1,9 @@
 From: Steve Langasek <steve.langasek@canonical.com>
 Date: Sun, 12 Jan 2020 23:25:01 -0800
-Subject: use python2 as the interpreter now for tests, not python
+Subject: use python3 as the interpreter now for tests, not python
 
 /usr/bin/python is no longer guaranteed to exist, per PEP 394.  Use
-python2 instead for compatibility.
+python3 instead for compatibility.
 
 Closes: #948770
 Signed-off-by: James McCoy <jamessan@debian.org>
@@ -12,12 +12,12 @@ Signed-off-by: James McCoy <jamessan@debian.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/subversion/tests/cmdline/svneditor.py b/subversion/tests/cmdline/svneditor.py
-index 7f59987..375fc07 100755
+index 7f59987..4699dc1 100755
 --- a/subversion/tests/cmdline/svneditor.py
 +++ b/subversion/tests/cmdline/svneditor.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/env python2
++#!/usr/bin/env python3
  #
  #  svneditor.py: a mock $SVN_EDITOR for the Subversion test suite
  #
diff --git a/debian/python-subversion.README.Debian b/debian/python-subversion.README.Debian
deleted file mode 100644
index e33cc79..0000000
--- a/debian/python-subversion.README.Debian
+++ /dev/null
@@ -1 +0,0 @@
-See /usr/bin/svnshell for an example that uses the python bindings.
diff --git a/debian/python-subversion.dirs b/debian/python-subversion.dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/python-subversion.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/python-subversion.lintian-overrides b/debian/python-subversion.lintian-overrides
deleted file mode 100644
index 9889cb6..0000000
--- a/debian/python-subversion.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# nobody but us will ever link to this, so we don't ship a shlibs file
-no-shlibs-control-file usr/lib/*/libsvn_swig_py2.*-1.so.*
-no-symbols-control-file usr/lib/*/libsvn_swig_py2.*-1.so.*
diff --git a/debian/python-subversion.examples b/debian/python3-subversion.examples
index 90c51af..90c51af 100644
--- a/debian/python-subversion.examples
+++ b/debian/python3-subversion.examples
diff --git a/debian/python-subversion.install b/debian/python3-subversion.install
index bfa39ac..bfa39ac 100644
--- a/debian/python-subversion.install
+++ b/debian/python3-subversion.install
diff --git a/debian/python3-subversion.lintian-overrides b/debian/python3-subversion.lintian-overrides
new file mode 100644
index 0000000..e6455e1
--- /dev/null
+++ b/debian/python3-subversion.lintian-overrides
@@ -0,0 +1,3 @@
+# nobody but us will ever link to this, so we don't ship a shlibs file
+no-shlibs-control-file usr/lib/*/libsvn_swig_py3.*-1.so.*
+no-symbols-control-file usr/lib/*/libsvn_swig_py3.*-1.so.*
diff --git a/debian/rules b/debian/rules
index 3642d1a..c59af6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@
 #   with-javahl, no-javahl |
 #   with-apache, no-apache | enable/disable certain packages
 #   with-ruby, no-ruby     |
+#   with-python, no-python |
 
 include /usr/share/dpkg/architecture.mk
 
@@ -31,28 +32,25 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(DISABLE_JAVAHL_ARCHS)))
   ENABLE_JAVAHL =
 endif
 
-ifeq (,$(filter libsvn-java,$(shell dh_listpackages)))
-  ENABLE_JAVAHL =
-endif
-
-# We may need to disable libapache2-mod-svn and/or libsvn-ruby*.
 ENABLE_APACHE        = yes
 ENABLE_RUBY          = yes
-# Disable packaging python2 bindings if swig4 is installed
-ifeq (,$(filter 4%,$(shell dpkg-query -W -f '$${Version}' swig 2>/dev/null)))
-  ENABLE_PYTHON      = yes
-else
-  ENABLE_PYTHON      = no
-endif
+ENABLE_PYTHON        = yes
 
 DEB_BUILDDIR     = $(CURDIR)/BUILD
-MAKE_B           = $(MAKE) -C $(DEB_BUILDDIR)
 AUTH_LIB_DIRS    = $(DEB_BUILDDIR)/subversion/libsvn_auth_gnome_keyring/.libs:$(DEB_BUILDDIR)/subversion/libsvn_auth_kwallet/.libs
 BASH_COMPL_DIR   = $(shell pkg-config --variable=completionsdir bash-completion)
 
 export LANG = C
 export HOME = $(DEB_BUILDDIR)/dummy_home
 
+ifeq (,$(filter libsvn-java,$(shell dh_listpackages)))
+  ENABLE_JAVAHL =
+endif
+
+ifeq (,$(filter ruby-svn,$(shell dh_listpackages)))
+  ENABLE_RUBY =
+endif
+
 # ENABLE_FOO -> DEB_OPT_WITH_FOO=1
 # DEB_BUILD_OPTIONS='foo bar' -> DEB_OPT_FOO=1, DEB_OPT_BAR=1
 # DEB_BUILD_OPTIONS='no-foo' -> DEB_OPT_WITH_FOO=""
@@ -65,27 +63,30 @@ $(foreach o, $(filter NO_%,$(d_b_o)), $(eval DEB_OPT_$(subst NO_,WITH_,$o) :=))
 $(if $(DEB_OPT_PARALLEL),$(eval MAKEFLAGS += -j$(DEB_OPT_PARALLEL)))
 
 ifndef DEB_OPT_TERSE
-  MAKE_B += LTFLAGS="--tag=CC" LTCXXFLAGS="--tag=CXX"
+  export LTFLAGS = --tag=CC
+  export LTCXXFLAGS = --tag=CXX
 endif
 
+export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+
 # How to fix "#!/usr/bin/env " lines:  $(call fix_shebangs_in, /your/dir)
 fix_shebangs_in = \
 	find $1 -type f | xargs -r egrep -m1 -c '^\#! ?/' | sed -n 's/:1//p' |\
 	xargs -r sed -i -e 's:^\#! */usr/bin/env perl.*:\#!/usr/bin/perl -w:' \
-			-e 's:^\#! */usr/bin/env pyth.*:\#!/usr/bin/python:' \
+			-e 's:^\#! */usr/bin/env pyth.*:\#!/usr/bin/python3:' \
 			-e 's:^\#! */usr/bin/env ruby.*:\#!/usr/bin/$(RUBY):'
 
 PERL_DIR = $(DEB_BUILDDIR)/subversion/bindings/swig/perl/native
 PY_DIR = $(DEB_BUILDDIR)/subversion/bindings/swig/python
-PYVERSIONS = $(shell pyversions -vs)
-PYDEFAULT =$(shell pyversions -vd)
+PYVERSIONS = $(shell py3versions -vs)
+PYDEFAULT =$(shell py3versions -vd)
 
 allpy = \
 	set -e; for v in $(PYVERSIONS); do \
 		$(RM) $(PY_DIR); \
 		ln -sfT python$$v $(PY_DIR); \
 		pyinc=$$(python$$v-config --includes); \
-		pylib=$$(python$$v -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
+		pylib=$$(python$$v -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())'); \
 		$1; \
 		ln -sfT python$(PYDEFAULT) $(PY_DIR); \
 	done
@@ -95,9 +96,6 @@ libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
 MIN_SQLITE_VER = 3.8.7
 
 confflags = \
-		--prefix=/usr \
-		--libdir=$(libdir) \
-		--mandir=\$${prefix}/share/man \
 		--with-apr=/usr \
 		--with-apr-util=/usr \
 		--with-serf=/usr \
@@ -105,14 +103,9 @@ confflags = \
 		--with-berkeley-db=:::db \
 		--with-sasl=/usr \
 		--with-editor=/usr/bin/editor \
-		--with-ruby-sitedir=/usr/lib/ruby \
 		--with-swig=/usr/bin/swig \
 		--with-lz4 \
 		--with-utf8proc \
-		CFLAGS="$(CFLAGS)" \
-		CXXFLAGS="$(CXXFLAGS)" \
-		CPPFLAGS="$(CPPFLAGS)" \
-		LDFLAGS="$(LDFLAGS)" \
 		--with-gnome-keyring
 
 ifdef DEB_OPT_DEBUG
@@ -146,16 +139,17 @@ ifdef DEB_OPT_WITH_RUBY
   RUBY_ARCH_DIR = $(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendorarchdir']")
   rb_defs = SWIG_RB_SITE_LIB_DIR=$(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendordir']")
   rb_defs += SWIG_RB_SITE_ARCH_DIR=$(RUBY_ARCH_DIR)
+  confflags += --with-ruby-sitedir=/usr/lib/ruby
 else
   DH_OPTIONS += -Nruby-svn
   RUBY = fooby
 endif
 
 ifdef DEB_OPT_WITH_PYTHON
-  PYTHON = python
+  PYTHON = python3
 else
-  DH_OPTIONS += -Npython-subversion
-  PYTHON = foothon
+  DH_OPTIONS += -Npython3-subversion
+  PYTHON = foothon3
 endif
 
 # Set autoconf cross-compile mode correctly.
@@ -183,27 +177,22 @@ define DONT_BE_ROOT
 	fi
 endef
 
-debian/stamp-autogen:
+%:
+	dh $@ --with python3 --with apache2 --builddirectory=BUILD
+
+override_dh_update_autotools_config:
 	$(DONT_BE_ROOT)
 	dh_update_autotools_config
 	./autogen.sh
-	touch $@
-
-debian/stamp-configure: debian/stamp-autogen
-	dh_testdir
-
-	mkdir -p $(DEB_BUILDDIR) $(HOME)
-	cd $(DEB_BUILDDIR) && \
-		  PYTHON=/usr/bin/$(PYTHON) \
-		  RUBY=/usr/bin/$(RUBY) \
-		  $(CURDIR)/configure $(confflags) || (cat $(DEB_BUILDDIR)/config.log; false)
-
-	# Subversion upstream ships with Swig 1.3.25 pregenerated
-	# files, which may interact badly with the build if Debian swig
-	# is not version 1.3.25 - particularly with swig 1.3.24.
-	# Thus we unconditionally delete the pregenerated files.
-	+$(MAKE_B) mkdir-init
-	+$(MAKE_B) extraclean-bindings
+
+override_dh_auto_configure:
+	mkdir -p $(HOME)
+	env PYTHON=/usr/bin/$(PYTHON) RUBY=/usr/bin/$(RUBY) dh_auto_configure --builddirectory=BUILD -- $(confflags)
+
+	# Ensure we're able to regenerate the swig bindings, in case we need to
+	# patch them.
+	$(MAKE) -C $(DEB_BUILDDIR) mkdir-init
+	$(MAKE) -C $(DEB_BUILDDIR) extraclean-bindings
 ifdef DEB_OPT_WITH_PYTHON
 	for v in $(PYVERSIONS); do \
 		cp -la $(PY_DIR) $(PY_DIR)$$v; \
@@ -214,143 +203,93 @@ ifdef DEB_OPT_WITH_PYTHON
 	ln -sfT python$(PYDEFAULT) $(PY_DIR)
 endif
 
-	touch $@
-
-build: debian/stamp-build-arch debian/stamp-build-indep
-
 check_defs = CLEANUP=1 LC_ALL=C
 check_swig = $(if $(DEB_OPT_WITH_PYTHON),check-swig-py) check-swig-pl $(if $(DEB_OPT_WITH_RUBY),check-swig-rb)
 check_all = $(check_swig) $(if $(DEB_OPT_WITH_JAVAHL),check-javahl) check
 check-help:
 	@echo "$(MAKE) $(check_all)"
 
-check check-swig-rb check-javahl: debian/stamp-build-arch
-	+$(MAKE_B) $@ $(check_defs)
+override_dh_auto_test-indep:
+
+override_dh_auto_test-arch:
+ifndef DEB_OPT_NOCHECK
+	$(MAKE) -f debian/rules $(check_all)
+endif
 
-check-swig-pl: debian/stamp-build-arch
-	+$(MAKE_B) $@ MAN3EXT=3perl $(check_defs)
+check:
+	# 'cat tests.log' is for obtaining diagnostics from buildd logs.
+	@if ! $(MAKE) -C $(DEB_BUILDDIR) $@ $(check_defs) PARALLEL=$(DEB_OPT_PARALLEL); then \
+	  echo "###################################################"; \
+	  echo "Testsuite failed, 'tests.log' follows:"; echo; \
+	  cat $(DEB_BUILDDIR)/tests.log; \
+	  exit 1; \
+	fi
+
+check-swig-rb check-javahl:
+	$(MAKE) -C $(DEB_BUILDDIR) $@ $(check_defs) PARALLEL=$(DEB_OPT_PARALLEL)
+
+check-swig-pl:
+	$(MAKE) -C $(DEB_BUILDDIR) $@ MAN3EXT=3perl $(check_defs)
 	$(MAKE) -C $(PERL_DIR) test MAN3EXT=3perl LC_ALL=C
 
-check-swig-py: debian/stamp-build-arch
+check-swig-py:
 	$(call allpy, \
-	  $(MAKE_B) $@ PYTHON=python$$v PYVER=$$v $(check_defs))
+	  $(MAKE) -C $(DEB_BUILDDIR) $@ PYTHON=python$$v PYVER=$$v $(check_defs))
 
-build-arch: debian/stamp-build-arch
-debian/stamp-build-arch: debian/stamp-configure
-	dh_testdir
+override_dh_auto_build-arch:
 	$(DONT_BE_ROOT)
-
 	# note: autogen-swig does not support -jN
 ifdef DEB_OPT_WITH_PYTHON
-	$(call allpy, $(MAKE_B) -j1 autogen-swig)
+	$(call allpy, $(MAKE) -C $(DEB_BUILDDIR) -j1 autogen-swig)
 endif
-	+$(MAKE_B) all tools
+	$(MAKE) -C $(DEB_BUILDDIR) all tools
 	# Run svn once, to make sure it populates $(HOME)/.subversion/*
 	env LD_LIBRARY_PATH="$(AUTH_LIB_DIRS):$(LD_LIBRARY_PATH)" $(DEB_BUILDDIR)/subversion/svn/svn --version > /dev/null
 ifdef DEB_OPT_WITH_PYTHON
 	$(call allpy, \
-	  $(MAKE_B) swig-py PYTHON=python$$v PYVER=$$v \
+	  $(MAKE) -C $(DEB_BUILDDIR) swig-py PYTHON=python$$v PYVER=$$v \
 	            PYTHON_INCLUDES="$$pyinc" \
 	            swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
 endif
 	# note: swig-pl seems to have trouble with -jN
-	+$(MAKE_B) -j1 swig-pl MAN3EXT=3perl
+	$(MAKE) -C $(DEB_BUILDDIR) -j1 swig-pl MAN3EXT=3perl
 	$(MAKE) -C $(PERL_DIR) all \
 		MAN3EXT=3perl OPTIMIZE="-g -Wall $(CFLAGS)"
 ifdef DEB_OPT_WITH_RUBY
-	+$(MAKE_B) swig-rb $(rb_defs)
+	$(MAKE) -C $(DEB_BUILDDIR) swig-rb $(rb_defs)
 endif
 ifdef DEB_OPT_WITH_JAVAHL
-	+$(MAKE_B) -j1 javahl
+	$(MAKE) -C $(DEB_BUILDDIR) -j1 javahl
 endif
 
-	# Need to touch the stamp file here so the check-* targets
-	# don't try to build this target again
-	touch $@
-
-ifndef DEB_OPT_NOCHECK
-	@echo "###################################################"
-	@echo "Running testsuite - may take a while.  To disable,"
-	@echo "use DEB_BUILD_OPTIONS=nocheck or edit debian/rules."
-	@echo
-	$(MAKE) -f debian/rules $(check_swig)
-
-  ifdef DEB_OPT_WITH_JAVAHL
-	# This fails on current free JVMs, according to Blair Zajac.
-	# Thus the "-" prefix, to ignore failure, for now.
-	-$(MAKE) -f debian/rules check-javahl
-  endif
-
-	# Run 'check' last, as it takes longest.  'cat tests.log' is for
-	# obtaining diagnostics from buildd logs.
-	@if ! $(MAKE) -f debian/rules check; then \
-	  echo "###################################################"; \
-	  echo "Testsuite failed, 'tests.log' follows:"; echo; \
-	  cat $(DEB_BUILDDIR)/tests.log; \
-	  exit 1; \
-	fi
-endif
-	touch $@
-
-build-indep: debian/stamp-build-indep
-debian/stamp-build-indep: debian/stamp-configure
+override_dh_auto_build-indep:
 	mkdir -p $(DEB_BUILDDIR)/doc/doxygen
-	+$(MAKE_B) doc-api
-	+$(MAKE_B) locale-gnu-pot
-	touch $@
-
-clean:
-	dh_testdir
-	dh_clean
-	! [ -f $(DEB_BUILDDIR)/Makefile ] || $(MAKE_B) extraclean-bindings distclean
-	$(RM) -r $(DEB_BUILDDIR)
+	dh_auto_build --builddirectory=BUILD -- doc-api locale-gnu-pot
+
+override_dh_auto_clean:
+	! [ -f $(DEB_BUILDDIR)/Makefile ] || $(MAKE) -C $(DEB_BUILDDIR) extraclean
+	dh_auto_clean --builddirectory=BUILD
 	$(RM) -r subversion/bindings/swig/ruby/test/.test-result
-	$(RM) build-outputs.mk gen-make.opts subversion/svn_private_config.h.in
-	$(RM) build/transform_libtool_scripts.sh
-	$(RM) subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_fs_x/rep-cache-db.h
-	$(RM) subversion/libsvn_client/libsvn_client.pc.in subversion/libsvn_ra/libsvn_ra.pc.in
-	$(RM) subversion/libsvn_subr/internal_statements.h subversion/libsvn_subr/errorcode.inc subversion/libsvn_subr/config_keys.inc
-	$(RM) subversion/libsvn_wc/wc-queries.h subversion/tests/libsvn_wc/wc-test-queries.h
 	find -name \*.pyc -exec $(RM) {} +
 	# these are (re)generated by autogen.sh
-	$(RM) subversion/bindings/swig/proxy/*.swg
-	$(RM) configure build/ltmain.sh build/libtool.m4 build/lt*.m4
 	$(RM) subversion/po/subversion.pot
-	$(RM) debian/stamp-*
-
-debian/stamp-install-indep: debian/stamp-build-indep
-	dh_prep -i
-	dh_installdirs -i
-
-	dh_install -i
-	dh_installdocs -i NOTICE
-
-	$(RM) debian/libsvn-doc/usr/share/doc/libsvn1/html/jquery.js
-	dh_installexamples -i
-	$(call fix_shebangs_in, debian/*/usr/share/doc/*/examples)
-	dh_installman -i
-	dh_installchangelogs -i CHANGES
 
-	dh_lintian -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_perl -i
-	dh_link -i
-	dh_missing -i --list-missing
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES
 
-	touch $@
+override_dh_installdocs-indep override_dh_installdocs-arch:
+	dh_installdocs NOTICE
 
-debian/stamp-install-arch: debian/stamp-build-arch
-	dh_prep -a
-	dh_installdirs -a
+override_dh_auto_install-indep:
 
-	$(MAKE_B) -j1 local-install install-tools \
+PRIVATE_LIBS = auth_gnome_keyring auth_kwallet fs_base fs_fs fs_util fs_x ra_local ra_serf swig_perl $(foreach v, $(PYVERSIONS), swig_py$(v)) swig_ruby
+override_dh_auto_install-arch:
+	$(MAKE) -C $(DEB_BUILDDIR) -j1 local-install install-tools \
 		DESTDIR=$(CURDIR)/debian/tmp toolsdir=/usr/bin pkgconfig_dir=$(libdir)/pkgconfig
-	sed -i 's:/usr/lib/\([^/]*/\)?lib\([^ ]*\).la:-l\1:g' debian/tmp/usr/lib/*/*.la
 
 ifdef DEB_OPT_WITH_PYTHON
 	$(call allpy, \
-	  $(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \
+	  $(MAKE) -C $(DEB_BUILDDIR) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \
 	            PYTHON=python$$v PYVER=$$v \
 	            swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
 	$(RM) debian/tmp/usr/lib/python*/*-packages/libsvn/*.la
@@ -358,43 +297,35 @@ ifdef DEB_OPT_WITH_PYTHON
 endif
 
 ifdef DEB_OPT_WITH_JAVAHL
-	$(MAKE_B) install-javahl install-javahl-java \
+	$(MAKE) -C $(DEB_BUILDDIR) install-javahl install-javahl-java \
 		DESTDIR=$(CURDIR)/debian/tmp \
 		javahl_javadir=/usr/share/java \
 		javahl_javahdir=/usr/include/svn-javahl
 endif
 
-	$(MAKE_B) install-swig-pl-lib \
+	$(MAKE) -C $(DEB_BUILDDIR) install-swig-pl-lib \
 		DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C $(PERL_DIR) install \
 		MAN3EXT=3perl DESTDIR=$(CURDIR)/debian/tmp INSTALLDIRS=vendor
 
 ifdef DEB_OPT_WITH_RUBY
-	$(MAKE_B) install-swig-rb $(rb_defs) \
+	$(MAKE) -C $(DEB_BUILDDIR) install-swig-rb $(rb_defs) \
 		DESTDIR=$(CURDIR)/debian/tmp
-	find debian/tmp$(RUBY_ARCH_DIR) \( -name \*.a -o -name \*.la \) -exec $(RM) {} +
-	dh_install --autodest -pruby-svn debian/tmp$(RUBY_ARCH_DIR)
 endif
 
-	rm -f debian/tmp/usr/lib/apache2/modules/mod_dontdothat*
+	rm -f $(foreach lib, $(PRIVATE_LIBS), debian/tmp/$(libdir)/libsvn_$(lib)-1.so)
 	rm -f debian/tmp/usr/bin/diff*
 
-	cd debian/tmp/$(libdir); for lib in fs auth swig; do \
-	    $(RM) libsvn_$${lib}_*.so libsvn_$${lib}_*.la; \
-	done
-	# libsvn_ra_svn is public, although deprecated, so we can't blindly
-	# remove all libsvn_ra_*
-	cd debian/tmp/$(libdir); \
-	    $(RM) libsvn_ra_serf-*.so libsvn_ra_serf-*.la \
-	          libsvn_ra_local-*.so libsvn_ra_local-*.la
-	cd debian/tmp/$(libdir); $(RM) libsvn_swig*.a libsvnjavahl-1.a libsvnjavahl-1.la
-	# Intermediate hack, until we can remove the rest of the .la files.
-	sed -i  "/dependency_libs/s/=.*/=''/" debian/tmp/$(libdir)/*.la
-
 	# There are some non-ELF files in /usr/bin, so ignore errors
 	chrpath --keepgoing --delete "$(CURDIR)/debian/tmp/usr/bin/"* || true
 	find "$(CURDIR)/debian/tmp$(libdir)" -type f -name '*.so' -exec chmod u+w '{}' + -exec chrpath --delete '{}' +
-	dh_install -a
+
+override_dh_install-arch:
+	dh_install -Nruby-svn -X .in -X mailer/tests -X dontdothat -X .a -X .la
+
+ifdef DEB_OPT_WITH_RUBY
+	dh_install --autodest -pruby-svn -X .la -X .a debian/tmp$(RUBY_ARCH_DIR)
+endif
 
 	# Install files for 'subversion-tools' package.
 	install $(DEB_BUILDDIR)/tools/backup/hot-backup.py \
@@ -402,12 +333,6 @@ endif
 	install -t debian/subversion-tools/usr/share/subversion/hook-scripts \
 		$(DEB_BUILDDIR)/tools/hook-scripts/commit-access-control.pl
 
-	rm debian/subversion-tools/usr/share/subversion/hook-scripts/*.in
-	rm -r debian/subversion-tools/usr/share/subversion/hook-scripts/mailer/tests
-ifndef DEB_OPT_WITH_RUBY
-	rm debian/subversion-tools/usr/share/subversion/hook-scripts/*.rb
-endif
-
 	# Fix some scripts not to use #!/usr/bin/env.
 	$(call fix_shebangs_in, debian/*/usr/bin \
 		debian/subversion-tools/usr/share/subversion/hook-scripts)
@@ -436,66 +361,29 @@ endif
 	  && ln -s svn svnlook \
 	  && ln -s svn svnversion
 
-	dh_apache2 -a
 ifdef DEB_OPT_WITH_APACHE
 	install subversion/mod_authz_svn/INSTALL \
 		debian/libapache2-mod-svn/usr/share/doc/libapache2-mod-svn/INSTALL.authz
 endif
 
-ifdef DEB_OPT_WITH_PYTHON
-	cp tools/examples/svnshell.py debian/python-subversion/usr/bin/svnshell
-	$(call fix_shebangs_in, debian/python-subversion/usr/bin/svnshell)
-endif
-
-	dh_installdocs -a NOTICE
-	dh_installexamples -a
-	$(call fix_shebangs_in, debian/*/usr/share/doc/*/examples)
-	dh_installman -a
-	dh_installchangelogs -a CHANGES
-	dh_perl -a
-ifdef DEB_OPT_WITH_PYTHON
-	dh_python2 -a
-endif
-	dh_link -a
-	dh_lintian -a
-	dh_fixperms -a
-	dh_missing -a --list-missing
-
-	touch $@
-
-binary-indep: debian/stamp-install-indep
-	dh_testdir
-	dh_testroot
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: debian/stamp-install-arch
-	dh_testdir
-	dh_testroot
-	dh_strip -a
-	dh_compress -a
-
+override_dh_makeshlibs-arch:
 	# dh_makeshlibs (1) creates shlibs/symbols files and (2) generates
 	# calls to 'ldconfig' in postinst/postrm.  We want (1) only for
 	# libsvn1, but (2) for the swig packages too.
 	dh_makeshlibs -a -Xjava -X_auth_ -X_ra_serf -X_ra_local -X_fs_
-	$(RM) debian/libsvn-*/DEBIAN/shlibs debian/python-subversion/DEBIAN/shlibs
-	$(RM) debian/libsvn-*/DEBIAN/symbols debian/python-subversion/DEBIAN/symbols
-	dh_installdeb -a
+	$(RM) debian/libsvn-*/DEBIAN/shlibs debian/python3-subversion/DEBIAN/shlibs
+	$(RM) debian/libsvn-*/DEBIAN/symbols debian/python3-subversion/DEBIAN/symbols
+
+override_dh_shlibdeps-arch:
 	dh_shlibdeps -a -X_auth_
 	sed -i 's:libsvn-private\(, *\)\?::' debian/*.substvars
+
+override_dh_gencontrol-arch:
 ifeq ($(DEB_VENDOR),Ubuntu)
 	dh_gencontrol -a -- -V"subversion-tools:Suggests=svn2cl"
 else
 	dh_gencontrol -a -- -V"subversion-tools:Recommends=svn2cl"
 endif
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
 
 .NOTPARALLEL:
-.PHONY: build build-arch build-indep binary binary-arch binary-indep
 .PHONY: clean check-help $(check_all)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 9086973..a88c6f2 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +1,6 @@
 # We don't want a random binNMU to change the bdb version to one that
 # nobody has tested with svn.  So we have to hardcode it.
 build-depends-on-versioned-berkeley-db
+
+# Upstream releases are signed by multiple people, using a concatenated file
+concatenated-upstream-signatures
diff --git a/debian/svn_1.10_releasenotes.html b/debian/svn_1.10_releasenotes.html
index f89bf04..3111aba 100644
--- a/debian/svn_1.10_releasenotes.html
+++ b/debian/svn_1.10_releasenotes.html
@@ -956,7 +956,7 @@ patch</tt>.</p>
 
 <p><tt>svn log --search</tt> is now case-insensitive and ignores diacriticals
 when matching words. This makes it easier to match paths and log messages
-which happen to contain upper-case and non-English characters.</tt>
+which happen to contain upper-case and non-English characters.</p>
 
 </div> <!-- log-search -->
 
diff --git a/debian/svn_1.11_releasenotes.html b/debian/svn_1.11_releasenotes.html
index ab53ab1..ef5ecb5 100644
--- a/debian/svn_1.11_releasenotes.html
+++ b/debian/svn_1.11_releasenotes.html
@@ -241,6 +241,10 @@ and what impact these changes may have.</p>
     <td>any</td>
     <td>any</td>
     <td></td></tr>
+  <tr>
+    <td colspan="5"><sup>1</sup>Reminder: when using the <tt>file://</tt>
+    repository access method, the Subversion program is both the client
+    <em>and</em> the server.</td></tr>
 </table>
 
 </div>  <!-- new-feature-compatibility-table -->
diff --git a/debian/svn_1.12_releasenotes.html b/debian/svn_1.12_releasenotes.html
index a590859..796dd17 100644
--- a/debian/svn_1.12_releasenotes.html
+++ b/debian/svn_1.12_releasenotes.html
@@ -230,6 +230,10 @@ and what impact these changes may have.</p>
     <td>any</td>
     <td>any</td>
     <td></td></tr>
+  <tr>
+    <td colspan="5"><sup>1</sup>Reminder: when using the <tt>file://</tt>
+    repository access method, the Subversion program is both the client
+    <em>and</em> the server.</td></tr>
 </table>
 
 </div>  <!-- new-feature-compatibility-table -->
@@ -477,10 +481,11 @@ have always been stored in an encrypted representation.</p>
 <p>Behaviour of copy operations with a repository source and a working copy
 target has been improved:</p>
 <ul>
-<li>Existing parent directories are now handled correctly.
+<li>Existing parent directories are now handled correctly.</li>
 <li>Peg and operative revisions are now handled correctly (see
 <a href="https://issues.apache.org/jira/browse/SVN-4785">issue #4785</a>
-for details).
+for details).</li>
+</ul>
 </div> <!-- repos-wc-copy -->
 
 <div class="h4" id="svn-list">
diff --git a/debian/svn_1.13_releasenotes.html b/debian/svn_1.13_releasenotes.html
index 7d55142..08455ee 100644
--- a/debian/svn_1.13_releasenotes.html
+++ b/debian/svn_1.13_releasenotes.html
@@ -211,6 +211,10 @@ and what impact these changes may have.</p>
     <td>1.13</td>
     <td>any FSFS repo</td>
     <td></td></tr>
+  <tr>
+    <td colspan="5"><sup>1</sup>Reminder: when using the <tt>file://</tt>
+    repository access method, the Subversion program is both the client
+    <em>and</em> the server.</td></tr>
 </table>
 
 </div>  <!-- new-feature-compatibility-table -->
diff --git a/debian/svn_1.14_releasenotes.html b/debian/svn_1.14_releasenotes.html
new file mode 100644
index 0000000..8b8dd8d
--- /dev/null
+++ b/debian/svn_1.14_releasenotes.html
@@ -0,0 +1,1560 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Apache Subversion 1.14 LTS Release Notes</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="https://subversion.apache.org"/>
+<style type="text/css">
+  @import url("/style/site.css");
+</style>
+</head>
+
+<body>
+<div id="site-banner">
+<div style="float: right; width: 379px; height: 80px; font-style: italic; 
+            text-align: center;">
+  <a href="https://www.apache.org/"
+  ><img src="/images/apache-logo.png"
+        alt="Apache Software Foundation" /></a>
+</div>
+<a href="/">
+  <img src="/images/svn-square.jpg"
+       alt="[S]"
+       style="width: 80px; height: 80px;"/>
+  <img src="/images/svn-name-banner.jpg"
+       alt="Subversion"
+       style="width: 320px; height: 80px;"/></a>
+</div> <!-- #site-banner -->
+
+<div id="site-nav">
+<div id="site-nav-menu">
+<ul>
+  <li>About Subversion
+    <ul>
+      <li><a href="/news.html">News</a></li>
+      <li><a href="/features.html">Features</a></li>
+      <li><a href="/docs/">Documentation</a></li>
+      <li><a href="/faq.html">FAQ</a></li>
+      <li><a href="/roadmap.html">Roadmap</a></li>
+      <li><a href="/security/">Security</a></li>
+      <li><a href="/quick-start">Quick Start</a></li>
+    </ul>
+  </li>
+  <li>Getting Subversion
+      <ul>
+      <!-- A parameter in the form '?update=YYYYMMDDhhmm' may
+           be appended to 'download.cgi' to only offer mirrors that have
+           synced after the specified date. We update it after a security
+           release when the email announcement is less than 24 hours after
+           the upload to /dist/release, in order to prevent offering mirrors
+           that don't carry the just-released artifacts. -->
+      <li><a href="/packages.html">Binary Packages</a></li>
+      <li><a href="/download.cgi">Source Download</a></li>
+      <li><a href="/docs/release-notes/">Release Notes</a></li>
+    </ul>
+  </li>
+  <li>Community
+    <ul>
+      <li><a href="/mailing-lists.html">Mailing Lists</a></li>
+      <li><a href="/reporting-issues.html">Reporting Issues</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/SVN/">Wiki</a></li>
+      <li><a href="/contributing.html">Getting Involved</a></li>
+      <li><a href="/source-code.html">Source Code</a></li>
+    </ul>
+  </li>
+  <li>About the <acronym title="Apache Software Foundation">ASF</acronym>
+    <ul>
+      <li><a class="linkaway"
+             href="https://www.apache.org/licenses/">Licenses</a></li>
+      <li><a class="linkaway"
+             href="https://www.apache.org/foundation/sponsorship.html">Donate</a></li>
+      <li><a class="linkaway"
+             href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+    </ul>
+  </li>
+</ul>
+</div> <!-- #site-nav-menu -->
+
+<div id="site-search">
+  <form action="https://www.google.com/search" method="get"
+        style="margin-top: 10px; margin-bottom: 10px; display: inline;">
+  <div style="display: inline;">
+    <input value="subversion.apache.org" name="sitesearch" type="hidden" />
+    <input name="q" id="query" type="text" placeholder="Search..."
+           style="width: 10em"
+           />
+    <input name="Search" value="Go" type="submit"/>
+  </div>
+  </form>
+</div> <!-- #site-search -->
+
+<div id="site-svnbook-block">
+<p>Read the official Subversion
+   documentation <a href="http://svnbook.org" class="linkaway">online</a>!</p>
+<p><a href="http://svnbook.org/"
+      ><img src="/images/svnbook-cover.jpg"
+            alt="Version Control With Subversion"/></a></p>
+</div> <!-- #site-svnbook-block -->
+
+<div id="copyright">
+<p>Copyright &#169; 2018 <a href="https://www.apache.org/">The Apache
+   Software Foundation</a>, Licensed under
+   the <a href="https://www.apache.org/licenses/LICENSE-2.0" >Apache
+   License, Version 2.0</a>.  Apache, Apache Subversion, and
+   the Apache feather logo are trademarks of The Apache Software
+   Foundation.  Subversion and the Apache Subversion logo are
+   registered trademarks of The Apache Software Foundation.</p>
+</div> <!-- #copyright -->
+
+</div> <!-- #site-nav -->
+
+<div id="site-content">
+<div id="site-notice">
+
+<!-- PUT SITE-WIDE NOTICES HERE AS NECESSARY -->
+
+</div> <!-- #site-notice -->
+
+<!-- **************** BEGIN CONTENT ***************** -->
+
+<!-- ************************************************ -->
+<!-- Sections start with "###" are either templates   -->
+<!-- or TODOs.  Remove them before release.           -->
+<!-- ************************************************ -->
+
+<h1 style="text-align: center">Apache Subversion 1.14 LTS Release Notes</h1>
+
+<!-- ### -->
+
+<div class="h2" id="news">
+<h2>What's New in Apache Subversion 1.14
+  <a class="sectionlink" href="#news"
+    title="Link to this section">&para;</a>
+</h2>
+
+<ul>
+  <!-- The main changes...
+  <li><a href="#"
+      >###</a></li>
+  -->
+  <li><a href="#python3"
+      >Support for Python 3.x</a></li>
+  <li><a href="#python2"
+      >Support for Python 2.7 is being phased out</a></li>
+  <li><a href="#py3c"
+      >New Build-Time Dependency: py3c</a></li>
+  <li><a href="#enhancements"
+      >Many enhancements and bug fixes</a></li>
+  <li><a href="#issues"
+      >Known issues in the release</a></li>
+  <!--
+  <li><a href="#troubleshooting"
+      >Troubleshooting issues specific to this release</a></li>
+  -->
+</ul>
+
+<p>Apache Subversion 1.14 is a superset of all previous Subversion
+releases, and is as of the time of its release considered the current
+"best" release.  Any feature or bugfix in 1.0.x through 1.13.x is also
+in 1.14, but 1.14 contains features and bugfixes not present in any
+earlier release.</p>
+
+<p>Because 1.14 is the next LTS release following 1.10, these release
+notes describe major changes since 1.10, including changes released in
+1.11.x through 1.13.x.</p>
+
+<p>This page describes only major changes.  For a complete list of
+changes, see the 1.14 section of the <a
+href="https://svn.apache.org/repos/asf/subversion/trunk/CHANGES" >CHANGES</a>
+file.</p>
+
+</div>  <!-- news -->
+
+<div class="h2" id="compatibility">
+<h2>Compatibility Concerns
+  <a class="sectionlink" href="#compatibility"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Older clients and servers interoperate transparently with 1.14
+servers and clients.  However, some of the new 1.14 features may not be
+available unless both client and server are the latest version.  There are
+also cases where a new feature will work but will run less efficiently if
+the client is new and the server old.</p>
+
+<p>There is <strong>no need</strong> to <a href="http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin"
+>dump and reload</a> your repositories. 
+Subversion 1.14 servers can read and write to repositories created by
+earlier versions.  To upgrade an existing server installation, just install the
+newest libraries and binaries on top of the older ones.</p>
+
+<p>Subversion 1.14 maintains API/ABI compatibility with earlier
+releases, by only adding new functions, never removing old ones.  A
+program written to any previous 1.x API can both compile
+and run using 1.14 libraries.  However, a program written for 1.14
+cannot necessarily compile or run against older libraries.</p>
+
+<p>There may be limited cases where the behavior of old APIs has been
+slightly modified from previous releases.  These are cases where edge cases
+of the functionality has been deemed buggy, and therefore improved or removed.
+Please consult the
+<a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/api-errata/1.14/"
+>API errata</a> for more detailed information on what these APIs are
+and what impact these changes may have.</p>
+
+<div class="h3" id="new-feature-compatibility-table">
+<h3>New Feature Compatibility Table
+  <a class="sectionlink" href="#new-feature-compatibility-table"
+    title="Link to this section">&para;</a>
+</h3>
+<table border="1">
+  <tr>
+    <th>New Feature</th>
+    <th>Minimum Client<sup>1</sup></th>
+    <th>Minimum Server</th>
+    <th>Minimum Repository</th>
+    <th>Notes</th></tr>
+  <tr>
+    <td><a href="#svnadmin-rev-size"><tt>svnadmin rev-size</tt></a></td>
+    <td>n/a</td>
+    <td>1.13</td>
+    <td>any FSFS repo</td>
+    <td></td></tr>
+  <tr>
+    <td><a href="#svnadmin-build-repcache"><tt>svnadmin build-repcache</tt></a></td>
+    <td>n/a</td>
+    <td>1.14</td>
+    <td>FSFS format 4</td>
+    <td>see <tt>Filesystem Format</tt> in the output of <tt>svnadmin info /path/to/repo</tt></td></tr>
+  <tr>
+    <td>
+      <a href="#shelving">Shelving (experimental)</a>
+    </td>
+    <td>1.12</td>
+    <td>any</td>
+    <td>any</td>
+    <td>shelves created by 1.10 are not compatible&mdash;see
+        <a href="#shelving-transition">Upgrading 1.10&ndash;1.13 shelves to 1.14</a></td></tr>
+  <tr>
+    <td>
+      <a href="#shelving-checkpointing">Commit checkpointing (experimental)</a>
+    </td>
+    <td>1.12</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+  <tr>
+    <td>
+      <a href="#viewspec-output">Viewspec output command (experimental)</a>
+    </td>
+    <td>1.11</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+  <tr>
+    <td colspan="5"><sup>1</sup>Reminder: when using the <tt>file://</tt>
+    repository access method, the Subversion program is both the client
+    <em>and</em> the server.</td></tr>
+</table>
+
+</div>  <!-- new-feature-compatibility-table -->
+
+<div class="h3" id="wc-upgrade">
+<h3>Upgrading the Working Copy
+  <a class="sectionlink" href="#wc-upgrade"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>Subversion 1.14 uses the same working copy format as Subversion 1.8 through 1.13.</p>
+
+<p>Before using Subversion 1.14 with an existing Subversion 1.7 or older
+working copy, users will be required to run the <tt>svn upgrade</tt> command
+to upgrade working copy metadata to the new format. This command may take a
+while in some cases, and for some users, it may be more practical to simply
+checkout a new working copy.</p>
+
+<p><strong>Note:</strong> Subversion 1.14 cannot upgrade working copies that
+a 1.6 client would have refused to operate upon before an <tt>svn cleanup</tt>
+was run (with a 1.6 client).  In other words, before upgrading to 1.8 or newer,
+a 1.6
+or older client must be used to run <tt>svn cleanup</tt> on all 1.6 or older
+working copies that require cleanup.  Likewise, Subversion 1.14 cannot upgrade
+corrupt working copies. Unfixable problems can arise from missing or corrupt
+meta-data inside <tt>.svn</tt> directories.  Such damage to the working copy
+is permanent, and cannot be fixed even if <tt>svn cleanup</tt> is run prior
+to the upgrade.</p>
+
+<p>If your working copy does not upgrade cleanly, please check out a new one.
+</p>
+
+</div>  <!-- wc-upgrade -->
+
+<div class="h3 experimental-feature" id="compatibility-shelving">
+<h3>Changes to Experimental Shelving Feature
+  <a class="sectionlink" href="#compatibility-shelving"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>Since 1.10, Subversion provides an experimental "Shelving" feature aimed
+at addressing <a href="https://issues.apache.org/jira/browse/SVN-3625">issue
+#3625</a>. There is no promise of backward compatibility for features
+designated "experimental."</p>
+
+<p>Shelving in 1.14 has changed significantly since 1.10 and is incompatible
+with shelves created by 1.10. See <a href="#shelving">Shelving and
+Checkpointing (experimental)</a> for the major changes and differences in
+commands. See its subsection, <a href="#shelving-transition">Upgrading
+1.10&ndash;1.13 shelves to 1.14</a> to learn how to recover 1.10 shelves in
+an existing working copy.</p>
+
+</div>  <!-- compatibility-shelving -->
+
+<!-- (This section only makes sense when there are some issues listed in it.)
+<div class="h3" id="compat-misc">
+<h3>Miscellaneous Compatibility Notes
+  <a class="sectionlink" href="#compat-misc"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>There are some additional specific areas where changes made in this
+release might necessitate further adjustment by administrators or
+users.  We'll cover those in this section.</p>
+
+</div>  <!- - compat-misc - ->
+-->
+
+</div>  <!-- compatibility -->
+
+<div class="h2" id="new-features">
+<h2>New Features
+  <a class="sectionlink" href="#new-features"
+    title="Link to this section">&para;</a>
+</h2>
+
+<div class="h3" id="svnadmin-rev-size">
+<h3>New <tt>svnadmin rev-size</tt> command
+  <a class="sectionlink" href="#svnadmin-rev-size"
+     title="Link to this section">&para;</a>
+</h3>
+
+<p>This change was first introduced in 1.13.</p>
+
+<p>Add an <tt>svnadmin rev-size</tt> command to report the total size in
+bytes of the representation on disk of a revision, including rev-props,
+but excluding FSFS indexes. For example:</p>
+
+<pre>
+    $ svnadmin rev-size /path/to/repo -r1
+            1337 bytes in revision 1
+</pre>
+
+<p>(See <a href="http://svn.apache.org/r1857624">r1857624</a>.)</p>
+</div> <!-- svnadmin-rev-size -->
+
+<div class="h3" id="svnadmin-build-repcache">
+<h3>New <tt>svnadmin build-repcache</tt> command
+  <a class="sectionlink" href="#svnadmin-build-repcache"
+     title="Link to this section">&para;</a>
+</h3>
+
+<p>Representation Sharing (also called rep-sharing) is a data storage
+de-duplication feature first introduced in Subversion 1.6. It reduces the disk
+size of a repository by storing duplicate data only once. (See <a
+href="https://issues.apache.org/jira/browse/SVN-2286">issue #2286</a>.)</p>
+
+<p>This optional feature is enabled by default. It relies on a rep-cache
+database, which Subversion automatically maintains with the repository, to
+identify duplicate pieces of data.</p>
+
+<p>Over time, some administrators have disabled and/or re-enabled rep-sharing,
+which has the effect of excluding from the rep-cache any revisions that were
+committed while the feature was disabled.</p>
+
+<p>Subversion 1.14 introduces a new <tt>svnadmin build-repcache</tt>
+subcommand, which administrators can use to populate any missing entries in
+the rep-cache database for a specified revision range (or all revisions). (See
+<a href="http://svn.apache.org/r1875921">r1875921</a>.)</p>
+
+<p>For example, to process revisions 20 through 25, inclusive, and ensure that
+their data is known to the rep-cache:</p>
+
+<pre>
+    $ svnadmin build-repcache /path/to/repo -r20:25
+    * Processed revision 20.
+    * Processed revision 21.
+    * Processed revision 22.
+    * Processed revision 23.
+    * Processed revision 24.
+    * Processed revision 25.
+</pre>
+
+<p>If only one revision argument is given, <tt>svnadmin build-repcache</tt>
+will process that revision only:</p>
+
+<pre>
+    $ svnadmin build-repcache /path/to/repo -r20
+    * Processed revision 20.
+</pre>
+
+<p>If no revision argument is given, <tt>svnadmin build-repcache</tt> will
+process all revisions.</p>
+
+</div> <!-- svnadmin-build-repcache -->
+
+</div>  <!-- new-features -->
+
+<div class="h2" id="enhancements">
+<h2>Enhancements and Bugfixes
+  <a class="sectionlink" href="#enhancements"
+    title="Link to this section">&para;</a>
+</h2>
+
+<!-- Don't need to highlight every bugfix, just major ones which aren't in
+     any patch release. -->
+
+<div class="h3" id="cmdline">
+<h3>Command-line client improvements (<em>client</em>)
+  <a class="sectionlink" href="#cmdline"
+    title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="log-quiet-diff">
+<h4><tt>svn log </tt> improvements
+  <a class="sectionlink" href="#log-quiet-diff"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p><tt>svn log --quiet </tt> and <tt>--diff </tt> options are no longer
+mutually exclusive. This makes it easier to display only the differences
+in a range of revisions. (See <a href="http://svn.apache.org/r1871916">r1871916</a>.)</p>
+
+</div> <!-- log-quiet-diff -->
+
+<div class="h4" id="info-show-item-changelist">
+<h4><tt>svn info </tt> improvements
+  <a class="sectionlink" href="#info-show-item-changelist"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>New <tt>changelist </tt> argument to <tt>svn info --show-item </tt>
+(<a href="http://svn.apache.org/r1869481">r1869481</a>).</p>
+
+</div> <!-- info-show-item-changelist -->
+
+<div class="h4" id="editor-filename-escaping">
+<h4>Escaping/quoting of pathname arguments to the user-defined editor
+  <a class="sectionlink" href="#editor-filename-escaping"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>When invoking the user-defined editor, such as during interactive conflict
+resolution, Subversion now performs escaping of any special characters in the
+pathname of the file to be edited. This corrects a problem that would occur
+previously when the file to be edited (and/or the path leading to it)
+contained spaces or other special characters. (See
+<a href="http://svn.apache.org/r1874057">r1874057</a>,
+<a href="http://svn.apache.org/r1874093">r1874093</a>, and
+<a href="http://svn.apache.org/r1875230">r1875230</a>.)</p>
+
+<p>Note that escaping is performed only on the pathname argument. As before,
+the editor itself is invoked through the shell and the user must properly
+quote/escape the command line used to launch it. This is intentional, as it
+allows the user to construct a shell command which itself contains command
+line arguments. See the related
+<a href="https://subversion.apache.org/faq.html#svn-editor">FAQ entry</a> for
+more on spaces and/or command line options in the editor path.</p>
+
+<p>The user-defined editor can be specified in the following ways, in this
+order of precedence:</p>
+
+<ul>
+  <li>The <tt>--editor-cmd</tt> command-line option</li>
+  <li>The <tt>$SVN_EDITOR</tt> environment variable</li>
+  <li>The <tt>editor-cmd</tt> runtime configuration option</li>
+  <li>The <tt>$VISUAL</tt> environment variable</li>
+  <li>The <tt>$EDITOR</tt> environment variable</li>
+</ul>
+
+<p>The escaped pathname of the file to be edited is passed to the editor as
+its last command line argument.</p>
+
+<p>For example, suppose that <tt>$SVN_EDITOR</tt> is set as follows:</p>
+
+<pre>SVN_EDITOR='vim -N --'
+export SVN_EDITOR
+</pre>
+
+<p>Furthermore, suppose 'svn up' finds a text conflict in a file called
+<tt>foo bar.txt</tt>:</p>
+
+<pre>
+$ svn up 
+Updating '.':
+C    foo bar.txt
+Updated to revision 2.
+Summary of conflicts:
+  Text conflicts: 1
+Merge conflict discovered in file 'foo bar.txt'.
+Select: (p) Postpone, (df) Show diff, (e) Edit file, (m) Merge,
+        (s) Show all options: <b>e</b>
+</pre>
+
+<p>When Subversion launches the editor, the spaces in <tt>vim -N --</tt> will
+<strong>not</strong> be escaped, allowing vim to be invoked with <tt>-N</tt>
+and <tt>--</tt> as its first two arguments, but the space in
+<tt>foo bar.txt</tt> <strong>will</strong> be escaped.</p>
+
+</div> <!-- editor-filename-escaping -->
+
+<div class="h4" id="conflict-resolver">
+<h4>Improvements to the interactive conflict resolver
+  <a class="sectionlink" href="#conflict-resolver"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>Since its introduction in 1.10, the new interactive conflict resolver has
+received various improvements.</p>
+
+<p>Starting in 1.11, the interactive conflict resolver supports more conflict
+situations which involve moved files and directories. Specifically, many tree
+conflicts which report a "locally missing" item, as a result of an item having
+moved on the merge source branch, can now be resolved automatically.</p>
+
+<p>For example, when a file edit is cherry-picked from a branch on which
+the edited file has been renamed, the edit will now be applied to the file's
+location in the merge target branch, provided it has not been renamed
+on that branch as well. For details, see
+<a href="https://issues.apache.org/jira/browse/SVN-4694">issue #4694</a>,
+"Unresolvable tree conflict when cherrypicking a file-edit after file was
+moved on source branch".</p>
+
+<p>Furthermore, since 1.12, the interactive conflict resolver supports some
+cases where items were moved to disparate locations. Support for unversioned
+items in the working copy has been improved as well. The table below lists
+these cases and available resolution options for each.</p>
+
+<table border="1">
+  <tr>
+    <th>local change</th>
+    <th>incoming change</th>
+    <th>operation</th>
+    <th>resolution options</th>
+  </tr>
+  <tr>
+    <td><ul>
+      <li>move file</li>
+    </ul></td>
+    <td><ul>
+      <li>move file</li>
+    </ul></td>
+    <td>update, merge</td>
+    <td><ul>
+      <li>merge<br>(applies textual changes only and leaves the tree structure
+      of the working copy as it is)
+      <li>move and merge<br>(changes the file's location in the working copy
+      to match that of the merge source before merging changes)
+    </ul></td>
+  </tr>
+  <tr>
+    <td><ul>
+      <li>move directory</li>
+    </ul></td>
+    <td><ul>
+      <li>move directory</li>
+    </ul></td>
+    <td>merge</td>
+    <td><ul>
+      <li>merge<br>(applies changes to the corresponding directory and leaves
+       the tree structure of the working copy as it is)
+      <li>move and merge<br>(changes the directory's location in the working
+       copy to match that of the merge source before merging changes)
+    </ul></td>
+  <tr>
+    <td><ul>
+      <li>unversioned file</li>
+    </ul></td>
+    <td><ul>
+      <li>add file</li>
+    </ul></td>
+    <td>update, switch </td>
+    <td><ul>
+      <li>merge<br>(merges the unversioned file with the incoming file)
+    </ul></td>
+  </tr>
+  <tr>
+    <td><ul>
+      <li>unversioned directory</li>
+    </ul></td>
+    <td><ul>
+      <li>add directory</li>
+    </ul></td>
+    <td>update, switch </td>
+    <td><ul>
+      <li>merge<br>(re-adds directory to working copy but leaves any on-disk
+      files as they were)
+    </ul></td>
+  </tr>
+</table>
+
+<p>During <tt>svn update</tt>, the deletion of a directory which contains
+unversioned items but is otherwise unmodified no longer causes a tree
+conflict. This avoids tree conflicts caused by software build artifacts
+in the working copy, for example.</p>
+
+<p>Several bugs have been fixed in the conflict resolver, including:
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/SVN-4744">Issue #4744</a>
+&quot;assertion failed (start_rev &gt; end_rev)&quot;</li>
+<li><a href="https://issues.apache.org/jira/browse/SVN-4766">Issue #4766</a>
+&quot;resolver adds unrelated moves to move target list&quot;</li>
+<li>A problem where the resolver mistakenly
+<a href="https://svn.apache.org/r1839662">searched back through
+the entire history of the repository</a></li>
+<li>A case where text conflicts were created with the incoming changes 
+theirs) and local changes (mine) swapped within text conflict markers. This
+caused unexpected results when the <tt>svn resolve</tt> command was used with
+the <tt>--accept theirs</tt> or <tt>--accept mine</tt> options. This is fixed
+as of 1.12.</li>
+</ul>
+</p>
+
+<p>Fixes for conflict resolver bugs found during the development of
+Subversion 1.11 and 1.12 have been backported to the
+<a href="1.10.html">Subversion 1.10</a> release series as well.</p>
+
+</div> <!-- conflict-resolver -->
+
+<div class="h4" id="info-show-item">
+<h4>Additions to <tt>svn info --show-item</tt>
+  <a class="sectionlink" href="#info-show-item"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p>Add '<tt>schedule</tt>' and '<tt>depth</tt>' items to '<tt>svn info --show-item</tt>' (<a href="http://svn.apache.org/r1827032">r1827032</a>).</p>
+
+</div> <!-- info-show-item -->
+
+<div class="h4" id="save-client-cert-pw">
+<h4>Allow the client cert password to be saved
+  <a class="sectionlink" href="#save-client-cert-pw"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p>Allow the client cert password to be saved (<a href="http://svn.apache.org/r1836762">r1836762</a>).</p>
+
+</div> <!-- save-client-cert-pw -->
+
+<div class="h4" id="help-hide-experimental">
+<h4><tt>svn help</tt> hides experimental commands by default
+  <a class="sectionlink" href="#help-hide-experimental"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.13.</p>
+
+<p>By default, <tt>svn help</tt> no longer lists experimental commands.
+To show experimental commands, use <tt>svn help -v</tt> or
+<tt>svn help --verbose</tt>. (See <a href="https://issues.apache.org/jira/browse/SVN-4766">issue #4828</a>.)</p>
+
+</div> <!-- help-hide-experimental -->
+
+<div class="h4" id="sqlite-omit-wal">
+<h4>Improved performance for working copy commands like <tt>svn status</tt>
+  <a class="sectionlink" href="#sqlite-omit-wal"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.13.</p>
+
+<p>Some local operations, such as <tt>svn status</tt> on a large working copy,
+now perform more quickly as a result of reduced I/O. This is achieved by
+disabling SQLite's WAL (write-ahead logging) feature, which Subversion does
+not use, but which introduces more I/O when left enabled.
+(See <a href="http://svn.apache.org/r1865523">r1865523</a>.)</p>
+
+</div> <!-- sqlite-omit-wal -->
+
+</div> <!-- cmdline -->
+
+<div class="h3" id="server-side-improvements">
+<h3>Server-side improvements
+  <a class="sectionlink" href="#server-side-improvements"
+     title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="issue-4767">
+<h4><tt>svnadmin dump</tt> shouldn't canonicalize <tt>svn:date</tt>
+  (<a href="https://issues.apache.org/jira/browse/SVN-4767">issue #4767</a>)
+  <a class="sectionlink" href="#issue-4767"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p><tt>svnadmin dump</tt> no longer attempts to canonicalize the
+  <tt>svn:date</tt> revision property value in its output. The dump output
+  will now contain the value exactly as it exists in the repository.</p>
+
+</div> <!-- issue-4767 -->
+
+<div class="h4" id="authz-groups">
+<h4>Empty group definitions in authz rules
+  <a class="sectionlink" href="#authz-groups"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+
+<p>Subversion servers will now ignore empty group definitions in their
+path-based authorization rules. The <tt>svnauthz</tt> command will print
+a warning if it detects empty group definitions.</p>
+</div> <!-- authz-groups -->
+
+<div class="h4" id="mod-dav-svn-twice-hint">
+<h4>Provide a hint about a possible mod_dav_svn misconfiguration
+  <a class="sectionlink" href="#mod-dav-svn-twice-hint"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.13.</p>
+
+<p>Add a hint about a possible mod_dav_svn misconfiguration: When warning
+about an overlapping configuration, if two configuration blocks are for the
+same URL, then hint that the problem may be including the same configuration
+twice. (See <a href="http://svn.apache.org/r1866738">r1866738</a>.)</p>
+
+</div> <!-- mod-dav-svn-twice-hint -->
+
+</div> <!-- server-side-improvements -->
+
+<div class="h3" id="client-server-improvements">
+<h3>Client- and server-side improvements
+  <a class="sectionlink" href="#client-server-improvements"
+     title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="plaintext-passwords-disabled">
+<h4>Plaintext passwords on disk disabled by default
+  <a class="sectionlink" href="#plaintext-passwords-disabled"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+
+<p>On Unix-like systems, client-side storage of passwords in plaintext on
+disk is now disabled by default <em>at compile-time</em>.
+Password caching mechanisms based on Gnome Keyring, Kwallet, or GPG-Agent,
+are recommended instead.</p>
+
+<p>This change does not affect Windows or Mac OS platforms, where passwords
+have always been stored in an encrypted representation.</p>
+</div> <!-- plaintext-passwords-disabled -->
+
+<div class="h4" id="repos-wc-copy">
+<h4>Improved copying from repository source to working copy target
+  <a class="sectionlink" href="#repos-wc-copy"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+
+<p>Behaviour of copy operations with a repository source and a working copy
+target has been improved:</p>
+
+<ul>
+<li>Existing parent directories are now handled correctly.</li>
+<li>Peg and operative revisions are now handled correctly (see
+<a href="https://issues.apache.org/jira/browse/SVN-4785">issue #4785</a>
+for details).</li>
+</ul>
+</div> <!-- repos-wc-copy -->
+
+<div class="h4" id="svn-list">
+<h4><tt>svn list</tt> improvements
+  <a class="sectionlink" href="#svn-list"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+<p>The <tt>svn list</tt> command now avoids truncation of long author names
+by dynamically adjusting the width of columns displayed.</p>
+<p>The <tt>svn list</tt> command now supports a <tt>--human-readable</tt>
+(<tt>-H</tt>) option which will display sizes in human-readable units
+(Bytes, Kilobytes, Megabytes, Gigabytes, Terabytes and Petabytes).</p>
+</div> <!-- svn-list -->
+
+<div class="h4" id="svn-info">
+<h4><tt>svn info</tt> improvements
+  <a class="sectionlink" href="#svn-info"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+<p>The <tt>svn info</tt> command can now display the size of files in the
+repository. The file size is only displayed if the target of <tt>svn info</tt>
+is a file URL.</p>
+</div> <!-- svn-info -->
+
+<div class="h4" id="svn-cleanup">
+<h4><tt>svn cleanup</tt> improvements
+  <a class="sectionlink" href="#svn-cleanup"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+<p>The <tt>svn cleanup</tt> command, when asked to remove unversioned or
+ignored items, will now remove directories even if they are write-protected.</p>
+</div> <!-- svn-cleanup -->
+
+</div> <!-- client-server-improvements -->
+
+<div class="h3" id="apis">
+<h3>API changes, improvements and language bindings
+    (<em>client and server</em>)
+  <a class="sectionlink" href="#apis"
+    title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="python3">
+<h4>Support for Python 3.x
+  <a class="sectionlink" href="#python3"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>Some optional features of Subversion utilize the Python scripting
+language.</p>
+
+<p>Subversion's SWIG Python bindings and Subversion's test suite now
+support Python 3.x (and newer).</p>
+
+<p>Of course, we welcome contributions that extend Subversion's Python
+support to include other versions, subject to the project's other needs.
+See the section
+<a href="#enthusiastic-contributors">Enthusiastic Contributors
+Welcome</a> below.</p>
+
+</div>  <!-- python3 -->
+
+<div class="h4" id="python2">
+<h4>Support for Python 2.7 is being phased out
+  <a class="sectionlink" href="#python2"
+    title="Link to this section">&para;</a>
+</h4>
+
+<div class="notice">
+<p><strong>Python is Optional.</strong>
+Read more <a href="#pythonoptional">below</a>.</p>
+</div> <!-- notice -->
+
+<p>As of 1 January 2020, <a href="https://www.python.org/dev/peps/pep-0373/"
+>Python 2.7 has reached end of life</a>. All users are strongly encouraged
+to move to Python 3.</p>
+
+<p>As Subversion 1.14 is a Long Term Support (LTS) release with
+planned support into 2024, well beyond end-of-life for Python 2.7, the
+core Subversion developers cannot commit to supporting and testing
+with Python 2.7, or to fixing bugs that affect Python 2.7 only, for
+the duration of this support period.</p>
+
+<p>This means that although Subversion 1.14.0 still technically works
+with Python 2.7, any later 1.14.x point release may drop this support
+if it becomes too difficult to maintain.</p>
+
+<p>If you must continue using Python 2.7, our previous Long Term Support
+release, Subversion 1.10, is supported until 2022. Python 2.7 support
+will not be removed from Subversion 1.10.</p>
+
+<p>Of course, we welcome contributions that extend Subversion's Python
+2.7 support, subject to the project's other needs. See the section
+<a href="#enthusiastic-contributors">Enthusiastic Contributors
+Welcome</a> below.</p>
+
+</div>  <!-- python2 -->
+
+ <div class="h4" id="pythonoptional">
+<h4>Python is Optional
+  <a class="sectionlink" href="#pythonoptional"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>Subversion does <strong>not</strong> require Python for its basic
+operation. Python is only required for building Subversion and for
+using Subversion's SWIG Python bindings.  If you do not do either of
+these things, then this change does not affect you.</p>
+
+<p>The Python bindings are used by:</p>
+
+<ul>
+<li>Third-party programs (e.g.,
+    <a href="https://github.com/viewvc/viewvc/">ViewVC</a>)</li>
+<li>Scripts distributed with Subversion itself in the tools/
+    subdirectory.</li>
+<li>Any in-house scripts you may have.</li>
+</ul>
+
+<p>In more detail, Python is required for doing any of the
+following:</p>
+
+<ul>
+<li>Use the SWIG Python bindings</li>
+<li>Use the ctypes Python bindings</li>
+<li>Build Subversion on Windows</li>
+<li>Build Subversion from a tarball on Unix-like systems and run
+    Subversion's test suite</li>
+<li>Build Subversion from a working copy checked out from Subversion's
+    own repository</li>
+<li>Build the SWIG Python bindings</li>
+<li>Build the ctypes Python bindings</li>
+</ul>
+
+<p>Python is <strong>not</strong> required for doing any of the
+following:</p>
+
+<ul>
+<li>Use the core command-line binaries (svn, svnadmin, svnsync,
+    &hellip;)</li>
+<li>Use Subversion's C libraries</li>
+<li>Use any of Subversion's other language bindings</li>
+<li>Build Subversion from a tarball on Unix-like systems without
+    running Subversion's test suite</li>
+</ul>
+
+</div> <!-- pythonoptional -->
+
+<div class="h4" id="py3c">
+<h4>New Build-Time Dependency: py3c
+  <a class="sectionlink" href="#py3c"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>Subversion's support for Python 3.x SWIG bindings introduces a new
+optional dependency on the <a href="https://github.com/encukou/py3c"
+>Python 3 Compatibility layer for C extensions (py3c)</a>.</p>
+
+<p>You need py3c to build the SWIG Python bindings, regardless of the
+version of Python. As py3c is a header-only library, it is needed only
+to build the bindings, not to use them.</p>
+
+<p>The convenience script that downloads Subversion's minimal
+build-time dependencies,
+<a href="https://svn.apache.org/viewvc/subversion/branches/1.14.x/get-deps.sh"
+>get-deps.sh</a>, has been updated to download py3c. This script is
+found in the source distribution's root directory. For the full list
+of Subversion's dependencies, see the
+<a href="https://svn.apache.org/viewvc/subversion/branches/1.14.x/INSTALL"
+>INSTALL</a> file in the same directory.</p>
+
+</div>  <!-- py3c -->
+
+<div class="h4" id="swig4-on-py3">
+<h4>Support for building with SWIG 4 on Python 3.x
+  <a class="sectionlink" href="#swig4-on-py3"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p><em>This section only affects those who build Subversion from a working
+  copy.  If you build Subversion from a tarball or zip file, you may skip
+  this section.</em></p>
+
+<p>Subversion's SWIG Python bindings can be built with SWIG 4 on Python 3.
+The bindings can be built with SWIG 3.x on Python 3 as well (the
+<tt>-modern</tt> argument to SWIG is automatically used). (See
+<a href="http://svn.apache.org/r1869853">r1869853</a>.)</p>
+
+</div>  <!-- swig4-on-py3 -->
+
+<div class="h4" id="javahl">
+<h4>JavaHL Updates
+  <a class="sectionlink" href="#javahl"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p>The JavaHL bindings have been updated to be compatible with Java 10.  Due
+  to required build changes, JavaHL now requires at least Java 8 to compile.</p>
+
+</div>  <!-- javahl -->
+
+</div>  <!-- apis -->
+
+</div>  <!-- enhancements -->
+
+<div class="h2" id="experimental">
+<h2>Experimental Features
+  <a class="sectionlink" href="#experimental"
+    title="Link to this section">&para;</a>
+</h2>
+
+<!--
+<p>There are no experimental features in this release at the moment.</p>
+-->
+
+<div class="notice">
+  <p>The Subversion 1.14.x release includes several "EXPERIMENTAL" features.
+  These are released in an early form for purposes of testing, feedback, and
+  to entice interested users to <a href="#enthusiastic-contributors"
+  >contribute</a> to their further development.</p>
+
+  <p><span style="color: red"><b>WARNING:</b></span> Features and APIs which
+  are designated "EXPERIMENTAL" are considered incomplete and may change
+  significantly during and after the 1.14.x series. There is no promise of
+  backward compatibility, even from one point release to another, while they
+  remain experimental.</p>
+</div>
+
+<div class="h3 experimental-feature" id="shelving">
+<h3>Shelving and Checkpointing (experimental)
+  <a class="sectionlink" href="#shelving"
+     title="Link to this section">&para;</a>
+</h3>
+
+<p>Shelving (<a href="https://issues.apache.org/jira/browse/SVN-3625">issue
+#3625</a>), first introduced in Subversion 1.10, has been developed further to
+handle more kinds of changes more robustly. Two different versions of shelving
+CLIs, each with different pros and cons, are available for experimentation.
+Also, changes have been made under the hood to support a related feature,
+Commit Checkpointing (<a href="https://issues.apache.org/jira/browse/SVN-3626"
+>issue #3626</a>).</p>
+
+<p>You can read <a href="https://cwiki.apache.org/confluence/x/MxbcC">a
+review</a> of the development of experimental support for shelving to find
+out more about the differences between the versions, and the further work
+that would be needed in Subversion to make shelving a first-class
+feature.</p>
+
+<div class="notice">
+  <p>Shelving in 1.14 is incompatible with shelves created by 1.10. See
+  <a href="#shelving-transition">Upgrading 1.10&ndash;1.13 shelves to 1.14</a>
+  to learn how to recover 1.10 shelves in a working copy.</p>
+</div>
+
+<p>Shelving commands (see their help for details):</p>
+<ul>
+    <li><tt>svn x-shelf-diff</tt></li>
+    <li><tt>svn x-shelf-drop</tt></li>
+    <li><tt>svn x-shelf-list, x-shelves</tt></li>
+    <li><tt>svn x-shelf-list-by-paths</tt></li>
+    <li><tt>svn x-shelf-log</tt></li>
+    <li><tt>svn x-shelf-save</tt></li>
+    <li><tt>svn x-shelve</tt></li>
+    <li><tt>svn x-unshelve</tt></li>
+</ul>
+
+<p>Differences in the main shelving commands since 1.10:</p>
+
+<table>
+<tr><th>Subversion 1.10 command</th>
+    <th>Subversion 1.14 equivalent</th></tr>
+<tr><td><tt>svn [x-]shelve [--keep-local] SHELF [PATH...]</tt></td>
+    <td>works similarly; saves a new version each time it is used</td></tr>
+<tr><td><tt>svn [x-]unshelve [SHELF]</tt></td>
+    <td><tt>svn x-unshelve --drop [SHELF]</tt></td></tr>
+<tr><td><tt>svn [x-]unshelve --keep-shelved [SHELF]</tt></td>
+    <td><tt>svn x-unshelve [SHELF]</tt></td></tr>
+<tr><td><tt>svn [x-]shelve --delete SHELF</tt></td>
+    <td><tt>svn x-shelf-drop SHELF</tt></td></tr>
+<tr><td><tt>svn [x-]shelves</tt> or <tt>svn [x-]shelve --list</tt></td>
+    <td><tt>svn x-shelves</tt> or <tt>svn x-shelf-list</tt></td></tr>
+</table>
+
+<div class="h4 experimental-feature" id="shelving-enabling">
+<h4>Choosing and Enabling a Shelving CLI
+  <a class="sectionlink" href="#shelving-enabling"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>Because shelving is a work-in-progress, the shelving CLI is disabled by
+default. Users who wish to experiment with shelving should enable one of the
+two available shelving CLI implementations by setting an environment variable
+(see <a href="http://svn.apache.org/r1875037">r1875037</a> and
+<a href="http://svn.apache.org/r1875039">r1875039</a>.)</p>
+
+<p>The two implementations are "Shelving-v2" as introduced in 1.11, and
+"Shelving-v3" as introduced in 1.12. These are incompatible with each other,
+but both are offered because they have substantially different pros and
+cons. (See <a href="https://cwiki.apache.org/confluence/x/MxbcC">the
+review</a>.)</p>
+
+<p>The shelving CLI implementation is selected by an environment variable,
+<tt>SVN_EXPERIMENTAL_COMMANDS</tt>, as follows:</p>
+
+<table border="1">
+  <tr>
+    <th>environment variable</th>
+    <th>shelving CLI implementation</th>
+  </tr>
+  <tr>
+    <td><tt>SVN_EXPERIMENTAL_COMMANDS=shelf3</tt></td>
+    <td>Shelving-v3, as introduced in 1.12</td>
+  </tr>
+  <tr>
+    <td><tt>SVN_EXPERIMENTAL_COMMANDS=shelf2</tt></td>
+    <td>Shelving-v2, as introduced in 1.11</td>
+  </tr>
+  <tr>
+    <td><tt>SVN_EXPERIMENTAL_COMMANDS=</tt></td>
+    <td>No shelving CLI</td>
+  </tr>
+  <tr>
+    <td>Environment variable not set</td>
+    <td>No shelving CLI</td>
+  </tr>
+</table>
+
+<p>The following table summarizes the kinds of changes that can be shelved by
+the two implementations:</p>
+
+<table border="1">
+  <tr>
+    <th>WC State or Change</th>
+    <th>Shelving-v2</th>
+    <th>Shelving-v3</th>
+  </tr>
+  <tr>
+    <td>file text, file delete/add, most properties</td>
+    <td>yes</td>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <td>mergeinfo changes</td>
+    <td>yes</td>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <td>copies and moves</td>
+    <td>no</td>
+    <td>as copies<sup>1</sup></td>
+  </tr>
+  <tr>
+    <td>directories (mkdir/rmdir/...)</td>
+    <td>no</td>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <td>binary files & properties</td>
+    <td>yes</td>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <td colspan="3"><sup>1</sup>On shelving, a move is converted to
+    copy-and-delete, just like it is on commit.
+    </td>
+  </tr>
+</table>
+
+</div>  <!-- shelving-enabling -->
+
+<div class="h4 experimental-feature" id="shelving-v2">
+<h4>Shelving-v2
+  <a class="sectionlink" href="#shelving-v2"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>Shelving-v2, first introduced in 1.11, improves upon the initial shelving
+feature introduced in 1.10. The main improvements and changes are:</p>
+<ul>
+    <li>checkpointing support: a shelf stores multiple versions of a
+        change; shelving adds a new version to the named shelf; you can
+        unshelve an older version instead of the newest&mdash;see the
+        <a href="#shelving-checkpointing">commit checkpointing</a> feature</li>
+    <li>'binary' files (and property values) are fully supported</li>
+    <li>patch files are no longer used as the storage mechanism;
+        limitations and bugs due to patch file format are gone, such as
+        handling svn:mergeinfo properties, binary data, and end-of-line
+        characters</li>
+    <li>shelving and unshelving both warn and refuse to run if they detect
+        states that they cannot handle (e.g. copies or moves)</li>
+    <li>unshelving applies the changes to the WC using a mechanism similar
+        to merging, so that changes can be more robustly applied when the
+        WC has been modified (e.g. updated) since the shelf was saved</li>
+</ul>
+
+<p>Shelving-v2 can shelve committable changes to files and properties, except
+the following kinds which it does not support:</p>
+<ul>
+    <li>copies and moves</li>
+    <li>creating and deleting directories</li>
+</ul>
+
+<p>Shelves created by Shelving-v2 are stored under
+<tt><i>&lt;WC&gt;</i>/.svn/experimental/shelves/v2</tt>.</p>
+
+</div>  <!-- shelving-v2 -->
+
+<div class="h4 experimental-feature" id="shelving-v3">
+<h4>Shelving-v3
+  <a class="sectionlink" href="#shelving-v3"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>Shelving-v3, first introduced in 1.12, can handle more kinds of changes
+than Shelving-v2. In particular, it supports shelving of all committable
+changes. However, it performs much more slowly than Shelving-v2 and uses more
+disk space, especially when used with large working copies.</p>
+
+<p>This version of shelving represents a series of significant refactorings
+under the hood to eventually support better shelving, commit checkpointing,
+and the possibility of future client-side features for manipulating and
+sharing committable changes.</p>
+
+<p>Shelves created by Shelving-v3 are stored under
+<tt><i>&lt;WC&gt;</i>/.svn/experimental/shelves/v3</tt>.</p>
+
+</div>  <!-- shelving-v3 -->
+
+<div class="h4 experimental-feature" id="shelving-transition">
+<h4>Upgrading 1.10&ndash;1.13 shelves to 1.14
+  <a class="sectionlink" href="#shelving-transition"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>The presence in the working copy of any shelves created by Subversion 1.10
+has no effect on a Subversion 1.14 client. Subversion 1.14 will ignore them;
+it cannot interoperate with them nor even list their presence.</p>
+
+<p>The <tt>svn upgrade</tt> command has no effect on shelves, as the
+working copy format is formally unchanged.</p>
+
+<p>To recover a shelf created by 1.10, either
+<ul><li>use a 1.10 client to find and unshelve it, or</li>
+    <li>as 1.10 shelves are stored as patch files under
+        <tt><i>&lt;WC&gt;</i>/.svn/shelves/</tt>, find the patch file and
+        use any 1.10&ndash;1.14 or later <tt>svn patch</tt> to apply it.</li>
+</ul></p>
+
+<p>To access shelves created by 1.11, first select Shelving-v2 by setting the
+environment variable <tt>SVN_EXPERIMENTAL_COMMANDS=shelf2</tt>.</p>
+
+<p>To access shelves created by 1.12&ndash;1.13, first select Shelving-v3 by
+setting the environment variable <tt>SVN_EXPERIMENTAL_COMMANDS=shelf3</tt>.</p>
+
+</div>  <!-- shelving-transition -->
+
+<div class="h4 experimental-feature" id="shelving-checkpointing">
+<h4>Commit checkpointing (experimental)
+  <a class="sectionlink" href="#shelving-checkpointing"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p>Since 1.11, Subversion provides an experimental first cut at solving some
+of the use cases envisioned in <a
+href="https://issues.apache.org/jira/browse/SVN-3626">issue #3626</a> named
+"Commit checkpointing".</p>
+
+<p>It provides the ability to save a snapshot of an uncommitted change from
+time to time, and later restore one of those previous versions of your
+change back into the working copy.</p>
+
+<p>It does not provide the kind of exact WC state roll back that is also
+discussed in that issue, that could make it possible after a messy update to
+roll back to the exact WC state that existed just before. This remains a
+future possibility.</p>
+
+<p>The ability to checkpoint and roll back an uncommitted change is provided
+within the shelving feature, by letting a shelf hold multiple versions of
+your change. Therefore, see also <a href="#shelving"> Shelving</a>.</p>
+
+<p>The main checkpointing operations are accomplished by the following
+commands, as also listed in
+<a href="https://cwiki.apache.org/confluence/x/70cYBQ">the Wiki page</a>:</p>
+
+<table>
+<tr><th>Save a checkpoint and continue</th>
+    <td><tt>svn x-<b>shelf-save</b> foo</tt></td>
+    <td>copy the local changes into a new version of shelf 'foo';<br/>
+        doesn't revert the changes from the WC</td>
+</tr>
+<tr><th>Save a checkpoint and shelve</th>
+    <td><tt>svn x-<b>shelve</b> foo</tt></td>
+    <td>move the local changes into a new version of shelf 'foo'<br/>
+        and revert the changes from the WC</td>
+</tr>
+<tr><th>Restore / roll back</th>
+    <td>first revert your unwanted changes; then<br/>
+        <tt>svn x-<b>unshelve</b> foo 3</tt></td>
+    <td>apply version 3 of shelf 'foo' to the WC<br/>
+        and delete any newer versions</td>
+</tr>
+<tr><th>Review checkpoints</th>
+    <td><tt>svn x-<b>shelf-log</b> foo</tt></td>
+    <td>list all the versions of shelf 'foo'</td>
+</tr>
+<tr><th></th>
+    <td><tt>svn x-<b>shelf-diff</b> foo 3</tt></td>
+    <td>show version 3 as a diff</td>
+</tr>
+</table>
+
+</div>  <!-- shelving-checkpointing -->
+
+<p>Further information can be found in the Subversion Wiki under
+<a href="https://cwiki.apache.org/confluence/display/SVN/Shelving+and+Checkpointing"
+>Shelving and Checkpointing</a>, including internal design and development
+notes.</p>
+
+</div>  <!-- shelving -->
+
+<div class="h3 experimental-feature" id="viewspec-output">
+<h3>Viewspec output command (experimental)
+  (<a href="https://issues.apache.org/jira/browse/SVN-4753">issue #4753</a>)
+  <a class="sectionlink" href="#viewspec-output"
+     title="Link to this section">&para;</a>
+</h3>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p>There is an experimental command to write out a view spec describing the
+current WC shape.</p>
+
+<p>A view spec describes whether each subtree is at a limited depth, excluded,
+switched to a different URL, or updated to a different revision number,
+compared with its parent directory. This information is sometimes referred
+to as the shape or the layout of a WC.</p>
+
+<p>'<tt>svn info --x-viewspec=classic</tt>' writes in the format used by the old script
+<a href="http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-viewspec.py">tools/client-side/svn-viewspec.py</a>.</p>
+
+<p>'<tt>svn info --x-viewspec=svn11</tt>' writes a series of '<tt>svn</tt>'
+command lines. You can create a new WC of the same layout by running these
+commands.</p>
+
+</div> <!-- viewspec-output -->
+
+</div>  <!-- experimental -->
+
+<div class="h2" id="issues">
+<h2>Known Issues in the Release
+  <a class="sectionlink" href="#issues"
+    title="Link to this section">&para;</a>
+</h2>
+
+<!--
+<p>There are no known issues specific to this release at the moment.</p>
+-->
+
+<p>There are some known issues in the Subversion 1.14 releases.  These
+may be fixed in later 1.14.x releases.</p>
+
+<div class="h3" id="python3-work-in-progress">
+<h3>Python 3 support is incomplete
+  <a class="sectionlink" href="#python3-work-in-progress"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>Some Python scripts that are included in Subversion's release
+distribution do not support Python 3 yet.</p>
+
+<p>For an exhaustive list of all Python scripts and files that use
+Python, categorized by their Python 3 support status as of the
+1.14.0 release, see <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=138021580"
+>Subversion's Python 3 Support Status</a> wiki page.</p>
+
+<p>The <a href="https://cwiki.apache.org/confluence/display/SVN/Subversion%27s+Python+3+Support+Status"
+>latest version</a> of that page reflects changes made after
+the release, which may be included in future releases.</p>
+
+<div class="h4" id="autogen_sh-py2-py3">
+<h4>The build system prefers Python 2 to Python 3
+  <a class="sectionlink" href="#autogen_sh-py2-py3"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>Although <a href="#pythonoptional">Python is not required for building
+Subversion</a>, it <em>is</em> required for running the test suite, and
+therefore, on Unix-like systems, Subversion's build system looks for a Python
+executable.</p>
+
+<p>The build system checks the environment variables <tt>$PYTHON</tt>,
+<tt>$PYTHON2</tt>, and <tt>$PYTHON3</tt> in this order, followed by the command
+names <tt>python</tt>, </tt>python2</tt>, and <tt>python3</tt> (in
+<tt>$PATH</tt>) in this order.  The first of these that is an executable
+implementing Python version 2.7 or greater is used.</p>
+
+<p>Since <a href="#python2">support for Python 2.7 is being phased out</a>, we
+expect to change this to prefer Python 3 to Python 2.7 in a 1.14.x patch release.
+When we do, we will mention the change in the <tt>CHANGES</tt> file and update
+this section of the release notes.</p>
+
+<p>This affects both tarball builds (using <tt>configure</tt>) and working copy
+builds (using <tt>autogen.sh</tt>).  The release rolling scripts are also
+affected.</p>
+
+<p>As a workaround, the environment variable <tt>PYTHON</tt> may be set to the
+full path of a Python 3 executable prior to running <tt>configure</tt> (or
+<tt>autogen.sh</tt>, if you build from a working copy).</p>
+
+</div> <!-- autogen_sh-py2-py3 -->
+
+</div>  <!-- python3-work-in-progress -->
+
+<div class="h3" id="ruby-swig-issue-602">
+<h3>Ruby bindings require swig 3.0.9
+  <a class="sectionlink" href="#ruby-swig-issue-602"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p><em>This section only affects those who build Subversion from a working
+  copy.  If you build Subversion from a tarball or zip file, you may skip
+  this section.</em></p>
+
+<p>The Ruby bindings are known not to build with swig version 3.0.8 (and only
+that version) due to <a href="https://github.com/swig/swig/issues/602">swig
+issue #602</a>.  We recommend to use swig 3.0.9 or newer.</p>
+
+<p>The failure is detected by the test suite.
+To test whether your version of swig is affected, run
+<tt>make check-swig-rb</tt>.  (Some distros might have backported the swig
+patch into their swig-3.0.8 packages.)</p>
+
+<p>The Perl and Python bindings are not affected.</p>
+
+</div>  <!-- ruby-swig-issue-602 -->
+
+</div>  <!-- issues -->
+
+<!-- (This section only makes sense when there are some issues listed in it.)
+<div class="h2" id="troubleshooting">
+<h2>Troubleshooting issues specific to this release
+  <a class="sectionlink" href="#troubleshooting"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Subversion 1.14 introduces new features and makes use of new techniques
+which can trigger problems not encountered in previous versions. In contrast to
+known issues, things listed here are not due to some bug or issue in Subversion
+itself and therefore cannot be fixed with a new patch release.
+This section lists all known problems and provides instructions to solve them,
+if they occur.</p>
+
+<p>There are no known issues specific to this release at the moment.</p>
+
+</div>  <!- - troubleshooting - ->
+-->
+
+<div class="h2" id="support">
+<h2>Support and Release Planning
+  <a class="sectionlink" href="#lts-release"
+    title="Link to this section">&para;</a>
+</h2>
+
+<div class="h3" id="lts-release">
+<h3>Subversion 1.14.x is a Long-Term Support (LTS) Release
+  <a class="sectionlink" href="#lts-release"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>1.14 is a Long-Term Support (LTS) release.
+   See <a href="/docs/release-notes/#supported-versions">Supported Versions</a>
+   and <a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
+
+</div>  <!-- lts-release -->
+
+<div class="h3" id="svn-1.13-deprecation">
+<h3>Subversion 1.13.x is end of life
+  <a class="sectionlink" href="#svn-1.13-deprecation"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>The Subversion 1.13.x line is end of life (<abbr title="End Of Life">EOL</abbr>).
+This doesn't mean that your 1.13 installation is doomed; if it works
+well and is all you need, that's fine.  "End of life" just means we've
+stopped accepting bug reports against 1.13.x versions, and will not
+make any more 1.13.x releases.</p>
+
+</div>  <!-- svn-1.13-deprecation -->
+
+<div class="h3" id="svn-1.10-old-stable">
+<h3>Subversion 1.10.x is now the old stable version
+  <a class="sectionlink" href="#svn-1.10-old-stable"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>The Subversion 1.10.x line is now the old stable version.  This means
+that 1.10.x will still receive security relevant fixes as well as
+bugfixes. While we will evaluate any bugreport with regards to its
+severity, there might be issues with a lower severity which will
+only get fixed in 1.14.x, particularly if the patches would be invasive,
+destabilizing, and/or require a significant investment to get backported to the
+old stable version.</p>
+
+<p>Therefore, if you are running into an issue with the old stable
+version which has already been fixed in the latest version, we might
+ask you to upgrade to that version to resolve the issue.</p>
+
+</div>  <!-- svn-1.10-old-stable -->
+
+<div class="h3" id="svn-1.9-deprecation">
+<h3>Subversion 1.9.x is end of life
+  <a class="sectionlink" href="#svn-1.9-deprecation"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>The Subversion 1.9.x line is end of life (<abbr title="End Of Life">EOL</abbr>).
+This doesn't mean that your 1.9 installation is doomed; if it works
+well and is all you need, that's fine.  "End of life" just means we've
+stopped accepting bug reports against 1.9.x versions, and will not
+make any more 1.9.x releases.</p>
+
+</div>  <!-- svn-1.9-deprecation -->
+
+</div>  <!-- support -->
+
+<div class="h2" id="enthusiastic-contributors">
+<h2>Enthusiastic Contributors Welcome!
+  <a class="sectionlink" href="#enthusiastic-contributors"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>You can contribute to Subversion!</p>
+
+<p>As Subversion is an open source project developed and supported by
+volunteers, we are always happy to welcome enthusiastic participants
+to the community.</p>
+
+<p>Whether you'd like to see support for additional versions of Python,
+want to help finish Shelving and Checkpointing, or have ideas for some big
+new features, if you're willing to invest the effort, Subversion can be
+anything you imagine.</p>
+
+<p>Join the conversation by email: For our mailing lists, see
+<a href="https://subversion.apache.org/mailing-lists.html">
+https://subversion.apache.org/mailing-lists.html</a></p>
+
+<p>Or by IRC at irc.freenode.net:</p>
+<ul>
+  <li>#svn channel: User chat and help using Subversion</li>
+  <li>#svn-dev channel: Get involved in development!</li>
+</ul>
+
+<p>Get the source:</p>
+<ul>
+  <li>Check out Subversion's source:
+    <pre>$ svn checkout https://svn.apache.org/repos/asf/subversion/trunk/</pre></li>
+
+  <!-- TODO: Use the URL to the *.apache.org mirror of subversion.git -->
+  <li>For those who prefer it, a Git mirror is also available:
+    <pre>$ git clone https://github.com/apache/subversion.git</pre></li>
+
+  <li>Or download the latest release tarball:
+    <a href="https://subversion.apache.org/download.cgi"
+    >https://subversion.apache.org/download.cgi</a></li>
+</ul>
+
+<p>Join us today!</p>
+
+</div>  <!-- enthusiastic-contributors -->
+
+<!-- ***************** END CONTENT ****************** -->
+</div> <!-- #site-content -->
+</body>
+</html>
diff --git a/debian/svn_1.9_releasenotes.html b/debian/svn_1.9_releasenotes.html
index 2da5129..8da6db2 100644
--- a/debian/svn_1.9_releasenotes.html
+++ b/debian/svn_1.9_releasenotes.html
@@ -1568,6 +1568,26 @@ See our <a href="/security/sha1-advisory.txt">SHA1 advisory</a> for details.
 
 </div>  <!-- shattered-sha1 -->
 
+<div class="h3" id="svn-4722">
+<h3>Commit can fail with an undeserved SHA1 collision error
+  <a class="sectionlink" href="#svn-4722"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>When using a Subversion 1.9.6 or 1.9.7 server, a commit may fail
+with an undeserved SHA1 collision error: "E160000: SHA1 of reps
+&hellip; and &hellip; matches (&hellip;) but contents differ." This
+bug affects the 1.9.6 and 1.9.7 releases.</p>
+
+<p>See <a href="https://issues.apache.org/jira/browse/SVN-4722?issueNumber=4722"
+>issue 4722, "checksum fail during commit when delta is 16K"</a>.
+</p>
+
+<p>A fix for this problem has been included in the 1.9.9 release
+(1.9.8 was not publicly released).</p>
+
+</div>  <!-- svn-4722 -->
+
 </div>  <!-- issues -->
 
 <div class="h2" id="troubleshooting">
diff --git a/gen-make.py b/gen-make.py
index 58fc8c2..bdb3593 100755
--- a/gen-make.py
+++ b/gen-make.py
@@ -175,6 +175,8 @@ def _usage_exit(err=None):
   print("")
   print("  --with-swig=DIR")
   print("           look for the swig program in DIR")
+  print("  --with-py3c=DIR")
+  print("           look for the py3c library in DIR")
   print("")
   print("  --with-sqlite=DIR")
   print("           look for sqlite in DIR")
@@ -249,6 +251,7 @@ if __name__ == '__main__':
                             'with-jdk=',
                             'with-junit=',
                             'with-swig=',
+                            'with-py3c=',
                             'with-sqlite=',
                             'with-sasl=',
                             'with-apr_memcache=',
diff --git a/get-deps.sh b/get-deps.sh
index b499ff4..68ccdf8 100755
--- a/get-deps.sh
+++ b/get-deps.sh
@@ -31,8 +31,9 @@
 # features already used in the file.  Reviewing the history of changes
 # may be useful as well.
 
-APR_VERSION=${APR_VERSION:-"1.4.6"}
+APR_VERSION=${APR_VERSION:-"1.5.0"}
 APU_VERSION=${APU_VERSION:-"1.5.1"}
+PY3C_VERSION=${PY3C_VERSION:='1.1'}
 SERF_VERSION=${SERF_VERSION:-"1.3.8"}
 ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
 SQLITE_VERSION=${SQLITE_VERSION:-"3.8.11.1"}
@@ -43,6 +44,7 @@ APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
 
 APR=apr-${APR_VERSION}
 APR_UTIL=apr-util-${APU_VERSION}
+PY3C=py3c-${PY3C_VERSION}
 SERF=serf-${SERF_VERSION}
 ZLIB=zlib-${ZLIB_VERSION}
 SQLITE_VERSION_LIST=`echo $SQLITE_VERSION | sed -e 's/\./ /g'`
@@ -66,7 +68,7 @@ APACHE_MIRROR=https://archive.apache.org/dist
 # helpers
 usage() {
     echo "Usage: $0"
-    echo "Usage: $0 [ apr | serf | zlib | sqlite ] ..."
+    echo "Usage: $0 [ apr | py3c | serf | zlib | sqlite ] ..."
     exit $1
 }
 
@@ -84,6 +86,19 @@ get_apr() {
     test -d $BASEDIR/apr-util || mv $APR_UTIL apr-util
 }
 
+get_py3c() {
+    test -d $BASEDIR/py3c && return
+    py3cdist=v${PY3C_VERSION}.tar.gz
+
+    cd $TEMPDIR
+    $HTTP_FETCH https://github.com/encukou/py3c/archive/${py3cdist}
+    cd $BASEDIR
+
+    gzip -dc $TEMPDIR/${py3cdist} | tar -xf -
+
+    mv $PY3C py3c
+}
+
 get_serf() {
     test -d $BASEDIR/serf && return
 
@@ -125,7 +140,7 @@ get_sqlite() {
 get_deps() {
     mkdir -p $TEMPDIR
 
-    for i in zlib serf sqlite-amalgamation apr apr-util; do
+    for i in zlib serf sqlite-amalgamation py3c apr apr-util; do
       if [ -d $i ]; then
         echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
       fi
@@ -141,6 +156,7 @@ get_deps() {
       done
     else
       get_apr
+      get_py3c
       get_serf
       get_zlib
       get_sqlite
diff --git a/subversion/bindings/javahl/native/CommitEditor.cpp b/subversion/bindings/javahl/native/CommitEditor.cpp
index 0a550d8..b0eb85b 100644
--- a/subversion/bindings/javahl/native/CommitEditor.cpp
+++ b/subversion/bindings/javahl/native/CommitEditor.cpp
@@ -444,7 +444,8 @@ svn_error_t* open_callback_session(svn_ra_session_t*& session,
   if (!session)
     {
       const char* corrected_url = NULL;
-      SVN_ERR(svn_ra_open4(&session, &corrected_url, url, uuid,
+      const char* redirect_url = NULL;
+      SVN_ERR(svn_ra_open5(&session, &corrected_url, &redirect_url, url, uuid,
                            context->getCallbacks(),
                            context->getCallbackBaton(),
                            context->getConfigData(),
@@ -459,8 +460,8 @@ svn_error_t* open_callback_session(svn_ra_session_t*& session,
           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);
+                "Expected URL: %s\nRedirect URL:%s\nApparent URL: %s\n"),
+              url, redirect_url, corrected_url);
         }
     }
   return SVN_NO_ERROR;
diff --git a/subversion/bindings/javahl/native/JNIUtil.cpp b/subversion/bindings/javahl/native/JNIUtil.cpp
index f62b4f1..d62b56a 100644
--- a/subversion/bindings/javahl/native/JNIUtil.cpp
+++ b/subversion/bindings/javahl/native/JNIUtil.cpp
@@ -824,7 +824,7 @@ JNIUtil::checkJavaException(apr_status_t errorcode)
   else
     err->message = _("Java exception");
 
-  
+
   /* ### TODO: Use apr_pool_userdata_set() on the pool we just created
                for the error chain to keep track of the actual Java
                exception while the error is inside Subversion.
diff --git a/subversion/bindings/javahl/native/Path.cpp b/subversion/bindings/javahl/native/Path.cpp
index 625634e..0abc128 100644
--- a/subversion/bindings/javahl/native/Path.cpp
+++ b/subversion/bindings/javahl/native/Path.cpp
@@ -33,7 +33,7 @@
 #include "JNIStringHolder.h"
 #include "Pool.h"
 #include "svn_private_config.h"
- 
+
 /**
  * Constructor
  *
diff --git a/subversion/bindings/javahl/native/RemoteSession.cpp b/subversion/bindings/javahl/native/RemoteSession.cpp
index 57e4a91..6db93a1 100644
--- a/subversion/bindings/javahl/native/RemoteSession.cpp
+++ b/subversion/bindings/javahl/native/RemoteSession.cpp
@@ -198,13 +198,14 @@ RemoteSession::RemoteSession(int retryAttempts,
     return;
 
   const char* corrected_url = NULL;
+  const char* redirect_url = NULL;
   bool cycle_detected = false;
   attempt_set attempted;
 
   while (retryAttempts-- >= 0)
     {
       SVN_JNI_ERR(
-          svn_ra_open4(&m_session, &corrected_url,
+          svn_ra_open5(&m_session, &corrected_url, &redirect_url,
                        url, uuid, m_context->getCallbacks(),
                        m_context->getCallbackBaton(),
                        m_context->getConfigData(),
@@ -214,7 +215,7 @@ RemoteSession::RemoteSession(int retryAttempts,
       if (!corrected_url)
         break;
 
-      attempt_insert result = attempted.insert(corrected_url);
+      attempt_insert result = attempted.insert(redirect_url);
       if (!result.second)
         {
           cycle_detected = true;
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 7cce9f6..e4b6354 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
@@ -142,7 +142,7 @@ public class NativeResources
     private static final void init()
     {
         final int SVN_VER_MAJOR = 1;
-        final int SVN_VER_MINOR = 13;
+        final int SVN_VER_MINOR = 14;
         initNativeLibrary();
         version = new Version();
         if (!version.isAtLeast(SVN_VER_MAJOR, SVN_VER_MINOR, 0))
diff --git a/subversion/bindings/swig/INSTALL b/subversion/bindings/swig/INSTALL
index 751a5c4..207b73f 100644
--- a/subversion/bindings/swig/INSTALL
+++ b/subversion/bindings/swig/INSTALL
@@ -5,7 +5,12 @@ STATUS OF THE SWIG BINDINGS
 * Python
 
   The Python bindings are fairly well developed, although there are some
-  missing parts.
+  missing parts. We support both of Python 2.7 and Python 3.x; however,
+  SWIG Python bindings for different versions of Python cannot be
+  simultaneously installed in the same environment, because they need to
+  install mutually incompatible C shared libraries under the same name.  The
+  distribution tarballs are shipped with SWIG-generated C source files for
+  Python 3.x.
 
   (N.B. As discussed below, they will not compile in Debug mode on Windows.)
 
@@ -64,15 +69,36 @@ STATUS OF THE SWIG BINDINGS
 BUILDING SWIG BINDINGS FOR SVN ON UNIX
 
 
-Step 1:  Install a suitable version of SWIG (which is
-         currently SWIG version 1.3.24 or later).
-
-    * Perhaps your distribution packages a suitable version - if it does
-      install it, and skip to the last bullet point in this section.
+Step 1: [Optional] Install a suitable version of SWIG
+
+    * SWIG installation is optional.  You do not need to install SWIG
+      if you are using a Subversion distribution tarball because it already
+      contains the source files generated by SWIG.  You will need a suitable
+      version of SWIG if you are using a working copy of Subversion's sources
+      checked out from the repository; if you want to generate the SWIG
+      language bindings C source files by yourself; or if you want to build
+      Python 2.x bindings (since the SWIG-generated C source files in the
+      distribution tarballs target Python 3.x).
+
+    * We currently support SWIG versions 2.0.0 and later, with the
+      following notes:
+      - SWIG 1.3.24 and later 1.3.x may work, but we do not test these
+        versions on our latest source code.
+      - For Python 2 bindings, SWIG 4.0.0 or later is not supported.
+      - For Python 3 bindings, SWIG 3.0.10 or later is required.
+      - Note that SWIG 3.0.9 has some trouble with Python support.
+        (See https://sourceforge.net/p/swig/news/2016/06/swig-3010-released/)
+      - For Perl 5.16 and later, SWIG 2.0.8 or later is required.
+      - For Ruby bindings, SWIG 3.0.8 is not supported.
+
+    * Perhaps your distribution packages a suitable version of SWIG.
+      If so, install it and skip to the last bullet point of this
+      section.
 
     * Go to http://www.swig.org/, download the source tarball, and unpack.
 
-    * In the SWIG-1.3.xx directory, run ./configure.
+    * In the swig-x.y.z, directory, run ./configure (where x.y.z is
+      SWIG version, e.g., 3.0.12).
 
         If you plan to build the Python bindings, and have a system
         with more than one version of Python installed, you may need
@@ -95,8 +121,21 @@ Step 1:  Install a suitable version of SWIG (which is
         Run 'make && make install'
 
     * To verify you have SWIG installed correctly, run "swig -version"
-      from the command line. SWIG should report that it is version 1.3.24
-      or newer.
+      from the command line.  SWIG should report that it is one of the
+      suitable versions mentioned above.
+
+
+Step 1a: Install py3c library if building Python SWIG bindings.
+
+    * Check your distribution packages first for a suitable version, and
+      if found install from there.
+
+    * To install from source, download the latest release from
+      https://github.com/encukou/py3c.
+
+    * This is a header-only library, so no configuring or compiling is
+      necessary, simply 'make install'.
+
 
 Step 2:  Build and Install Subversion.
 
@@ -109,7 +148,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.7 PERL=/usr/bin/perl5.8.0
+       ./configure PYTHON=/usr/bin/python3.7 PERL=/usr/bin/perl5.28.2
 
   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:
@@ -121,17 +160,24 @@ Step 3:  Install Specific Language Bindings
 
 *  Python
 
-   1.  Run 'make swig-py' from the top of the Subversion build tree,
+   1.  (Optional) If you want to build Python bindings for a version of
+       Python than other than that the prebuilt bindings C sources target
+       (e.g., if you use the Subversion distribution tarball but want to build
+       Python 2 bindings), run 'make clean-swig-py' from the top of the
+       Subversion build tree, to ensure not to use incompatible version of
+       bindings source files.
+
+   2.  Run 'make swig-py' from the top of the Subversion build tree,
        to build the bindings.
 
        (This will invoke SWIG on the *.i files, resulting in a collection
        of .c source files.  It will then compile and link those .c files into
        Python libraries.)
 
-   2.  Run 'make check-swig-py' from the top of the Subversion build
-       tree, to test the bindings 
+   3.  Run 'make check-swig-py' from the top of the Subversion build
+       tree, to test the bindings
 
-   3.  Run 'make install-swig-py' (as root, typically)
+   4.  Run 'make install-swig-py' (as root, typically)
        from the top of the Subversion build tree.  This will copy
        your new Python libraries into the appropriate system location.
 
@@ -145,14 +191,14 @@ Step 3:  Install Specific Language Bindings
        example of doing this for building rpms looks like
        'make install-swig-py DESTDIR=$RPM_BUILD_ROOT/usr'.
 
-   4.  Make sure that whatever directory the bindings got installed in
+   5.  Make sure that whatever directory the bindings got installed in
        is in your Python search path.  That directory depends on how you
        installed; a typical location is /usr/local/lib/svn-python/.
 
        There are several ways to do this. See Python's documentation for
        'sys.path' and 'PYTHONPATH'. A nice way to do this is:
        $ echo /usr/local/lib/svn-python \
-           > /usr/lib/python2.x/site-packages/subversion.pth
+           > /usr/lib/python3.x/site-packages/subversion.pth
 
        You may also need to update your operating system's dynamic linker
        configuration to enable Python to load these new libraries. On some
@@ -170,7 +216,7 @@ Step 3:  Install Specific Language Bindings
    1.  Run `make swig-pl' from the top of the Subversion build tree.
 
    2.  Run `make check-swig-pl' from the top of the Subversion build
-       tree, to test the bindings 
+       tree, to test the bindings
 
    3.  to install run `make install-swig-pl' from the top of the
        Subversion build tree.
@@ -182,9 +228,9 @@ Step 3:  Install Specific Language Bindings
 
    2.  Run `make install-swig-pl-lib'
 
-   3.  cd subversion/bindings/swig/perl/native 
+   3.  cd subversion/bindings/swig/perl/native
 
-   4.  Run `perl Makefile.PL EXTRAOPTIONSHERE` 
+   4.  Run `perl Makefile.PL EXTRAOPTIONSHERE`
 
    5.  Run `make install'
 
@@ -194,21 +240,21 @@ Step 3:  Install Specific Language Bindings
 
 
 * Ruby
-  
+
    1. Run `make swig-rb' from the top of the Subversion build tree,
       to build the bindings.
 
    2. Run `make check-swig-rb' from the top of the Subversion build
       tree, to test the bindings.
 
-   3. To install, run `make install-swig-rb' from the top of the 
+   3. To install, run `make install-swig-rb' from the top of the
       Subversion build tree.
 
-   You can specify the ruby binary by passing RUBY=/path/to/ruby as part 
-   of the configure command in the top level of the Subversion source 
-   tree. Make sure that the Ruby version used is the same one that you 
-   configured SWIG to run against during the SWIG configure (see above). 
-   
+   You can specify the ruby binary by passing RUBY=/path/to/ruby as part
+   of the configure command in the top level of the Subversion source
+   tree. Make sure that the Ruby version used is the same one that you
+   configured SWIG to run against during the SWIG configure (see above).
+
 
 BUILDING SWIG BINDINGS FOR SVN ON WINDOWS
 
@@ -226,6 +272,9 @@ BUILDING SWIG BINDINGS FOR SVN ON WINDOWS
            http://www.python.org/
            http://www.activestate.com/ActivePerl/
 
+       If you plan to build python bindings, you will also need to download and
+       extract the py3c library from https://github.com/encukou/py3c/releases.
+
        NOTE: Our Python SWIG bindings will currently NOT compile in Debug mode
              unless you have python24_d.lib (which binary distributions of
              Python do not contain).  Therefore, the Python bindings will only
@@ -242,6 +291,11 @@ BUILDING SWIG BINDINGS FOR SVN ON WINDOWS
 
         > gen-make.py <other options> --with-swig="C:\Program Files\SWIG-2.0.2"
 
+       If you are building python bindings, point to the py3c directory as well:
+
+        > gen-make.py <other options> --with-swig="C:\Program Files\SWIG-2.0.2" \
+                                      --with-py3c="C:\SVN\py3c"
+
    4.  If you haven't already built Subversion, you should do so now.
        Instructions are in the main INSTALL file.
 
@@ -324,12 +378,12 @@ TESTING SWIG BINDINGS
 *  Perl
 
    The Perl bindings are using the standard module testing facilities
-   to do regression tests. Simply run 'make check-swig-pl' as described in 
+   to do regression tests. Simply run 'make check-swig-pl' as described in
    the install section.
 
 *  Ruby
 
-   To test the Ruby bindings, simply run `make check-swig-rb' as described 
+   To test the Ruby bindings, simply run `make check-swig-rb' as described
    in the install section.
 
 
@@ -361,7 +415,7 @@ USING SWIG BINDINGS
    sample/demo programs found in tools/examples/ in the Subversion
    source code tree.  Additionally, there are several third-party
    tools that make use of these bindings, including ViewVC
-   (http://viewvc.tigris.org/) and Trac (http://trac.edgewall.org/).
+   (http://www.viewvc.org/) and Trac (https://trac.edgewall.org/).
 
 *  Perl
 
diff --git a/subversion/bindings/swig/core.i b/subversion/bindings/swig/core.i
index 2689a93..e7222b8 100644
--- a/subversion/bindings/swig/core.i
+++ b/subversion/bindings/swig/core.i
@@ -362,7 +362,9 @@
     /* svn_config_get */
     const char *default_value,
     /* svn_config_read_auth_data */
-    const char *config_dir, 
+    const char *config_dir,
+    /* svn_config_get_user_config_path */
+    const char *fname,
     /* svn_diff_file_output_merge */
     const char *conflict_original,
     const char *conflict_modified,
@@ -381,6 +383,7 @@
     if (PyLong_Check($input)) {
         temp = PyLong_AsUnsignedLong($input);
     }
+%#if IS_PY3 != 1
     else if (PyInt_Check($input)) {
         /* wish there was a PyInt_AsUnsignedLong but there isn't
            the mask version doesn't do bounds checking for us.
@@ -389,6 +392,7 @@
            problem goes away because PyInt is gone anyway. */
         temp = PyInt_AsUnsignedLongMask($input);
     }
+%#endif
     else {
         PyErr_SetString(PyExc_TypeError,
                         "expecting an integer for the buffer size");
@@ -418,7 +422,7 @@
 
 #ifdef SWIGPYTHON
 %typemap(argout) (char *buffer, apr_size_t *len) {
-  %append_output(PyString_FromStringAndSize($1, *$2));
+  %append_output(PyBytes_FromStringAndSize($1, *$2));
   free($1);
 }
 #endif
@@ -440,13 +444,24 @@
 */
 #ifdef SWIGPYTHON
 %typemap(in) (const char *data, apr_size_t *len) ($*2_type temp) {
-    if (!PyString_Check($input)) {
+    Py_ssize_t length;
+    if (PyBytes_Check($input)) {
+        if (PyBytes_AsStringAndSize($input, (char **)&$1, &length) == -1) {
+            SWIG_fail;
+        }
+    }
+    else if (PyUnicode_Check($input)) {
+        $1 = (char *)PyStr_AsUTF8AndSize($input, &length);
+        if (PyErr_Occurred()) {
+            SWIG_fail;
+        }
+    }
+    else {
         PyErr_SetString(PyExc_TypeError,
-                        "expecting a string for the buffer");
+                        "expecting a bytes or str object for the buffer");
         SWIG_fail;
     }
-    $1 = PyString_AS_STRING($input);
-    temp = PyString_GET_SIZE($input);
+    temp = ($*2_type)length;
     $2 = ($2_ltype)&temp;
 }
 #endif
@@ -499,8 +514,8 @@
        SWIG_fail;
     }
 
-    if (PyString_Check($input)) {
-        char *value = PyString_AS_STRING($input);
+    if (PyBytes_Check($input)) {
+        const char *value = PyBytes_AsString($input);
         $1 = apr_pstrdup(_global_pool, value);
     }
     else if (PyLong_Check($input)) {
@@ -605,7 +620,7 @@
 */
 #ifdef SWIGPYTHON
 %typemap(in) FILE * {
-    $1 = PyFile_AsFile($input);
+    $1 = svn_swig_py_as_file($input);
     if ($1 == NULL) {
         PyErr_SetString(PyExc_ValueError, "Must pass in a valid file object");
         SWIG_fail;
@@ -710,11 +725,6 @@ core_set_current_pool (apr_pool_t *pool)
                   svn_swig_rb_config_section_enumerator)
 #endif
 
-/* Allow None to be passed as config_dir argument */
-#ifdef SWIGPYTHON
-%typemap(in,parse="z") const char *config_dir "";
-#endif
-
 /* -----------------------------------------------------------------------
   thunk the various authentication prompt functions.
   PERL NOTE: store the inputed SV in _global_callback for use in the
diff --git a/subversion/bindings/swig/include/proxy.py b/subversion/bindings/swig/include/proxy.py
index ca4a64d..73ff5ff 100644
--- a/subversion/bindings/swig/include/proxy.py
+++ b/subversion/bindings/swig/include/proxy.py
@@ -12,23 +12,57 @@
     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))
+  def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+    members = self.__dict__.get('_members')
+    if members is not None and name in members:
+      _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
     _assert_valid_deep(value)
 
     return value
 
+  # Attribute access must be intercepted to ensure that objects coming from
+  # read attribute access match those that are set with write attribute access.
+  # Specifically the metadata, such as the associated apr_pool object, should
+  # match the originally assigned object.
+  #
+  # For classic classes it is enough to use __getattr__ to intercept swig
+  # derived attributes. However, with new style classes SWIG makes use of
+  # descriptors which mean that __getattr__ is never called. Therefore,
+  # __getattribute__ must be used for the interception.
+
+  if _newclass:
+    def __getattribute__(self, name):
+      """Manage access to all attributes of this object."""
+
+      # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+      # items directly present in __dict__
+      mydict = object.__getattribute__(self, '__dict__')
+
+      if name == "__dict__":
+        return mydict
+
+      if name in mydict:
+        return mydict[name]
+
+      object.__getattribute__(self, 'assert_valid')()
+
+      value = _get_instance_attr(self, name)
+      fn = object.__getattribute__(self, '_retrieve_swig_value')
+      return fn(name, value)
+  else:
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      return self._retrieve_swig_value(name, value)
+
   def __setattr__(self, name, value):
     """Set an attribute on this object"""
     self.assert_valid()
@@ -38,4 +72,4 @@
     # SWIG-land
     self.__dict__.setdefault("_members",{})[name] = value
 
-    return _swig_setattr(self, self.__class__, name, value)
+    return _set_instance_attr(self, name, value)
diff --git a/subversion/bindings/swig/include/proxy.swg b/subversion/bindings/swig/include/proxy.swg
index 701ba77..ac67d43 100644
--- a/subversion/bindings/swig/include/proxy.swg
+++ b/subversion/bindings/swig/include/proxy.swg
@@ -36,8 +36,8 @@
     if value is None or old_value is None or value is old_value: return
     
     if isinstance(value, dict):
-      for k, v in value.iteritems():
-        _copy_metadata_deep(v, old_value[k])
+      for k in value:
+        _copy_metadata_deep(value[k], old_value[k])
     elif isinstance(value, list):
       for v, old_v in zip(value, old_value):
         _copy_metadata_deep(v, old_v)
@@ -50,15 +50,72 @@
   def _assert_valid_deep(value):
     """Assert value's validity, recursively traversing lists and dicts."""
     if isinstance(value, dict):
-      for v in value.itervalues():
-        _assert_valid_deep(v)
+      for k in value:
+        _assert_valid_deep(value[k])
     elif isinstance(value, list):
       for v in value:
         _assert_valid_deep(v)
-    else:
-      if hasattr(value, "assert_valid"):
-        value.assert_valid()
+    # Ensure that the passed in value isn't a type, which could have an
+    # assert_valid attribute, but it can not be called without an instance.
+    elif type(value) != type:
+      try:
+        fn = value.assert_valid
+      except AttributeError:
+        pass
+      else:
+        fn()
+
+%}
+#if defined(SWIGPYTHON_PY3)
+#if SWIG_VERSION >= 0x040000
+%pythoncode %{
+  # -classic and -modern options have been dropped and this variable
+  # is not generated since SWIG 4
+  _newclass = 1
+  _get_instance_attr = object.__getattribute__
+  _set_instance_attr = _swig_setattr_nondynamic_instance_variable(object.__setattr__)
+
+%}
+#else
+%pythoncode %{
+  # SWIG classes generated with -modern do not define this variable
+  try:
+    _newclass
+  except NameError:
+    _newclass = 1
+  else:
+    raise RuntimeError("Require -modern option, but _newclass is defined")
+
+  _get_instance_attr = object.__getattribute__
+  _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 %}
+#endif
+#else
+%pythoncode %{
+  # SWIG classes generated with -classic do not define this variable,
+  # so set it to 0 when it doesn't exist
+  try:
+    _newclass
+  except NameError:
+    _newclass = 0
+
+  if _newclass:
+    def _get_instance_attr(self, name):
+      try:
+        return object.__getattribute__(self, name)
+      except AttributeError:
+        return _swig_getattr(self, object.__getattribute__(self, '__class__'),
+                             name)
+  else:
+    def _get_instance_attr(self, name):
+      return _swig_getattr(self, self.__class__, name)
+
+  def _set_instance_attr(self, name, value):
+    return _swig_setattr(self, self.__class__, name, value)
+
+%}
+#endif
 
 /* Default code for all wrapped proxy classes in Python.
  * Inline the code from a separate file to avoid issues with
diff --git a/subversion/bindings/swig/include/proxy_apr.swg b/subversion/bindings/swig/include/proxy_apr.swg
index 60a8523..110d395 100644
--- a/subversion/bindings/swig/include/proxy_apr.swg
+++ b/subversion/bindings/swig/include/proxy_apr.swg
@@ -84,6 +84,7 @@ class GenericSWIGWrapper:
   def set_parent_pool(self, pool):
     """Set the parent pool of this object"""
     self._parent_pool = pool
+    self._is_valid = weakref.ref(pool._is_valid)
 
   def valid(self):
     """Is this object valid?"""
@@ -99,8 +100,14 @@ class GenericSWIGWrapper:
     return self.this
 
 def _mark_weakpool_invalid(weakpool):
-  if weakpool and weakpool() and hasattr(weakpool(), "_is_valid"):
-    del weakpool()._is_valid
+  if weakpool:
+    pool = weakpool()
+    if pool:
+      try:
+        del pool._is_valid
+      except AttributeError:
+        pass
+       
 
 %}
 
@@ -133,7 +140,11 @@ struct apr_pool_t {
       def valid(self):
         """Check whether this memory pool and its parents
         are still valid"""
-        return hasattr(self,"_is_valid")
+        try:
+          self._is_valid
+          return True
+        except AttributeError:
+          return False
 
       def assert_valid(self):
         """Assert that this memory_pool is still valid."""
@@ -164,10 +175,15 @@ struct apr_pool_t {
           self._svn_swig_py_clear_application_pool()
 
         # Mark self as invalid
-        if hasattr(self, "_parent_pool"):
+        try:
           del self._parent_pool
-        if hasattr(self, "_is_valid"):
+        except AttributeError:
+          pass
+
+        try:
           del self._is_valid
+        except AttributeError:
+          pass
 
       def __del__(self):
         """Automatically destroy memory pools, if necessary"""
@@ -200,8 +216,11 @@ struct apr_pool_t {
       def _wrap(self, obj):
         """Mark a SWIG object as owned by this pool"""
         self.assert_valid()
-        if hasattr(obj, "set_parent_pool"):
-          obj.set_parent_pool(self)
+        
+        fn = getattr(obj, 'set_parent_pool', None)
+
+        if fn is not None:
+          fn(self)
           return obj
         elif obj is None:
           return None
diff --git a/subversion/bindings/swig/include/svn_containers.swg b/subversion/bindings/swig/include/svn_containers.swg
index e2eeaa9..d3c6305 100644
--- a/subversion/bindings/swig/include/svn_containers.swg
+++ b/subversion/bindings/swig/include/svn_containers.swg
@@ -527,7 +527,10 @@
   apr_array_header_t **logfiles,
   apr_array_header_t **names_p,
   apr_array_header_t **targets_p,
-  apr_array_header_t **args_p
+  apr_array_header_t **args_p,
+  apr_array_header_t **props_conflicted,
+  apr_array_header_t **possible_moved_to_repos_relpaths,
+  apr_array_header_t **possible_moved_to_abspaths
 };
 
 /* -----------------------------------------------------------------------
@@ -577,6 +580,40 @@
 }
 #endif
 
+/* -----------------------------------------------------------------------
+   apr_array_header_t **options
+   For svn_client_conflict_option_t
+*/
+
+#ifdef SWIGPYTHON
+%typemap(argout) apr_array_header_t **options {
+  %append_output
+    (svn_swig_py_pointerlist_to_list(*$1,
+                                     $descriptor(svn_client_conflict_option_t *),
+                                     _global_py_pool));
+  if (PyErr_Occurred()) {
+    SWIG_fail;
+  }
+}
+#endif
+
+/* -----------------------------------------------------------------------
+   apr_array_header_t **versions_p
+   For svn_client__shelf_get_all_versions
+*/
+
+#ifdef SWIGPYTHON
+%typemap(argout) apr_array_header_t **versions_p {
+  %append_output
+    (svn_swig_py_pointerlist_to_list(*$1,
+                                     $descriptor(svn_client__shelf_version_t *),
+                                     _global_py_pool));
+  if (PyErr_Occurred()) {
+    SWIG_fail;
+  }
+}
+#endif
+
 /* =======================================================================
    %typemap(in) apr_array_header_t *
 */
diff --git a/subversion/bindings/swig/include/svn_global.swg b/subversion/bindings/swig/include/svn_global.swg
index fde37ff..57b1e23 100644
--- a/subversion/bindings/swig/include/svn_global.swg
+++ b/subversion/bindings/swig/include/svn_global.swg
@@ -31,6 +31,12 @@
 #define SVN_DEPRECATED
 #endif
 
+#ifdef SWIGPYTHON
+%begin %{
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+%}
+#endif
+
 %include typemaps.i
 %include constraints.i
 %include exception.i
@@ -54,6 +60,7 @@
 #ifdef SWIGPYTHON
 %{
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 %}
 #endif
 #ifdef SWIGPERL
@@ -135,9 +142,8 @@ static PyObject * _global_py_pool = NULL;
 /* Python format specifiers. Use Python instead of SWIG to parse
    these basic types, because Python reports better error messages
    (with correct argument numbers). */
-%typemap (in, parse="s")
-  char *, char const *, char * const, char const * const "";
 %typemap (in, parse="c") char "";
+
 %typemap (in, fragment=SWIG_As_frag(long)) long
 {
   $1 = ($1_ltype)SWIG_As(long)($input);
diff --git a/subversion/bindings/swig/include/svn_string.swg b/subversion/bindings/swig/include/svn_string.swg
index 9fb2dac..8be4c3d 100644
--- a/subversion/bindings/swig/include/svn_string.swg
+++ b/subversion/bindings/swig/include/svn_string.swg
@@ -36,9 +36,8 @@ typedef struct svn_string_t svn_string_t;
     if (*$1 == NULL) {
         Py_INCREF(Py_None);
         s = Py_None;
-    }
-    else {
-        s = PyString_FromStringAndSize((*$1)->data, (*$1)->len);
+    } else {
+        s = PyBytes_FromStringAndSize((*$1)->data, (*$1)->len);
         if (s == NULL)
             SWIG_fail;
     }
@@ -75,14 +74,20 @@ typedef struct svn_string_t svn_string_t;
 
 #ifdef SWIGPYTHON
 %typemap(in) svn_stringbuf_t * {
-    if (!PyString_Check($input)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+    if (!PyBytes_Check($input)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
     }
-    $1 = svn_stringbuf_ncreate(PyString_AS_STRING($input),
-                               PyString_GET_SIZE($input),
-                               /* ### gah... what pool to use? */
-                               _global_pool);
+    {
+      Py_ssize_t strBufLen;
+      char *strBufChar;
+      if (-1 == PyBytes_AsStringAndSize($input, &strBufChar, &strBufLen)) {
+        SWIG_fail;
+      }
+      $1 = svn_stringbuf_ncreate(strBufChar, strBufLen,
+                                 /* ### gah... what pool to use? */
+                                 _global_pool);
+    }
 }
 #endif
 
@@ -139,7 +144,7 @@ typedef struct svn_string_t svn_string_t;
 
 #ifdef SWIGPYTHON
 %typemap(out) svn_stringbuf_t * {
-    $result = PyString_FromStringAndSize($1->data, $1->len);
+    $result = PyBytes_FromStringAndSize($1->data, (Py_ssize_t)($1->len));
 }
 #endif
 
@@ -174,12 +179,16 @@ typedef struct svn_string_t svn_string_t;
     if ($input == Py_None)
         $1 = NULL;
     else {
-        if (!PyString_Check($input)) {
-            PyErr_SetString(PyExc_TypeError, "not a string");
+        Py_ssize_t pyStrLen;
+        if (!PyBytes_Check($input)) {
+            PyErr_SetString(PyExc_TypeError, "not a bytes object");
+            SWIG_fail;
+        }
+        if (PyBytes_AsStringAndSize($input, (char **)&(value.data),
+                                    &pyStrLen) == -1) {
             SWIG_fail;
         }
-        value.data = PyString_AS_STRING($input);
-        value.len = PyString_GET_SIZE($input);
+        value.len = pyStrLen;
         $1 = &value;
     }
 }
@@ -223,7 +232,7 @@ typedef struct svn_string_t svn_string_t;
 
 #ifdef SWIGPYTHON
 %typemap(out) svn_string_t * {
-    $result = PyString_FromStringAndSize($1->data, $1->len);
+    $result = PyBytes_FromStringAndSize($1->data, $1->len);
 }
 #endif
 #ifdef SWIGPERL
@@ -242,6 +251,26 @@ typedef struct svn_string_t svn_string_t;
 }
 #endif
 
+ /* -----------------------------------------------------------------------
+   Type: char * (input)
+*/
+#ifdef SWIGPYTHON
+%typemap (in) IN_STRING
+{
+    $1 = svn_swig_py_string_to_cstring($input, FALSE, "$symname", "$1_name");
+    if (PyErr_Occurred()) SWIG_fail;
+}
+
+%typemap (freearg) IN_STRING "";
+
+%apply IN_STRING {
+    const char *,
+    char *,
+    char const *,
+    char * const,
+    char const * const
+};
+#endif
 /* -----------------------------------------------------------------------
    define a way to return a 'const char *'
 */
@@ -253,7 +282,7 @@ typedef struct svn_string_t svn_string_t;
         s = Py_None;
     }
     else {
-        s = PyString_FromString(*$1);
+        s = PyBytes_FromString(*$1);
         if (s == NULL)
             SWIG_fail;
     }
@@ -283,4 +312,8 @@ typedef struct svn_string_t svn_string_t;
 #endif
 
 /* svn_wc_get_ancestry() lacks a 'const' */
-%apply const char **OUTPUT { const char **, char **url };
+%apply const char **OUTPUT {
+  const char **,
+  char **url,
+  char **log_message
+};
diff --git a/subversion/bindings/swig/include/svn_swigcompat.swg b/subversion/bindings/swig/include/svn_swigcompat.swg
index bd29c8a..8edb513 100644
--- a/subversion/bindings/swig/include/svn_swigcompat.swg
+++ b/subversion/bindings/swig/include/svn_swigcompat.swg
@@ -45,7 +45,7 @@
 #if SWIG_VERSION <= 0x010327
 #ifdef SWIGPYTHON
 %define %set_constant(name, value)
-PyDict_SetItemString(d, name, value);
+PyDict_SetItem(d, PyBytes_FromString(name), value);
 %enddef
 #endif
 #endif
diff --git a/subversion/bindings/swig/include/svn_types.swg b/subversion/bindings/swig/include/svn_types.swg
index ad66cb1..7c933b1 100644
--- a/subversion/bindings/swig/include/svn_types.swg
+++ b/subversion/bindings/swig/include/svn_types.swg
@@ -93,6 +93,7 @@
 %apply SWIGTYPE **OUTPARAM {
   /* apr */
   apr_file_t **,
+  apr_hash_t **,
   /* svn_types.h */
   svn_commit_info_t **,
   svn_dirent_t **,
@@ -116,10 +117,16 @@
   void **credentials,
   void **iter_baton,
   void **token,
+  /* svn_checksum */
+  svn_checksum_t **,
   /* svn_client */
   svn_client_commit_info_t **,
+  svn_client_conflict_t **,
+  svn_client_conflict_option_t **,
   svn_client_ctx_t **,
   const svn_client_commit_item3_t **,
+  svn_client__shelf_t **,
+  svn_client__shelf_version_t **,
   /* svn_delta */
   const svn_delta_editor_t **,
   svn_txdelta_stream_t **,
@@ -129,6 +136,7 @@
   svn_txdelta_window_handler_t *,
 #endif
   void **handler_baton,
+  void **handler2_baton,
   void **root_baton,
   void **child_baton,
   void **file_baton,
@@ -142,6 +150,9 @@
   svn_fs_root_t **,
   svn_fs_txn_t **,
   void **contents_baton_p,
+  /* svn_io */
+  svn_io_dirent2_t **,
+  svn_stream_mark_t **,
   /* svn_ra */
   svn_ra_callbacks2_t **,
   svn_ra_plugin_t **,
@@ -335,7 +346,11 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
    Create a typemap for specifying string args that may be NULL.
 */
 #ifdef SWIGPYTHON
-%typemap(in, parse="z") const char *MAY_BE_NULL "";
+%typemap(in) const char *MAY_BE_NULL
+{
+    $1 = svn_swig_py_string_to_cstring($input, TRUE, "$symname", "$1_name");
+    if (PyErr_Occurred()) SWIG_fail;
+}
 #endif
 
 #ifdef SWIGPERL
@@ -464,12 +479,15 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 */
 #ifdef SWIGPYTHON
 %typemap(in) (const char *PTR, apr_size_t LEN) {
-    if (!PyString_Check($input)) {
-        PyErr_SetString(PyExc_TypeError, "expecting a string");
+    Py_ssize_t pyStrLen;
+    if (!PyBytes_Check($input)) {
+        PyErr_SetString(PyExc_TypeError, "expecting a bytes");
+        SWIG_fail;
+    }
+    if (PyBytes_AsStringAndSize($input, &$1, &pyStrLen) == -1) {
         SWIG_fail;
     }
-    $1 = PyString_AS_STRING($input);
-    $2 = PyString_GET_SIZE($input);
+    $2 = pyStrLen;
 }
 #endif
 
@@ -1102,7 +1120,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 #ifdef SWIGPYTHON
 %typemap(argout) unsigned char digest[ANY]
 {
-  %append_output(PyString_FromStringAndSize((char *)$1, APR_MD5_DIGESTSIZE));
+  %append_output(PyBytes_FromStringAndSize((const char *)$1, APR_MD5_DIGESTSIZE));
 }
 #endif
 
@@ -1175,7 +1193,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
     if ($input == Py_None) {
         $1 = NULL;
     } else {
-        $1 = (unsigned char *) PyString_AsString($input);
+        $1 = (unsigned char *) PyBytes_AsString($input);
         if ($1 == NULL) SWIG_fail;
     }
 }
diff --git a/subversion/bindings/swig/perl/native/core.c b/subversion/bindings/swig/perl/native/core.c
index 0390652..c919a0d 100644
--- a/subversion/bindings/swig/perl/native/core.c
+++ b/subversion/bindings/swig/perl/native/core.c
@@ -5913,7 +5913,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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = (result) ? svn_swig_pl_convert_hash(result, SWIGTYPE_p_svn_log_changed_path2_t)
+      /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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@*/
       
@@ -18758,7 +18758,7 @@ XS(_wrap_svn_auth_get_platform_specific_client_providers) {
       }
     }
     {
-      /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+      /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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@*/
       ;
@@ -27241,13 +27241,7 @@ XS(_wrap_svn_mergeinfo_parse) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_parse arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_parse is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -27343,22 +27337,10 @@ XS(_wrap_svn_mergeinfo_diff2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_diff2 arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_diff2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_diff2 arg 2 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_diff2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -27454,22 +27436,10 @@ XS(_wrap_svn_mergeinfo_diff) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_diff arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_diff is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_diff arg 2 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_diff is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -27714,13 +27684,7 @@ XS(_wrap_svn_mergeinfo_remove) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_remove arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_remove is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -27815,13 +27779,7 @@ XS(_wrap_svn_mergeinfo_remove2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_remove2 arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_remove2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -28205,13 +28163,7 @@ XS(_wrap_svn_mergeinfo_intersect2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_intersect2 arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_intersect2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -28294,13 +28246,7 @@ XS(_wrap_svn_mergeinfo_intersect) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_intersect arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_intersect is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -28790,13 +28736,7 @@ XS(_wrap_svn_mergeinfo_inheritable2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_inheritable2 arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_inheritable2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -28900,13 +28840,7 @@ XS(_wrap_svn_mergeinfo_inheritable) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_mergeinfo_inheritable arg 1 (svn_mergeinfo_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_mergeinfo_inheritable is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -30517,13 +30451,7 @@ XS(_wrap_svn_io_file_checksum2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_io_file_checksum2 arg 1 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_io_file_checksum2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -30595,7 +30523,7 @@ XS(_wrap_svn_io_file_checksum) {
       }
     }
     {
-      /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
+      /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
             _global_pool),
           0)); argvi++ /*@SWIG@*/
       
@@ -32408,22 +32336,10 @@ XS(_wrap_svn_stream_checksummed2) {
       argvi++;
     }
     {
-      /* FIXME: Missing argout typemap: svn_stream_checksummed2 arg 2 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_stream_checksummed2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     {
-      /* FIXME: Missing argout typemap: svn_stream_checksummed2 arg 3 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_stream_checksummed2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg3, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     
@@ -32511,13 +32427,7 @@ XS(_wrap_svn_stream_contents_checksum) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_stream_contents_checksum arg 1 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_stream_contents_checksum is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     
@@ -33078,13 +32988,7 @@ XS(_wrap_svn_stream_mark) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_stream_mark arg 2 (svn_stream_mark_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_stream_mark is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_svn_stream_mark_t, 0); argvi++  ;
     }
     
     
@@ -34546,13 +34450,7 @@ XS(_wrap_svn_io_stat_dirent2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_io_stat_dirent2 arg 1 (svn_io_dirent2_t const **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_io_stat_dirent2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_io_dirent2_t, 0); argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -34644,13 +34542,7 @@ XS(_wrap_svn_io_stat_dirent) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_io_stat_dirent arg 1 (svn_io_dirent2_t const **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_io_stat_dirent is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_io_dirent2_t, 0); argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -35453,13 +35345,7 @@ XS(_wrap_svn_io_parse_mimetypes_file) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_io_parse_mimetypes_file arg 1 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_io_parse_mimetypes_file is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -37116,13 +37002,7 @@ XS(_wrap_svn_stream_invoke_mark_fn) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_stream_invoke_mark_fn arg 3 (svn_stream_mark_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_stream_invoke_mark_fn is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg3, SWIGTYPE_p_svn_stream_mark_t, 0); argvi++  ;
     }
     
     
@@ -38125,13 +38005,7 @@ XS(_wrap_svn_checksum_deserialize) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_checksum_deserialize arg 1 (svn_checksum_t const **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_checksum_deserialize is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -38211,13 +38085,7 @@ XS(_wrap_svn_checksum_parse_hex) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_checksum_parse_hex arg 1 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_checksum_parse_hex is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     
@@ -38302,13 +38170,7 @@ XS(_wrap_svn_checksum) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_checksum arg 1 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_checksum is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     
@@ -38587,13 +38449,7 @@ XS(_wrap_svn_checksum_final) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_checksum_final arg 1 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_checksum_final is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     
@@ -51325,3072 +51181,3082 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_PROPERTY_VALUE_EOL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_PROPERTY_VALUE_EOL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CORRUPT_PROPLIST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CORRUPT_PROPLIST)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_SHARING_NOT_ALLOWED", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_SHARING_NOT_ALLOWED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_ROLLBACK_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_ROLLBACK_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_LZ4_COMPRESSION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_LZ4_COMPRESSION_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_LZ4_DECOMPRESSION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_LZ4_DECOMPRESSION_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CANONICALIZATION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CANONICALIZATION_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_REQUEST_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_REQUEST_SIZE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_RESPONSE_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_RESPONSE_SIZE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DIFF_UNEXPECTED_DATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DIFF_UNEXPECTED_DATA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_STREAM_BUCKET_READ_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_STREAM_BUCKET_READ_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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)(13)));
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(14)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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(" (r1867053)"));
+    sv_setsv(sv, SWIG_FromCharPtr(" (r1876290)"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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)(1867053)));
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1876290)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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.13.0"));
+    sv_setsv(sv, SWIG_FromCharPtr("1.14.0"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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.13.0"));
+    sv_setsv(sv, SWIG_FromCharPtr("1.14.0"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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.13.0 (r1867053)"));
+    sv_setsv(sv, SWIG_FromCharPtr("1.14.0 (r1876290)"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_PARAGRAPHS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(100)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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 [Tt]humbs.db"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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 [Tt]humbs.db"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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);
diff --git a/subversion/bindings/swig/perl/native/svn_client.c b/subversion/bindings/swig/perl/native/svn_client.c
index 9ae8488..8f20e91 100644
--- a/subversion/bindings/swig/perl/native/svn_client.c
+++ b/subversion/bindings/swig/perl/native/svn_client.c
@@ -1547,162 +1547,154 @@ SWIG_Perl_SetModule(swig_module_info *module) {
 #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[35]
 #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[36]
 #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[37]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[40]
-#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[41]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[42]
-#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[43]
-#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[44]
-#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_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_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[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_hash_t swig_types[51]
-#define SWIGTYPE_p_p_char swig_types[52]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[53]
-#define SWIGTYPE_p_p_svn_client__shelf_t swig_types[54]
-#define SWIGTYPE_p_p_svn_client__shelf_version_t swig_types[55]
-#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[56]
-#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[57]
-#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[58]
-#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[59]
-#define SWIGTYPE_p_p_svn_commit_info_t swig_types[60]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[61]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[62]
-#define SWIGTYPE_p_p_svn_string_t swig_types[63]
-#define SWIGTYPE_p_p_void swig_types[64]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[65]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[66]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[67]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[68]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[69]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[70]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[71]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[72]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[73]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[74]
-#define SWIGTYPE_p_svn_cache_config_t swig_types[75]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[76]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[77]
-#define SWIGTYPE_p_svn_checksum_t swig_types[78]
-#define SWIGTYPE_p_svn_client__shelf_info_t swig_types[79]
-#define SWIGTYPE_p_svn_client__shelf_t swig_types[80]
-#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[81]
-#define SWIGTYPE_p_svn_client_commit_info_t swig_types[82]
-#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[83]
-#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[84]
-#define SWIGTYPE_p_svn_client_commit_item_t swig_types[85]
-#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[86]
-#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[87]
-#define SWIGTYPE_p_svn_client_conflict_t swig_types[88]
-#define SWIGTYPE_p_svn_client_copy_source_t swig_types[89]
-#define SWIGTYPE_p_svn_client_ctx_t swig_types[90]
-#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[91]
-#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[92]
-#define SWIGTYPE_p_svn_client_info2_t swig_types[93]
-#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[94]
-#define SWIGTYPE_p_svn_client_status_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_delta_editor_t swig_types[98]
-#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[99]
-#define SWIGTYPE_p_svn_depth_t swig_types[100]
-#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[101]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[102]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[103]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[104]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[105]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[106]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[107]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[108]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[109]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[110]
-#define SWIGTYPE_p_svn_diff_t swig_types[111]
-#define SWIGTYPE_p_svn_dirent_t swig_types[112]
-#define SWIGTYPE_p_svn_errno_t swig_types[113]
-#define SWIGTYPE_p_svn_error_t swig_types[114]
-#define SWIGTYPE_p_svn_info_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_desc3_t swig_types[131]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[132]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[133]
-#define SWIGTYPE_p_svn_patch_t swig_types[134]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[135]
-#define SWIGTYPE_p_svn_prop_kind swig_types[136]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[137]
-#define SWIGTYPE_p_svn_prop_t swig_types[138]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[139]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[140]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[141]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[142]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[143]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[144]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[145]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[146]
-#define SWIGTYPE_p_svn_stream_t swig_types[147]
-#define SWIGTYPE_p_svn_string_t swig_types[148]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[149]
-#define SWIGTYPE_p_svn_tristate_t swig_types[150]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[151]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[152]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[153]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[154]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[155]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[156]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[157]
-#define SWIGTYPE_p_svn_version_t swig_types[158]
-#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[159]
-#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[160]
-#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[161]
-#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[162]
-#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[163]
-#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[164]
-#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[165]
-#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[166]
-#define SWIGTYPE_p_svn_wc_context_t swig_types[167]
-#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[168]
-#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[169]
-#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[170]
-#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[171]
-#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[172]
-#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[173]
-#define SWIGTYPE_p_svn_wc_entry_t swig_types[174]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[175]
-#define SWIGTYPE_p_svn_wc_external_item_t swig_types[176]
-#define SWIGTYPE_p_svn_wc_info_t swig_types[177]
-#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[178]
-#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[179]
-#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[180]
-#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[181]
-#define SWIGTYPE_p_svn_wc_notify_t swig_types[182]
-#define SWIGTYPE_p_svn_wc_operation_t swig_types[183]
-#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[184]
-#define SWIGTYPE_p_svn_wc_schedule_t swig_types[185]
-#define SWIGTYPE_p_svn_wc_status2_t swig_types[186]
-#define SWIGTYPE_p_svn_wc_status3_t swig_types[187]
-#define SWIGTYPE_p_svn_wc_status_t swig_types[188]
-#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[189]
-#define SWIGTYPE_p_unsigned_long swig_types[190]
-#define SWIGTYPE_p_void swig_types[191]
-static swig_type_info *swig_types[193];
-static swig_module_info swig_module = {swig_types, 192, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[39]
+#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[40]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[41]
+#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[42]
+#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[43]
+#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_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_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[46]
+#define SWIGTYPE_p_int swig_types[47]
+#define SWIGTYPE_p_long swig_types[48]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[49]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[50]
+#define SWIGTYPE_p_p_char swig_types[51]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[52]
+#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[53]
+#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[54]
+#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[55]
+#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[56]
+#define SWIGTYPE_p_p_svn_commit_info_t swig_types[57]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[58]
+#define SWIGTYPE_p_p_svn_string_t swig_types[59]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[60]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[61]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[62]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[63]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[64]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[65]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[66]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[67]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[68]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[69]
+#define SWIGTYPE_p_svn_cache_config_t swig_types[70]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[71]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[72]
+#define SWIGTYPE_p_svn_checksum_t swig_types[73]
+#define SWIGTYPE_p_svn_client_commit_info_t swig_types[74]
+#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[75]
+#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[76]
+#define SWIGTYPE_p_svn_client_commit_item_t swig_types[77]
+#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[78]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[79]
+#define SWIGTYPE_p_svn_client_conflict_t swig_types[80]
+#define SWIGTYPE_p_svn_client_copy_source_t swig_types[81]
+#define SWIGTYPE_p_svn_client_ctx_t swig_types[82]
+#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[83]
+#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[84]
+#define SWIGTYPE_p_svn_client_info2_t swig_types[85]
+#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[86]
+#define SWIGTYPE_p_svn_client_status_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_delta_path_driver_state_t swig_types[91]
+#define SWIGTYPE_p_svn_depth_t swig_types[92]
+#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[93]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[94]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[95]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[96]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[97]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[98]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[99]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[100]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[101]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[102]
+#define SWIGTYPE_p_svn_diff_t swig_types[103]
+#define SWIGTYPE_p_svn_dirent_t swig_types[104]
+#define SWIGTYPE_p_svn_errno_t swig_types[105]
+#define SWIGTYPE_p_svn_error_t swig_types[106]
+#define SWIGTYPE_p_svn_info_t swig_types[107]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[108]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[109]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[110]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[111]
+#define SWIGTYPE_p_svn_lock_t swig_types[112]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[113]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[114]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[115]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[116]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[117]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[118]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[119]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[120]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[121]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[122]
+#define SWIGTYPE_p_svn_opt_subcommand_desc3_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_prop_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_svn_wc_adm_access_t swig_types[151]
+#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[152]
+#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[153]
+#define SWIGTYPE_p_svn_wc_conflict_choice_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_version_t swig_types[158]
+#define SWIGTYPE_p_svn_wc_context_t swig_types[159]
+#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[160]
+#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[161]
+#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[162]
+#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[163]
+#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[164]
+#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[165]
+#define SWIGTYPE_p_svn_wc_entry_t swig_types[166]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[167]
+#define SWIGTYPE_p_svn_wc_external_item_t swig_types[168]
+#define SWIGTYPE_p_svn_wc_info_t swig_types[169]
+#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[170]
+#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[171]
+#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[172]
+#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[173]
+#define SWIGTYPE_p_svn_wc_notify_t swig_types[174]
+#define SWIGTYPE_p_svn_wc_operation_t swig_types[175]
+#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[176]
+#define SWIGTYPE_p_svn_wc_schedule_t swig_types[177]
+#define SWIGTYPE_p_svn_wc_status2_t swig_types[178]
+#define SWIGTYPE_p_svn_wc_status3_t swig_types[179]
+#define SWIGTYPE_p_svn_wc_status_t swig_types[180]
+#define SWIGTYPE_p_svn_wc_traversal_info_t 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 SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -22393,13 +22385,7 @@ XS(_wrap_svn_client_mergeinfo_get_merged) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_client_mergeinfo_get_merged arg 1 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client_mergeinfo_get_merged is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -24088,13 +24074,7 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 arg 1 (apr_array_header_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_array_to_list(*arg1); argvi++  ;
     }
     
     
@@ -24173,13 +24153,7 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates arg 1 (apr_array_header_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_array_to_list(*arg1); argvi++  ;
     }
     
     
@@ -24420,13 +24394,7 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates2 arg 1 (apr_array_header_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_array_to_list(*arg1); argvi++  ;
     }
     
     
@@ -24505,13 +24473,7 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates arg 1 (apr_array_header_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_array_to_list(*arg1); argvi++  ;
     }
     
     
@@ -24804,13 +24766,7 @@ XS(_wrap_svn_client_conflict_get) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_client_conflict_get arg 1 (svn_client_conflict_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client_conflict_get is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_conflict_t, 0); argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -25004,13 +24960,7 @@ XS(_wrap_svn_client_conflict_get_conflicted) {
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++  ;
     }
     {
-      /* FIXME: Missing argout typemap: svn_client_conflict_get_conflicted arg 2 (apr_array_header_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client_conflict_get_conflicted is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_array_to_list(*arg2); argvi++  ;
     }
     if (SWIG_IsTmpObj(res3)) {
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((*arg3)); argvi++  ;
@@ -31372,7 +31322,7 @@ XS(_wrap_svn_client_proplist2) {
       }
     }
     {
-      /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+      /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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@*/
       ;
@@ -31483,7 +31433,7 @@ XS(_wrap_svn_client_proplist) {
       }
     }
     {
-      /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+      /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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@*/
       ;
@@ -33704,2980 +33654,6 @@ XS(_wrap_svn_client_cat) {
 }
 
 
-XS(_wrap_svn_client__shelf_t_name_set) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t_name_set(self,name);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_name_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_t_name_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->name) free((char *)arg1->name);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->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_client__shelf_t_name_get) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_t_name_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_name_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    result = (char *) ((arg1)->name);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_max_version_set) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t_max_version_set(self,max_version);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_max_version_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_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_client__shelf_t_max_version_set" "', argument " "2"" of type '" "int""'");
-    } 
-    arg2 = (int)(val2);
-    if (arg1) (arg1)->max_version = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_max_version_get) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    int result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_t_max_version_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_max_version_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    result = (int) ((arg1)->max_version);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_wc_root_abspath_set) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t_wc_root_abspath_set(self,wc_root_abspath);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_wc_root_abspath_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_t_wc_root_abspath_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->wc_root_abspath) free((char *)arg1->wc_root_abspath);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->wc_root_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_client__shelf_t_wc_root_abspath_get) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_t_wc_root_abspath_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_wc_root_abspath_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    result = (char *) ((arg1)->wc_root_abspath);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_shelves_dir_set) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t_shelves_dir_set(self,shelves_dir);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_shelves_dir_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_t_shelves_dir_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->shelves_dir) free((char *)arg1->shelves_dir);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->shelves_dir = 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_client__shelf_t_shelves_dir_get) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_t_shelves_dir_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_shelves_dir_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    result = (char *) ((arg1)->shelves_dir);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_revprops_set) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    apr_hash_t *arg2 = (apr_hash_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    apr_pool_t *_global_pool = NULL ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_client__shelf_t_revprops_set(self,revprops);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_revprops_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    {
-      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;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_revprops_get) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    apr_hash_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_t_revprops_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_revprops_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    result = (apr_hash_t *) ((arg1)->revprops);
-    {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_prophash_to_hash(result); argvi++  ;
-    }
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_ctx_set) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    svn_client_ctx_t *arg2 = (svn_client_ctx_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_client__shelf_t_ctx_set(self,ctx);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_ctx_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_client_ctx_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_t_ctx_set" "', argument " "2"" of type '" "svn_client_ctx_t *""'"); 
-    }
-    arg2 = (svn_client_ctx_t *)(argp2);
-    if (arg1) (arg1)->ctx = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_ctx_get) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_client_ctx_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_t_ctx_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_ctx_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    result = (svn_client_ctx_t *) ((arg1)->ctx);
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client_ctx_t, 0 | SWIG_SHADOW); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_pool_set) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    apr_pool_t *arg2 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    {
-      _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
-      SPAGAIN;
-    }
-    if ((items < 1) || (items > 2)) {
-      SWIG_croak("Usage: svn_client__shelf_t_pool_set(self,pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_pool_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    if (items > 1) {
-      
-    }
-    if (arg1) (arg1)->pool = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_t_pool_get) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    apr_pool_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_t_pool_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_pool_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    result = (apr_pool_t *) ((arg1)->pool);
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_pool_t, 0 | 0); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_new_svn_client__shelf_t) {
-  {
-    int argvi = 0;
-    struct svn_client__shelf_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 0) || (items > 0)) {
-      SWIG_croak("Usage: new_svn_client__shelf_t();");
-    }
-    {
-      result = (struct svn_client__shelf_t *)calloc(1, sizeof(struct svn_client__shelf_t));
-      
-      
-      
-    }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
-    XSRETURN(argvi);
-  fail:
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_delete_svn_client__shelf_t) {
-  {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: delete_svn_client__shelf_t(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_client__shelf_t" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_t *)(argp1);
-    {
-      free((char *) arg1);
-      
-      
-      
-    }
-    ST(argvi) = sv_newmortal();
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_t_shelf_set) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-    svn_client__shelf_t *arg2 = (svn_client__shelf_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_client__shelf_version_t_shelf_set(self,shelf);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_shelf_set" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_t *)(argp1);
-    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_client__shelf_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_version_t_shelf_set" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_t *)(argp2);
-    if (arg1) (arg1)->shelf = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_t_shelf_get) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_client__shelf_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_version_t_shelf_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_shelf_get" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_t *)(argp1);
-    result = (svn_client__shelf_t *) ((arg1)->shelf);
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_t, 0 | SWIG_SHADOW); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_t_mtime_set) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-    apr_time_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    long long val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_client__shelf_version_t_mtime_set(self,mtime);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_mtime_set" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_t *)(argp1);
-    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_client__shelf_version_t_mtime_set" "', argument " "2"" of type '" "apr_time_t""'");
-    } 
-    arg2 = (apr_time_t)(val2);
-    if (arg1) (arg1)->mtime = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_t_mtime_get) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    apr_time_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_version_t_mtime_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_mtime_get" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_t *)(argp1);
-    result =  ((arg1)->mtime);
-    {
-      char temp[30];
-      sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
-    }
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_t_files_dir_abspath_set) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_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_client__shelf_version_t_files_dir_abspath_set(self,files_dir_abspath);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_files_dir_abspath_set" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_version_t_files_dir_abspath_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->files_dir_abspath) free((char *)arg1->files_dir_abspath);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->files_dir_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_client__shelf_version_t_files_dir_abspath_get) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_version_t_files_dir_abspath_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_files_dir_abspath_get" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_t *)(argp1);
-    result = (char *) ((arg1)->files_dir_abspath);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_t_version_number_set) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_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_client__shelf_version_t_version_number_set(self,version_number);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_version_number_set" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_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_client__shelf_version_t_version_number_set" "', argument " "2"" of type '" "int""'");
-    } 
-    arg2 = (int)(val2);
-    if (arg1) (arg1)->version_number = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_t_version_number_get) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    int result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_version_t_version_number_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_version_number_get" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_t *)(argp1);
-    result = (int) ((arg1)->version_number);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_new_svn_client__shelf_version_t) {
-  {
-    int argvi = 0;
-    struct svn_client__shelf_version_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 0) || (items > 0)) {
-      SWIG_croak("Usage: new_svn_client__shelf_version_t();");
-    }
-    {
-      result = (struct svn_client__shelf_version_t *)calloc(1, sizeof(struct svn_client__shelf_version_t));
-      
-      
-      
-    }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_version_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
-    XSRETURN(argvi);
-  fail:
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_delete_svn_client__shelf_version_t) {
-  {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: delete_svn_client__shelf_version_t(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_client__shelf_version_t" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_version_t *)(argp1);
-    {
-      free((char *) arg1);
-      
-      
-      
-    }
-    ST(argvi) = sv_newmortal();
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_open_or_create) {
-  {
-    svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ;
-    char *arg2 = (char *) 0 ;
-    char *arg3 = (char *) 0 ;
-    svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ;
-    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    svn_client__shelf_t *temp1 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int res3 ;
-    char *buf3 = 0 ;
-    int alloc3 = 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;
-    }
-    arg1 = &temp1;
-    if ((items < 3) || (items > 4)) {
-      SWIG_croak("Usage: svn_client__shelf_open_or_create(name,local_abspath,ctx,result_pool);");
-    }
-    res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_open_or_create" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_open_or_create" "', argument " "3"" of type '" "char const *""'");
-    }
-    arg3 = (char *)(buf3);
-    res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client__shelf_open_or_create" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); 
-    }
-    arg4 = (svn_client_ctx_t *)(argp4);
-    if (items > 3) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_open_or_create(arg1,(char const *)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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_open_or_create arg 1 (svn_client__shelf_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_or_create is not implemented yet");
-      
-    }
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_open_existing) {
-  {
-    svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ;
-    char *arg2 = (char *) 0 ;
-    char *arg3 = (char *) 0 ;
-    svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ;
-    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    svn_client__shelf_t *temp1 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int res3 ;
-    char *buf3 = 0 ;
-    int alloc3 = 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;
-    }
-    arg1 = &temp1;
-    if ((items < 3) || (items > 4)) {
-      SWIG_croak("Usage: svn_client__shelf_open_existing(name,local_abspath,ctx,result_pool);");
-    }
-    res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_open_existing" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_open_existing" "', argument " "3"" of type '" "char const *""'");
-    }
-    arg3 = (char *)(buf3);
-    res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client__shelf_open_existing" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); 
-    }
-    arg4 = (svn_client_ctx_t *)(argp4);
-    if (items > 3) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_open_existing(arg1,(char const *)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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_open_existing arg 1 (svn_client__shelf_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_existing is not implemented yet");
-      
-    }
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_close) {
-  {
-    svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-    apr_pool_t *arg2 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    void *argp1 = 0 ;
-    int res1 = 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_client__shelf_close(shelf,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_close" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_t *)(argp1);
-    if (items > 1) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_close(arg1,arg2);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_delete) {
-  {
-    char *arg1 = (char *) 0 ;
-    char *arg2 = (char *) 0 ;
-    svn_boolean_t arg3 ;
-    svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ;
-    apr_pool_t *arg5 = (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 ;
-    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_client__shelf_delete(name,local_abspath,dry_run,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__shelf_delete" "', 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_client__shelf_delete" "', 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__shelf_delete" "', argument " "3"" of type '" "svn_boolean_t""'");
-    } 
-    arg3 = (svn_boolean_t)(val3);
-    res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client__shelf_delete" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); 
-    }
-    arg4 = (svn_client_ctx_t *)(argp4);
-    if (items > 4) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_delete((char const *)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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } 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_client__shelf_mods_editor) {
-  {
-    svn_delta_editor_t **arg1 = (svn_delta_editor_t **) 0 ;
-    void **arg2 = (void **) 0 ;
-    svn_client__shelf_version_t *arg3 = (svn_client__shelf_version_t *) 0 ;
-    svn_wc_notify_func2_t arg4 = (svn_wc_notify_func2_t) 0 ;
-    void *arg5 = (void *) 0 ;
-    svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ;
-    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    svn_delta_editor_t *temp1 ;
-    void *temp2 ;
-    void *argp3 = 0 ;
-    int res3 = 0 ;
-    SV *_global_callback ;
-    void *argp6 = 0 ;
-    int res6 = 0 ;
-    int argvi = 0;
-    SV * _saved[1] ;
-    svn_error_t *result = 0 ;
-    dXSARGS;
-    
-    {
-      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
-      SPAGAIN;
-    }
-    arg1 = &temp1;
-    arg2 = &temp2;
-    if ((items < 4) || (items > 5)) {
-      SWIG_croak("Usage: svn_client__shelf_mods_editor(shelf_version,notify_func,notify_baton,ctx,result_pool);");
-    }
-    res3 = SWIG_ConvertPtr(ST(0), &argp3,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_mods_editor" "', argument " "3"" of type '" "svn_client__shelf_version_t *""'"); 
-    }
-    arg3 = (svn_client__shelf_version_t *)(argp3);
-    {
-      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg4), 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_client__shelf_mods_editor" "', argument " "4"" of type '" "svn_wc_notify_func2_t""'"); 
-      }
-    }
-    {
-      _global_callback = ST(2);
-      arg5 = (void *) _global_callback;
-    }
-    res6 = SWIG_ConvertPtr(ST(3), &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client__shelf_mods_editor" "', argument " "6"" of type '" "svn_client_ctx_t *""'"); 
-    }
-    arg6 = (svn_client_ctx_t *)(argp6);
-    if (items > 4) {
-      
-    }
-    _saved[0] = ST(2);
-    {
-      result = (svn_error_t *)svn_client__shelf_mods_editor((struct svn_delta_editor_t 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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } 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_delta_editor_t, 0); argvi++  ;
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_mods_editor arg 2 (void **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_mods_editor is not implemented yet");
-      
-    }
-    {
-      /* callback baton */
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newRV_inc(_global_callback)); argvi++  ;
-    }
-    
-    
-    
-    
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_save_new_version3) {
-  {
-    svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-    svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-    apr_array_header_t *arg3 = (apr_array_header_t *) 0 ;
-    svn_depth_t arg4 ;
-    apr_array_header_t *arg5 = (apr_array_header_t *) 0 ;
-    svn_client_status_func_t arg6 = (svn_client_status_func_t) 0 ;
-    void *arg7 = (void *) 0 ;
-    svn_client_status_func_t arg8 = (svn_client_status_func_t) 0 ;
-    void *arg9 = (void *) 0 ;
-    apr_pool_t *arg10 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    svn_client__shelf_version_t *temp1 ;
-    void *argp2 = 0 ;
-    int res2 = 0 ;
-    int val4 ;
-    int ecode4 = 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;
-    }
-    arg1 = &temp1;
-    if ((items < 8) || (items > 9)) {
-      SWIG_croak("Usage: svn_client__shelf_save_new_version3(shelf,paths,depth,changelists,shelved_func,shelved_baton,not_shelved_func,not_shelved_baton,scratch_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_save_new_version3" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_t *)(argp2);
-    {
-      arg3 = svn_swig_pl_strings_to_array(ST(1),
-        _global_pool);
-    }
-    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client__shelf_save_new_version3" "', argument " "4"" of type '" "svn_depth_t""'");
-    } 
-    arg4 = (svn_depth_t)(val4);
-    {
-      arg5 = SvOK(ST(3)) ? svn_swig_pl_strings_to_array(
-        ST(3), _global_pool) : NULL;
-    }
-    {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), 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__shelf_save_new_version3" "', argument " "6"" of type '" "svn_client_status_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_client__shelf_save_new_version3" "', argument " "7"" of type '" "void *""'"); 
-    }
-    {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), 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__shelf_save_new_version3" "', argument " "8"" of type '" "svn_client_status_func_t""'"); 
-      }
-    }
-    res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_client__shelf_save_new_version3" "', argument " "9"" of type '" "void *""'"); 
-    }
-    if (items > 8) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_save_new_version3(arg1,arg2,(apr_array_header_t const *)arg3,arg4,(apr_array_header_t const *)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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_save_new_version3 arg 1 (svn_client__shelf_version_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_save_new_version3 is not implemented yet");
-      
-    }
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_delete_newer_versions) {
-  {
-    svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-    svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ;
-    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    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;
-    }
-    if ((items < 2) || (items > 3)) {
-      SWIG_croak("Usage: svn_client__shelf_delete_newer_versions(shelf,shelf_version,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_delete_newer_versions" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_t *)(argp1);
-    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_delete_newer_versions" "', argument " "2"" of type '" "svn_client__shelf_version_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_version_t *)(argp2);
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_delete_newer_versions(arg1,arg2,arg3);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_open) {
-  {
-    svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-    svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-    int arg3 ;
-    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
-    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    svn_client__shelf_version_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_client__shelf_version_open(shelf,version_number,result_pool,scratch_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_version_open" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_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_client__shelf_version_open" "', argument " "3"" of type '" "int""'");
-    } 
-    arg3 = (int)(val3);
-    if (items > 2) {
-      
-    }
-    if (items > 3) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_version_open(arg1,arg2,arg3,arg4,arg5);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_version_open arg 1 (svn_client__shelf_version_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_version_open is not implemented yet");
-      
-    }
-    
-    
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_get_newest_version) {
-  {
-    svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-    svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    svn_client__shelf_version_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_client__shelf_get_newest_version(shelf,result_pool,scratch_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_get_newest_version" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_t *)(argp2);
-    if (items > 1) {
-      
-    }
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_get_newest_version(arg1,arg2,arg3,arg4);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_get_newest_version arg 1 (svn_client__shelf_version_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_newest_version is not implemented yet");
-      
-    }
-    
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_get_all_versions) {
-  {
-    apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
-    svn_client__shelf_t *arg2 = (svn_client__shelf_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_client__shelf_get_all_versions(shelf,result_pool,scratch_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_get_all_versions" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_t *)(argp2);
-    if (items > 1) {
-      
-    }
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_get_all_versions(arg1,arg2,arg3,arg4);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_get_all_versions arg 1 (apr_array_header_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_all_versions is not implemented yet");
-      
-    }
-    
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_apply) {
-  {
-    svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-    svn_boolean_t arg2 ;
-    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    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_client__shelf_apply(shelf_version,dry_run,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_apply" "', argument " "1"" of type '" "svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_version_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_client__shelf_apply" "', argument " "2"" of type '" "svn_boolean_t""'");
-    } 
-    arg2 = (svn_boolean_t)(val2);
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_apply(arg1,arg2,arg3);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_test_apply_file) {
-  {
-    svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
-    svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_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_client__shelf_test_apply_file(shelf_version,file_relpath,scratch_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_test_apply_file" "', argument " "2"" of type '" "svn_client__shelf_version_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_version_t *)(argp2);
-    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_test_apply_file" "', argument " "3"" of type '" "char const *""'");
-    }
-    arg3 = (char *)(buf3);
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_test_apply_file(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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } 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_client__shelf_unapply) {
-  {
-    svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-    svn_boolean_t arg2 ;
-    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    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_client__shelf_unapply(shelf_version,dry_run,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_unapply" "', argument " "1"" of type '" "svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_version_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_client__shelf_unapply" "', argument " "2"" of type '" "svn_boolean_t""'");
-    } 
-    arg2 = (svn_boolean_t)(val2);
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_unapply(arg1,arg2,arg3);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_replay) {
-  {
-    svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ;
-    void *arg4 = (void *) 0 ;
-    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 ;
-    SV *_global_callback ;
-    int argvi = 0;
-    SV * _saved[1] ;
-    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_client__shelf_replay(shelf_version,top_relpath,editor,edit_baton,notify_func,notify_baton,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_replay" "', argument " "1"" of type '" "svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_version_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_replay" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      svn_swig_pl_make_editor(&arg3, &arg4, ST(2), _global_pool);
-    }
-    {
-      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_client__shelf_replay" "', argument " "5"" of type '" "svn_wc_notify_func2_t""'"); 
-      }
-    }
-    {
-      _global_callback = ST(4);
-      arg6 = (void *) _global_callback;
-    }
-    if (items > 5) {
-      
-    }
-    _saved[0] = ST(4);
-    {
-      result = (svn_error_t *)svn_client__shelf_replay(arg1,(char const *)arg2,(struct svn_delta_editor_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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* callback baton */
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newRV_inc(_global_callback)); 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__shelf_paths_changed) {
-  {
-    apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-    svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_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_client__shelf_paths_changed(shelf_version,result_pool,scratch_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_paths_changed" "', argument " "2"" of type '" "svn_client__shelf_version_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_version_t *)(argp2);
-    if (items > 1) {
-      
-    }
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_paths_changed(arg1,arg2,arg3,arg4);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_paths_changed arg 1 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_paths_changed is not implemented yet");
-      
-    }
-    
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_revprop_set) {
-  {
-    svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    svn_string_t *arg3 = (svn_string_t *) 0 ;
-    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    svn_string_t value3 ;
-    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_client__shelf_revprop_set(shelf,prop_name,prop_val,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_revprop_set" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_revprop_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      if (SvOK(ST(2))) {
-        value3.data = SvPV(ST(2), value3.len);
-        arg3 = &value3;
-      }
-      else {
-        arg3 = NULL;
-      }
-    }
-    if (items > 3) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_revprop_set(arg1,(char const *)arg2,(struct svn_string_t const *)arg3,arg4);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } 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__shelf_revprop_set_all) {
-  {
-    svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-    apr_hash_t *arg2 = (apr_hash_t *) 0 ;
-    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    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_client__shelf_revprop_set_all(shelf,revprop_table,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_revprop_set_all" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_t *)(argp1);
-    {
-      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 (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_revprop_set_all(arg1,arg2,arg3);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_revprop_get) {
-  {
-    svn_string_t **arg1 = (svn_string_t **) 0 ;
-    svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-    char *arg3 = (char *) 0 ;
-    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    svn_string_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;
-    }
-    arg1 = &temp1;
-    if ((items < 2) || (items > 3)) {
-      SWIG_croak("Usage: svn_client__shelf_revprop_get(shelf,prop_name,result_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_revprop_get" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_t *)(argp2);
-    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_revprop_get" "', argument " "3"" of type '" "char const *""'");
-    }
-    arg3 = (char *)(buf3);
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_revprop_get(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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } 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++  ;
-      }
-    }
-    
-    
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_revprop_list) {
-  {
-    apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-    svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-    apr_pool_t *arg3 = (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;
-    }
-    arg1 = &temp1;
-    if ((items < 1) || (items > 2)) {
-      SWIG_croak("Usage: svn_client__shelf_revprop_list(shelf,result_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_revprop_list" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_t *)(argp2);
-    if (items > 1) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_revprop_list(arg1,arg2,arg3);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } 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++  ;
-    }
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_set_log_message) {
-  {
-    svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    apr_pool_t *arg3 = (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_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_client__shelf_set_log_message(shelf,log_message,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_set_log_message" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_set_log_message" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    if (items > 2) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_set_log_message(arg1,(char const *)arg2,arg3);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } 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__shelf_get_log_message) {
-  {
-    char **arg1 = (char **) 0 ;
-    svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    char *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;
-    }
-    arg1 = &temp1;
-    if ((items < 1) || (items > 2)) {
-      SWIG_croak("Usage: svn_client__shelf_get_log_message(shelf,result_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_get_log_message" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); 
-    }
-    arg2 = (svn_client__shelf_t *)(argp2);
-    if (items > 1) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_get_log_message(arg1,arg2,arg3);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_get_log_message arg 1 (char **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_log_message is not implemented yet");
-      
-    }
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_info_t_mtime_set) {
-  {
-    struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ;
-    apr_time_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    long long val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_client__shelf_info_t_mtime_set(self,mtime);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_info_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_info_t_mtime_set" "', argument " "1"" of type '" "struct svn_client__shelf_info_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_info_t *)(argp1);
-    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_client__shelf_info_t_mtime_set" "', argument " "2"" of type '" "apr_time_t""'");
-    } 
-    arg2 = (apr_time_t)(val2);
-    if (arg1) (arg1)->mtime = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_info_t_mtime_get) {
-  {
-    struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    apr_time_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_client__shelf_info_t_mtime_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_info_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_info_t_mtime_get" "', argument " "1"" of type '" "struct svn_client__shelf_info_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_info_t *)(argp1);
-    result =  ((arg1)->mtime);
-    {
-      char temp[30];
-      sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
-    }
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_new_svn_client__shelf_info_t) {
-  {
-    int argvi = 0;
-    struct svn_client__shelf_info_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 0) || (items > 0)) {
-      SWIG_croak("Usage: new_svn_client__shelf_info_t();");
-    }
-    {
-      result = (struct svn_client__shelf_info_t *)calloc(1, sizeof(struct svn_client__shelf_info_t));
-      
-      
-      
-    }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_info_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
-    XSRETURN(argvi);
-  fail:
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_delete_svn_client__shelf_info_t) {
-  {
-    struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: delete_svn_client__shelf_info_t(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_info_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_client__shelf_info_t" "', argument " "1"" of type '" "struct svn_client__shelf_info_t *""'"); 
-    }
-    arg1 = (struct svn_client__shelf_info_t *)(argp1);
-    {
-      free((char *) arg1);
-      
-      
-      
-    }
-    ST(argvi) = sv_newmortal();
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_list) {
-  {
-    apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-    char *arg2 = (char *) 0 ;
-    svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ;
-    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
-    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    apr_hash_t *temp1 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 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_client__shelf_list(local_abspath,ctx,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_client__shelf_list" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_list" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); 
-    }
-    arg3 = (svn_client_ctx_t *)(argp3);
-    if (items > 2) {
-      
-    }
-    if (items > 3) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_list(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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_client__shelf_list arg 1 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_client__shelf_list is not implemented yet");
-      
-    }
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_client__shelf_version_status_walk) {
-  {
-    svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    svn_wc_status_func4_t arg3 = (svn_wc_status_func4_t) 0 ;
-    void *arg4 = (void *) 0 ;
-    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    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)) {
-      SWIG_croak("Usage: svn_client__shelf_version_status_walk(shelf_version,wc_relpath,walk_func,walk_baton,scratch_pool);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_status_walk" "', argument " "1"" of type '" "svn_client__shelf_version_t *""'"); 
-    }
-    arg1 = (svn_client__shelf_version_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_version_status_walk" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client__shelf_version_status_walk" "', argument " "3"" of type '" "svn_wc_status_func4_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_client__shelf_version_status_walk" "', argument " "4"" of type '" "void *""'"); 
-    }
-    if (items > 4) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_client__shelf_version_status_walk(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;
-          
-          PUTBACK;
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-          SPAGAIN;
-        } 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_add_to_changelist) {
   {
     apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
@@ -43862,7 +40838,6 @@ static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_s
 static swig_type_info _swigt__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 = {"_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_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__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 = {"_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_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0};
@@ -43878,17 +40853,13 @@ static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t
 static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_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_svn_auth_provider_object_t = {"_p_p_svn_auth_provider_object_t", "struct svn_auth_provider_object_t **|svn_auth_provider_object_t **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_svn_client__shelf_t = {"_p_p_svn_client__shelf_t", "struct svn_client__shelf_t **|svn_client__shelf_t **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_svn_client__shelf_version_t = {"_p_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t **|svn_client__shelf_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_commit_info_t = {"_p_p_svn_client_commit_info_t", "struct svn_client_commit_info_t **|svn_client_commit_info_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_commit_item3_t = {"_p_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t **|svn_client_commit_item3_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_conflict_t = {"_p_p_svn_client_conflict_t", "struct svn_client_conflict_t **|svn_client_conflict_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_ctx_t = {"_p_p_svn_client_ctx_t", "struct svn_client_ctx_t **|svn_client_ctx_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_commit_info_t = {"_p_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_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_ra_session_t = {"_p_p_svn_ra_session_t", "struct svn_ra_session_t **|svn_ra_session_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_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};
 static swig_type_info _swigt__p_svn_auth_cred_ssl_client_cert_pw_t = {"_p_svn_auth_cred_ssl_client_cert_pw_t", "struct svn_auth_cred_ssl_client_cert_pw_t *|svn_auth_cred_ssl_client_cert_pw_t *", 0, 0, (void*)0, 0};
@@ -43903,9 +40874,6 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_info_t = {"_p_svn_client__shelf_info_t", "struct svn_client__shelf_info_t *|svn_client__shelf_info_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_t = {"_p_svn_client__shelf_t", "struct svn_client__shelf_t *|svn_client__shelf_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t *|svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_info_t = {"_p_svn_client_commit_info_t", "struct svn_client_commit_info_t *|svn_client_commit_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_item2_t = {"_p_svn_client_commit_item2_t", "struct svn_client_commit_item2_t *|svn_client_commit_item2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_item3_t = {"_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t *|svn_client_commit_item3_t *", 0, 0, (void*)0, 0};
@@ -44056,7 +41024,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__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,
   &_swigt__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,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t,
-  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void,
   &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void,
   &_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t,
@@ -44072,17 +41039,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_apr_hash_t,
   &_swigt__p_p_char,
   &_swigt__p_p_svn_auth_provider_object_t,
-  &_swigt__p_p_svn_client__shelf_t,
-  &_swigt__p_p_svn_client__shelf_version_t,
   &_swigt__p_p_svn_client_commit_info_t,
   &_swigt__p_p_svn_client_commit_item3_t,
   &_swigt__p_p_svn_client_conflict_t,
   &_swigt__p_p_svn_client_ctx_t,
   &_swigt__p_p_svn_commit_info_t,
-  &_swigt__p_p_svn_delta_editor_t,
   &_swigt__p_p_svn_ra_session_t,
   &_swigt__p_p_svn_string_t,
-  &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
   &_swigt__p_svn_auth_cred_ssl_client_cert_pw_t,
@@ -44097,9 +41060,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
-  &_swigt__p_svn_client__shelf_info_t,
-  &_swigt__p_svn_client__shelf_t,
-  &_swigt__p_svn_client__shelf_version_t,
   &_swigt__p_svn_client_commit_info_t,
   &_swigt__p_svn_client_commit_item2_t,
   &_swigt__p_svn_client_commit_item3_t,
@@ -44250,7 +41210,6 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_s
 static swig_cast_info _swigc__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[] = {  {&_swigt__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, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__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[] = {  {&_swigt__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, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_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_wc_status3_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_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_struct_svn_wc_status2_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -44266,17 +41225,13 @@ static swig_cast_info _swigc__p_p_apr_array_header_t[] = {  {&_swigt__p_p_apr_ar
 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_svn_auth_provider_object_t[] = {  {&_swigt__p_p_svn_auth_provider_object_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_svn_client__shelf_t[] = {  {&_swigt__p_p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_svn_client__shelf_version_t[] = {  {&_swigt__p_p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_commit_info_t[] = {  {&_swigt__p_p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_commit_item3_t[] = {  {&_swigt__p_p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_conflict_t[] = {  {&_swigt__p_p_svn_client_conflict_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_ctx_t[] = {  {&_swigt__p_p_svn_client_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_commit_info_t[] = {  {&_swigt__p_p_svn_commit_info_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}};
 static swig_cast_info _swigc__p_p_svn_ra_session_t[] = {  {&_swigt__p_p_svn_ra_session_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_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}};
 static swig_cast_info _swigc__p_svn_auth_cred_ssl_client_cert_pw_t[] = {  {&_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -44291,9 +41246,6 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_client__shelf_info_t[] = {  {&_swigt__p_svn_client__shelf_info_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_client__shelf_t[] = {  {&_swigt__p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client_commit_info_t[] = {  {&_swigt__p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client_commit_item2_t[] = {  {&_swigt__p_svn_client_commit_item2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client_commit_item3_t[] = {  {&_swigt__p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -44444,7 +41396,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__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,
   _swigc__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,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t,
-  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void,
   _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void,
   _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t,
@@ -44460,17 +41411,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_apr_hash_t,
   _swigc__p_p_char,
   _swigc__p_p_svn_auth_provider_object_t,
-  _swigc__p_p_svn_client__shelf_t,
-  _swigc__p_p_svn_client__shelf_version_t,
   _swigc__p_p_svn_client_commit_info_t,
   _swigc__p_p_svn_client_commit_item3_t,
   _swigc__p_p_svn_client_conflict_t,
   _swigc__p_p_svn_client_ctx_t,
   _swigc__p_p_svn_commit_info_t,
-  _swigc__p_p_svn_delta_editor_t,
   _swigc__p_p_svn_ra_session_t,
   _swigc__p_p_svn_string_t,
-  _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
   _swigc__p_svn_auth_cred_ssl_client_cert_pw_t,
@@ -44485,9 +41432,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
-  _swigc__p_svn_client__shelf_info_t,
-  _swigc__p_svn_client__shelf_t,
-  _swigc__p_svn_client__shelf_version_t,
   _swigc__p_svn_client_commit_info_t,
   _swigc__p_svn_client_commit_item2_t,
   _swigc__p_svn_client_commit_item3_t,
@@ -45038,59 +41982,6 @@ static swig_command_info swig_commands[] = {
 {"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__shelf_t_name_set", _wrap_svn_client__shelf_t_name_set},
-{"SVN::_Client::svn_client__shelf_t_name_get", _wrap_svn_client__shelf_t_name_get},
-{"SVN::_Client::svn_client__shelf_t_max_version_set", _wrap_svn_client__shelf_t_max_version_set},
-{"SVN::_Client::svn_client__shelf_t_max_version_get", _wrap_svn_client__shelf_t_max_version_get},
-{"SVN::_Client::svn_client__shelf_t_wc_root_abspath_set", _wrap_svn_client__shelf_t_wc_root_abspath_set},
-{"SVN::_Client::svn_client__shelf_t_wc_root_abspath_get", _wrap_svn_client__shelf_t_wc_root_abspath_get},
-{"SVN::_Client::svn_client__shelf_t_shelves_dir_set", _wrap_svn_client__shelf_t_shelves_dir_set},
-{"SVN::_Client::svn_client__shelf_t_shelves_dir_get", _wrap_svn_client__shelf_t_shelves_dir_get},
-{"SVN::_Client::svn_client__shelf_t_revprops_set", _wrap_svn_client__shelf_t_revprops_set},
-{"SVN::_Client::svn_client__shelf_t_revprops_get", _wrap_svn_client__shelf_t_revprops_get},
-{"SVN::_Client::svn_client__shelf_t_ctx_set", _wrap_svn_client__shelf_t_ctx_set},
-{"SVN::_Client::svn_client__shelf_t_ctx_get", _wrap_svn_client__shelf_t_ctx_get},
-{"SVN::_Client::svn_client__shelf_t_pool_set", _wrap_svn_client__shelf_t_pool_set},
-{"SVN::_Client::svn_client__shelf_t_pool_get", _wrap_svn_client__shelf_t_pool_get},
-{"SVN::_Client::new_svn_client__shelf_t", _wrap_new_svn_client__shelf_t},
-{"SVN::_Client::delete_svn_client__shelf_t", _wrap_delete_svn_client__shelf_t},
-{"SVN::_Client::svn_client__shelf_version_t_shelf_set", _wrap_svn_client__shelf_version_t_shelf_set},
-{"SVN::_Client::svn_client__shelf_version_t_shelf_get", _wrap_svn_client__shelf_version_t_shelf_get},
-{"SVN::_Client::svn_client__shelf_version_t_mtime_set", _wrap_svn_client__shelf_version_t_mtime_set},
-{"SVN::_Client::svn_client__shelf_version_t_mtime_get", _wrap_svn_client__shelf_version_t_mtime_get},
-{"SVN::_Client::svn_client__shelf_version_t_files_dir_abspath_set", _wrap_svn_client__shelf_version_t_files_dir_abspath_set},
-{"SVN::_Client::svn_client__shelf_version_t_files_dir_abspath_get", _wrap_svn_client__shelf_version_t_files_dir_abspath_get},
-{"SVN::_Client::svn_client__shelf_version_t_version_number_set", _wrap_svn_client__shelf_version_t_version_number_set},
-{"SVN::_Client::svn_client__shelf_version_t_version_number_get", _wrap_svn_client__shelf_version_t_version_number_get},
-{"SVN::_Client::new_svn_client__shelf_version_t", _wrap_new_svn_client__shelf_version_t},
-{"SVN::_Client::delete_svn_client__shelf_version_t", _wrap_delete_svn_client__shelf_version_t},
-{"SVN::_Client::svn_client__shelf_open_or_create", _wrap_svn_client__shelf_open_or_create},
-{"SVN::_Client::svn_client__shelf_open_existing", _wrap_svn_client__shelf_open_existing},
-{"SVN::_Client::svn_client__shelf_close", _wrap_svn_client__shelf_close},
-{"SVN::_Client::svn_client__shelf_delete", _wrap_svn_client__shelf_delete},
-{"SVN::_Client::svn_client__shelf_mods_editor", _wrap_svn_client__shelf_mods_editor},
-{"SVN::_Client::svn_client__shelf_save_new_version3", _wrap_svn_client__shelf_save_new_version3},
-{"SVN::_Client::svn_client__shelf_delete_newer_versions", _wrap_svn_client__shelf_delete_newer_versions},
-{"SVN::_Client::svn_client__shelf_version_open", _wrap_svn_client__shelf_version_open},
-{"SVN::_Client::svn_client__shelf_get_newest_version", _wrap_svn_client__shelf_get_newest_version},
-{"SVN::_Client::svn_client__shelf_get_all_versions", _wrap_svn_client__shelf_get_all_versions},
-{"SVN::_Client::svn_client__shelf_apply", _wrap_svn_client__shelf_apply},
-{"SVN::_Client::svn_client__shelf_test_apply_file", _wrap_svn_client__shelf_test_apply_file},
-{"SVN::_Client::svn_client__shelf_unapply", _wrap_svn_client__shelf_unapply},
-{"SVN::_Client::svn_client__shelf_replay", _wrap_svn_client__shelf_replay},
-{"SVN::_Client::svn_client__shelf_paths_changed", _wrap_svn_client__shelf_paths_changed},
-{"SVN::_Client::svn_client__shelf_revprop_set", _wrap_svn_client__shelf_revprop_set},
-{"SVN::_Client::svn_client__shelf_revprop_set_all", _wrap_svn_client__shelf_revprop_set_all},
-{"SVN::_Client::svn_client__shelf_revprop_get", _wrap_svn_client__shelf_revprop_get},
-{"SVN::_Client::svn_client__shelf_revprop_list", _wrap_svn_client__shelf_revprop_list},
-{"SVN::_Client::svn_client__shelf_set_log_message", _wrap_svn_client__shelf_set_log_message},
-{"SVN::_Client::svn_client__shelf_get_log_message", _wrap_svn_client__shelf_get_log_message},
-{"SVN::_Client::svn_client__shelf_info_t_mtime_set", _wrap_svn_client__shelf_info_t_mtime_set},
-{"SVN::_Client::svn_client__shelf_info_t_mtime_get", _wrap_svn_client__shelf_info_t_mtime_get},
-{"SVN::_Client::new_svn_client__shelf_info_t", _wrap_new_svn_client__shelf_info_t},
-{"SVN::_Client::delete_svn_client__shelf_info_t", _wrap_delete_svn_client__shelf_info_t},
-{"SVN::_Client::svn_client__shelf_list", _wrap_svn_client__shelf_list},
-{"SVN::_Client::svn_client__shelf_version_status_walk", _wrap_svn_client__shelf_version_status_walk},
 {"SVN::_Client::svn_client_add_to_changelist", _wrap_svn_client_add_to_changelist},
 {"SVN::_Client::svn_client_remove_from_changelists", _wrap_svn_client_remove_from_changelists},
 {"SVN::_Client::svn_client_get_changelists", _wrap_svn_client_get_changelists},
@@ -45507,222 +42398,222 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_undefined", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_undefined)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_postpone", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_postpone)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_base_text", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_base_text)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_text", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_text)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_working_text", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_working_text)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_text_where_conflicted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_text_where_conflicted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_working_text_where_conflicted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_working_text_where_conflicted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_merged_text", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_merged_text)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_unspecified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_unspecified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_accept_current_wc_state", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_accept_current_wc_state)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_update_move_destination", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_update_move_destination)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_update_any_moved_away_children", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_update_any_moved_away_children)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_add_ignore", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_add_ignore)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_file_text_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_file_text_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_file_replace_and_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_file_replace_and_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_dir_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_dir_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_dir_replace", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_dir_replace)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_dir_replace_and_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_dir_replace_and_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_delete_ignore", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_delete_ignore)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_delete_accept", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_delete_accept)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_move_file_text_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_move_file_text_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_move_dir_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_move_dir_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_local_move_file_text_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_local_move_file_text_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_local_move_dir_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_local_move_dir_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_sibling_move_file_text_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_sibling_move_file_text_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_sibling_move_dir_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_sibling_move_dir_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_both_moved_file_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_both_moved_file_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_both_moved_file_move_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_both_moved_file_move_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_both_moved_dir_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_both_moved_dir_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_both_moved_dir_move_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_both_moved_dir_move_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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 2650fc2..dbec995 100644
--- a/subversion/bindings/swig/perl/native/svn_delta.c
+++ b/subversion/bindings/swig/perl/native/svn_delta.c
@@ -3176,13 +3176,7 @@ XS(_wrap_svn_txdelta_run) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_txdelta_run arg 6 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_txdelta_run is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg6, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     
@@ -3699,7 +3693,7 @@ XS(_wrap_svn_txdelta_send_stream) {
       }
     }
     {
-      /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg4,
+      /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg4,
             _global_pool),
           0)); argvi++ /*@SWIG@*/
       
@@ -6434,13 +6428,7 @@ XS(_wrap_svn_compat_wrap_file_rev_handler) {
       
     }
     {
-      /* FIXME: Missing argout typemap: svn_compat_wrap_file_rev_handler arg 2 (void **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_compat_wrap_file_rev_handler is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0); argvi++  ;
     }
     
     
@@ -9569,32 +9557,32 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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_fs.c b/subversion/bindings/swig/perl/native/svn_fs.c
index d92e8a9..11baed8 100644
--- a/subversion/bindings/swig/perl/native/svn_fs.c
+++ b/subversion/bindings/swig/perl/native/svn_fs.c
@@ -9731,13 +9731,7 @@ XS(_wrap_svn_fs_get_mergeinfo2) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_fs_get_mergeinfo2 arg 1 (svn_mergeinfo_catalog_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_fs_get_mergeinfo2 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -9837,13 +9831,7 @@ XS(_wrap_svn_fs_get_mergeinfo) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_fs_get_mergeinfo arg 1 (svn_mergeinfo_catalog_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_fs_get_mergeinfo is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -10848,13 +10836,7 @@ XS(_wrap_svn_fs_file_checksum) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_fs_file_checksum arg 1 (svn_checksum_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_fs_file_checksum is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     
@@ -10938,7 +10920,7 @@ XS(_wrap_svn_fs_file_md5_checksum) {
       }
     }
     {
-      /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
+      /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
             _global_pool),
           0)); argvi++ /*@SWIG@*/
       
@@ -15822,7 +15804,7 @@ XS(_wrap_svn_fs_invoke_pack_notify) {
 /* -------- 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", "svn_mergeinfo_t|apr_hash_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};
 static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0};
@@ -16884,197 +16866,197 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_NODEPROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-nodeprops"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_NO_FLUSH_TO_DISK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("no-flush-to-disk"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_noop", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_noop)));
     SvREADONLY_on(sv);
diff --git a/subversion/bindings/swig/perl/native/svn_ra.c b/subversion/bindings/swig/perl/native/svn_ra.c
index 36362e2..09e96fc 100644
--- a/subversion/bindings/swig/perl/native/svn_ra.c
+++ b/subversion/bindings/swig/perl/native/svn_ra.c
@@ -5007,6 +5007,141 @@ XS(_wrap_svn_ra_create_callbacks) {
 }
 
 
+XS(_wrap_svn_ra_open5) {
+  {
+    svn_ra_session_t **arg1 = (svn_ra_session_t **) 0 ;
+    char **arg2 = (char **) 0 ;
+    char **arg3 = (char **) 0 ;
+    char *arg4 = (char *) 0 ;
+    char *arg5 = (char *) 0 ;
+    svn_ra_callbacks2_t *arg6 = (svn_ra_callbacks2_t *) 0 ;
+    void *arg7 = (void *) 0 ;
+    apr_hash_t *arg8 = (apr_hash_t *) 0 ;
+    apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_ra_session_t *temp1 ;
+    char *temp2 ;
+    char *temp3 ;
+    int res4 ;
+    char *buf4 = 0 ;
+    int alloc4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    void *argp6 = 0 ;
+    int res6 = 0 ;
+    int res7 ;
+    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)) {
+      SWIG_croak("Usage: svn_ra_open5(repos_URL,uuid,callbacks,callback_baton,config,pool);");
+    }
+    res4 = SWIG_AsCharPtrAndSize(ST(0), &buf4, NULL, &alloc4);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_ra_open5" "', argument " "4"" of type '" "char const *""'");
+    }
+    arg4 = (char *)(buf4);
+    res5 = SWIG_AsCharPtrAndSize(ST(1), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_ra_open5" "', argument " "5"" of type '" "char const *""'");
+    }
+    arg5 = (char *)(buf5);
+    res6 = SWIG_ConvertPtr(ST(2), &argp6,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_ra_open5" "', argument " "6"" of type '" "svn_ra_callbacks2_t const *""'"); 
+    }
+    arg6 = (svn_ra_callbacks2_t *)(argp6);
+    res7 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg7), 0, 0);
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_ra_open5" "', argument " "7"" of type '" "void *""'"); 
+    }
+    {
+      arg8 = svn_swig_pl_objs_to_hash_by_name (ST(4), "svn_config_t *",
+        _global_pool);
+    }
+    if (items > 5) {
+      
+    }
+    {
+      if (!arg6) {
+        SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      }
+    }
+    {
+      result = (svn_error_t *)svn_ra_open5(arg1,(char const **)arg2,(char const **)arg3,(char const *)arg4,(char const *)arg5,(struct svn_ra_callbacks2_t const *)arg6,arg7,arg8,arg9);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          PUTBACK;
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+          SPAGAIN;
+        } 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_ra_session_t, 0); argvi++  ;
+    }
+    {
+      if (*arg2 == NULL) {
+        if (argvi >= items) EXTEND(sp,1);  ST(argvi) = &PL_sv_undef; argvi++  ;
+      } else {
+        if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++  ;
+      }
+    }
+    {
+      if (*arg3 == NULL) {
+        if (argvi >= items) EXTEND(sp,1);  ST(argvi) = &PL_sv_undef; argvi++  ;
+      } else {
+        if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(*arg3, 0)); argvi++  ;
+      }
+    }
+    
+    
+    
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_ra_open4) {
   {
     svn_ra_session_t **arg1 = (svn_ra_session_t **) 0 ;
@@ -7157,13 +7292,7 @@ XS(_wrap_svn_ra_get_mergeinfo) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_ra_get_mergeinfo arg 2 (svn_mergeinfo_catalog_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_ra_get_mergeinfo is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -9435,13 +9564,7 @@ XS(_wrap_svn_ra_get_locations) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_ra_get_locations arg 2 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_ra_get_locations is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -15900,13 +16023,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_locations) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_ra_plugin_invoke_get_locations arg 3 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_ra_plugin_invoke_get_locations is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg3, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -17571,7 +17688,7 @@ XS(_wrap_svn_ra_invoke_init_func) {
 
 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_file_t = {"_p_apr_file_t", "apr_file_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_catalog_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_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0};
@@ -18305,6 +18422,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Ra::delete_svn_ra_callbacks_t", _wrap_delete_svn_ra_callbacks_t},
 {"SVN::_Ra::svn_ra_initialize", _wrap_svn_ra_initialize},
 {"SVN::_Ra::svn_ra_create_callbacks", _wrap_svn_ra_create_callbacks},
+{"SVN::_Ra::svn_ra_open5", _wrap_svn_ra_open5},
 {"SVN::_Ra::svn_ra_open4", _wrap_svn_ra_open4},
 {"SVN::_Ra::svn_ra_open3", _wrap_svn_ra_open3},
 {"SVN::_Ra::svn_ra_open2", _wrap_svn_ra_open2},
@@ -18757,57 +18875,57 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_LIST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("list"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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 180cf9c..83d1b3a 100644
--- a/subversion/bindings/swig/perl/native/svn_repos.c
+++ b/subversion/bindings/swig/perl/native/svn_repos.c
@@ -3889,13 +3889,7 @@ XS(_wrap_svn_repos_capabilities) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_repos_capabilities arg 1 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_repos_capabilities is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -9212,13 +9206,7 @@ XS(_wrap_svn_repos_trace_node_locations) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_repos_trace_node_locations arg 2 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_repos_trace_node_locations is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -10769,13 +10757,7 @@ XS(_wrap_svn_repos_fs_get_mergeinfo) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_repos_fs_get_mergeinfo arg 1 (svn_mergeinfo_catalog_t *) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_repos_fs_get_mergeinfo is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -22699,7 +22681,7 @@ XS(_wrap_svn_repos_invoke_authz_warning_func) {
 /* -------- 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_catalog_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_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0};
@@ -23941,357 +23923,357 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_noop", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_noop)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_revprop_set", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_revprop_set)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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 9252a00..690ed76 100644
--- a/subversion/bindings/swig/perl/native/svn_wc.c
+++ b/subversion/bindings/swig/perl/native/svn_wc.c
@@ -4328,22 +4328,10 @@ XS(_wrap_svn_wc_edited_externals) {
     }
     ST(argvi) = sv_newmortal();
     {
-      /* FIXME: Missing argout typemap: svn_wc_edited_externals arg 1 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_wc_edited_externals is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     {
-      /* FIXME: Missing argout typemap: svn_wc_edited_externals arg 2 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_wc_edited_externals is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -4385,13 +4373,7 @@ XS(_wrap_svn_wc_traversed_depths) {
     }
     ST(argvi) = sv_newmortal();
     {
-      /* FIXME: Missing argout typemap: svn_wc_traversed_depths arg 1 (apr_hash_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_wc_traversed_depths is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0); argvi++  ;
     }
     
     
@@ -37795,22 +37777,10 @@ XS(_wrap_svn_wc_transmit_text_deltas3) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_wc_transmit_text_deltas3 arg 1 (svn_checksum_t const **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_wc_transmit_text_deltas3 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     {
-      /* FIXME: Missing argout typemap: svn_wc_transmit_text_deltas3 arg 2 (svn_checksum_t const **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_wc_transmit_text_deltas3 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_svn_checksum_t, 0); argvi++  ;
     }
     
     
@@ -37919,7 +37889,7 @@ XS(_wrap_svn_wc_transmit_text_deltas2) {
       }
     }
     {
-      /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg2,
+      /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg2,
             _global_pool),
           0)); argvi++ /*@SWIG@*/
       
@@ -47864,802 +47834,802 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved_text", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved_text)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved_prop", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved_prop)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved_tree", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved_tree)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_begin_search_tree_conflict_details", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_begin_search_tree_conflict_details)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_tree_conflict_details_progress", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_tree_conflict_details_progress)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_end_search_tree_conflict_details", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_end_search_tree_conflict_details)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svn-rel/prefix/share/swig/3.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/proxy/svn_client_h.swg b/subversion/bindings/swig/proxy/svn_client_h.swg
index 989acfb..ffa2de2 100644
--- a/subversion/bindings/swig/proxy/svn_client_h.swg
+++ b/subversion/bindings/swig/proxy/svn_client_h.swg
@@ -77,10 +77,6 @@
   void *receiver_baton,
   void *summarize_baton,
   void *conflict_walk_func_baton,
-  void *shelved_baton,
-  void *not_shelved_baton,
-  void *edit_baton,
-  void *walk_baton,
   void *callback_baton,
   void *patch_baton
 };
@@ -105,9 +101,6 @@
 %opaque_proxy(svn_client_conflict_t);
 %opaque_proxy(svn_client_conflict_option_t);
 %proxy(svn_client_copy_source_t);
-%proxy(svn_client__shelf_t);
-%proxy(svn_client__shelf_version_t);
-%proxy(svn_client__shelf_info_t);
 %proxy(svn_info_t);
 %proxy(svn_client_info2_t);
 #endif
diff --git a/subversion/bindings/swig/python/client.py b/subversion/bindings/swig/python/client.py
index 11d1c3c..1e68a71 100644
--- a/subversion/bindings/swig/python/client.py
+++ b/subversion/bindings/swig/python/client.py
@@ -39,6 +39,11 @@ else:
 del _swig_python_version_info
 
 try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
@@ -54,7 +59,7 @@ def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
     if method:
         return method(self, value)
     if (not static):
-        self.__dict__[name] = value
+        object.__setattr__(self, name, value)
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
 
@@ -80,14 +85,26 @@ def _swig_repr(self):
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self, name, value):
+        if (name == "thisown"):
+            return self.this.own(value)
+        if hasattr(self, name) or (name == "this"):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
+
 def _copy_metadata_deep(value, old_value):
   """Copy all attributes of old_value into value, recursively traversing
   lists and dicts if needed."""
   if value is None or old_value is None or value is old_value: return
 
   if isinstance(value, dict):
-    for k, v in value.iteritems():
-      _copy_metadata_deep(v, old_value[k])
+    for k in value:
+      _copy_metadata_deep(value[k], old_value[k])
   elif isinstance(value, list):
     for v, old_v in zip(value, old_value):
       _copy_metadata_deep(v, old_v)
@@ -100,81 +117,95 @@ def _copy_metadata_deep(value, old_value):
 def _assert_valid_deep(value):
   """Assert value's validity, recursively traversing lists and dicts."""
   if isinstance(value, dict):
-    for v in value.itervalues():
-      _assert_valid_deep(v)
+    for k in value:
+      _assert_valid_deep(value[k])
   elif isinstance(value, list):
     for v in value:
       _assert_valid_deep(v)
-  else:
-    if hasattr(value, "assert_valid"):
-      value.assert_valid()
+# Ensure that the passed in value isn't a type, which could have an
+# assert_valid attribute, but it can not be called without an instance.
+  elif type(value) != type:
+    try:
+      fn = value.assert_valid
+    except AttributeError:
+      pass
+    else:
+      fn()
+
+
+
+  # SWIG classes generated with -modern do not define this variable
+try:
+  _newclass
+except NameError:
+  _newclass = 1
+else:
+  raise RuntimeError("Require -modern option, but _newclass is defined")
+
+_get_instance_attr = object.__getattribute__
+_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 
 import libsvn.core
 import libsvn.delta
 import libsvn.wc
 import libsvn.ra
 
-def svn_client_version():
+def svn_client_version() -> "svn_version_t const *":
     """svn_client_version() -> svn_version_t const *"""
     return _client.svn_client_version()
 
-def svn_client_get_simple_prompt_provider(*args):
+def svn_client_get_simple_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_simple_prompt_provider(svn_auth_simple_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)"""
     return _client.svn_client_get_simple_prompt_provider(*args)
 
-def svn_client_get_username_prompt_provider(*args):
+def svn_client_get_username_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_username_prompt_provider(svn_auth_username_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)"""
     return _client.svn_client_get_username_prompt_provider(*args)
 
-def svn_client_get_simple_provider(*args):
+def svn_client_get_simple_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_simple_provider(apr_pool_t pool)"""
     return _client.svn_client_get_simple_provider(*args)
 
-def svn_client_get_username_provider(*args):
+def svn_client_get_username_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_username_provider(apr_pool_t pool)"""
     return _client.svn_client_get_username_provider(*args)
 
-def svn_client_get_ssl_server_trust_file_provider(*args):
+def svn_client_get_ssl_server_trust_file_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_ssl_server_trust_file_provider(apr_pool_t pool)"""
     return _client.svn_client_get_ssl_server_trust_file_provider(*args)
 
-def svn_client_get_ssl_client_cert_file_provider(*args):
+def svn_client_get_ssl_client_cert_file_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_ssl_client_cert_file_provider(apr_pool_t pool)"""
     return _client.svn_client_get_ssl_client_cert_file_provider(*args)
 
-def svn_client_get_ssl_client_cert_pw_file_provider(*args):
+def svn_client_get_ssl_client_cert_pw_file_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_ssl_client_cert_pw_file_provider(apr_pool_t pool)"""
     return _client.svn_client_get_ssl_client_cert_pw_file_provider(*args)
 
-def svn_client_get_ssl_server_trust_prompt_provider(*args):
+def svn_client_get_ssl_server_trust_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_ssl_server_trust_prompt_provider(svn_auth_ssl_server_trust_prompt_func_t prompt_func, apr_pool_t pool)"""
     return _client.svn_client_get_ssl_server_trust_prompt_provider(*args)
 
-def svn_client_get_ssl_client_cert_prompt_provider(*args):
+def svn_client_get_ssl_client_cert_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_ssl_client_cert_prompt_provider(svn_auth_ssl_client_cert_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)"""
     return _client.svn_client_get_ssl_client_cert_prompt_provider(*args)
 
-def svn_client_get_ssl_client_cert_pw_prompt_provider(*args):
+def svn_client_get_ssl_client_cert_pw_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_client_get_ssl_client_cert_pw_prompt_provider(svn_auth_ssl_client_cert_pw_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)"""
     return _client.svn_client_get_ssl_client_cert_pw_prompt_provider(*args)
 
-def svn_client_proplist_item_dup(*args):
+def svn_client_proplist_item_dup(*args) -> "svn_client_proplist_item_t *":
     """svn_client_proplist_item_dup(svn_client_proplist_item_t const * item, apr_pool_t pool) -> svn_client_proplist_item_t *"""
     return _client.svn_client_proplist_item_dup(*args)
-class svn_client_commit_info_t:
+class svn_client_commit_info_t(object):
     """Proxy of C svn_client_commit_info_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_commit_info_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_commit_info_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["revision"] = _client.svn_client_commit_info_t_revision_set
-    __swig_getmethods__["revision"] = _client.svn_client_commit_info_t_revision_get
-    __swig_setmethods__["date"] = _client.svn_client_commit_info_t_date_set
-    __swig_getmethods__["date"] = _client.svn_client_commit_info_t_date_get
-    __swig_setmethods__["author"] = _client.svn_client_commit_info_t_author_set
-    __swig_getmethods__["author"] = _client.svn_client_commit_info_t_author_get
+    revision = _swig_property(_client.svn_client_commit_info_t_revision_get, _client.svn_client_commit_info_t_revision_set)
+    date = _swig_property(_client.svn_client_commit_info_t_date_get, _client.svn_client_commit_info_t_date_set)
+    author = _swig_property(_client.svn_client_commit_info_t_author_get, _client.svn_client_commit_info_t_author_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -189,23 +220,57 @@ class svn_client_commit_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -215,7 +280,7 @@ class svn_client_commit_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -237,36 +302,22 @@ SVN_CLIENT_COMMIT_ITEM_PROP_MODS = _client.SVN_CLIENT_COMMIT_ITEM_PROP_MODS
 SVN_CLIENT_COMMIT_ITEM_IS_COPY = _client.SVN_CLIENT_COMMIT_ITEM_IS_COPY
 SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN = _client.SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN
 SVN_CLIENT_COMMIT_ITEM_MOVED_HERE = _client.SVN_CLIENT_COMMIT_ITEM_MOVED_HERE
-class svn_client_commit_item3_t:
+class svn_client_commit_item3_t(object):
     """Proxy of C svn_client_commit_item3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_commit_item3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_commit_item3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _client.svn_client_commit_item3_t_path_set
-    __swig_getmethods__["path"] = _client.svn_client_commit_item3_t_path_get
-    __swig_setmethods__["kind"] = _client.svn_client_commit_item3_t_kind_set
-    __swig_getmethods__["kind"] = _client.svn_client_commit_item3_t_kind_get
-    __swig_setmethods__["url"] = _client.svn_client_commit_item3_t_url_set
-    __swig_getmethods__["url"] = _client.svn_client_commit_item3_t_url_get
-    __swig_setmethods__["revision"] = _client.svn_client_commit_item3_t_revision_set
-    __swig_getmethods__["revision"] = _client.svn_client_commit_item3_t_revision_get
-    __swig_setmethods__["copyfrom_url"] = _client.svn_client_commit_item3_t_copyfrom_url_set
-    __swig_getmethods__["copyfrom_url"] = _client.svn_client_commit_item3_t_copyfrom_url_get
-    __swig_setmethods__["copyfrom_rev"] = _client.svn_client_commit_item3_t_copyfrom_rev_set
-    __swig_getmethods__["copyfrom_rev"] = _client.svn_client_commit_item3_t_copyfrom_rev_get
-    __swig_setmethods__["state_flags"] = _client.svn_client_commit_item3_t_state_flags_set
-    __swig_getmethods__["state_flags"] = _client.svn_client_commit_item3_t_state_flags_get
-    __swig_setmethods__["incoming_prop_changes"] = _client.svn_client_commit_item3_t_incoming_prop_changes_set
-    __swig_getmethods__["incoming_prop_changes"] = _client.svn_client_commit_item3_t_incoming_prop_changes_get
-    __swig_setmethods__["outgoing_prop_changes"] = _client.svn_client_commit_item3_t_outgoing_prop_changes_set
-    __swig_getmethods__["outgoing_prop_changes"] = _client.svn_client_commit_item3_t_outgoing_prop_changes_get
-    __swig_setmethods__["session_relpath"] = _client.svn_client_commit_item3_t_session_relpath_set
-    __swig_getmethods__["session_relpath"] = _client.svn_client_commit_item3_t_session_relpath_get
-    __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
+    path = _swig_property(_client.svn_client_commit_item3_t_path_get, _client.svn_client_commit_item3_t_path_set)
+    kind = _swig_property(_client.svn_client_commit_item3_t_kind_get, _client.svn_client_commit_item3_t_kind_set)
+    url = _swig_property(_client.svn_client_commit_item3_t_url_get, _client.svn_client_commit_item3_t_url_set)
+    revision = _swig_property(_client.svn_client_commit_item3_t_revision_get, _client.svn_client_commit_item3_t_revision_set)
+    copyfrom_url = _swig_property(_client.svn_client_commit_item3_t_copyfrom_url_get, _client.svn_client_commit_item3_t_copyfrom_url_set)
+    copyfrom_rev = _swig_property(_client.svn_client_commit_item3_t_copyfrom_rev_get, _client.svn_client_commit_item3_t_copyfrom_rev_set)
+    state_flags = _swig_property(_client.svn_client_commit_item3_t_state_flags_get, _client.svn_client_commit_item3_t_state_flags_set)
+    incoming_prop_changes = _swig_property(_client.svn_client_commit_item3_t_incoming_prop_changes_get, _client.svn_client_commit_item3_t_incoming_prop_changes_set)
+    outgoing_prop_changes = _swig_property(_client.svn_client_commit_item3_t_outgoing_prop_changes_get, _client.svn_client_commit_item3_t_outgoing_prop_changes_set)
+    session_relpath = _swig_property(_client.svn_client_commit_item3_t_session_relpath_get, _client.svn_client_commit_item3_t_session_relpath_set)
+    moved_from_abspath = _swig_property(_client.svn_client_commit_item3_t_moved_from_abspath_get, _client.svn_client_commit_item3_t_moved_from_abspath_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -281,23 +332,57 @@ class svn_client_commit_item3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -307,7 +392,7 @@ class svn_client_commit_item3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -322,30 +407,19 @@ class svn_client_commit_item3_t:
 svn_client_commit_item3_t_swigregister = _client.svn_client_commit_item3_t_swigregister
 svn_client_commit_item3_t_swigregister(svn_client_commit_item3_t)
 
-class svn_client_commit_item2_t:
+class svn_client_commit_item2_t(object):
     """Proxy of C svn_client_commit_item2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_commit_item2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_commit_item2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _client.svn_client_commit_item2_t_path_set
-    __swig_getmethods__["path"] = _client.svn_client_commit_item2_t_path_get
-    __swig_setmethods__["kind"] = _client.svn_client_commit_item2_t_kind_set
-    __swig_getmethods__["kind"] = _client.svn_client_commit_item2_t_kind_get
-    __swig_setmethods__["url"] = _client.svn_client_commit_item2_t_url_set
-    __swig_getmethods__["url"] = _client.svn_client_commit_item2_t_url_get
-    __swig_setmethods__["revision"] = _client.svn_client_commit_item2_t_revision_set
-    __swig_getmethods__["revision"] = _client.svn_client_commit_item2_t_revision_get
-    __swig_setmethods__["copyfrom_url"] = _client.svn_client_commit_item2_t_copyfrom_url_set
-    __swig_getmethods__["copyfrom_url"] = _client.svn_client_commit_item2_t_copyfrom_url_get
-    __swig_setmethods__["copyfrom_rev"] = _client.svn_client_commit_item2_t_copyfrom_rev_set
-    __swig_getmethods__["copyfrom_rev"] = _client.svn_client_commit_item2_t_copyfrom_rev_get
-    __swig_setmethods__["state_flags"] = _client.svn_client_commit_item2_t_state_flags_set
-    __swig_getmethods__["state_flags"] = _client.svn_client_commit_item2_t_state_flags_get
-    __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
+    path = _swig_property(_client.svn_client_commit_item2_t_path_get, _client.svn_client_commit_item2_t_path_set)
+    kind = _swig_property(_client.svn_client_commit_item2_t_kind_get, _client.svn_client_commit_item2_t_kind_set)
+    url = _swig_property(_client.svn_client_commit_item2_t_url_get, _client.svn_client_commit_item2_t_url_set)
+    revision = _swig_property(_client.svn_client_commit_item2_t_revision_get, _client.svn_client_commit_item2_t_revision_set)
+    copyfrom_url = _swig_property(_client.svn_client_commit_item2_t_copyfrom_url_get, _client.svn_client_commit_item2_t_copyfrom_url_set)
+    copyfrom_rev = _swig_property(_client.svn_client_commit_item2_t_copyfrom_rev_get, _client.svn_client_commit_item2_t_copyfrom_rev_set)
+    state_flags = _swig_property(_client.svn_client_commit_item2_t_state_flags_get, _client.svn_client_commit_item2_t_state_flags_set)
+    wcprop_changes = _swig_property(_client.svn_client_commit_item2_t_wcprop_changes_get, _client.svn_client_commit_item2_t_wcprop_changes_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -360,23 +434,57 @@ class svn_client_commit_item2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -386,7 +494,7 @@ class svn_client_commit_item2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -401,28 +509,18 @@ class svn_client_commit_item2_t:
 svn_client_commit_item2_t_swigregister = _client.svn_client_commit_item2_t_swigregister
 svn_client_commit_item2_t_swigregister(svn_client_commit_item2_t)
 
-class svn_client_commit_item_t:
+class svn_client_commit_item_t(object):
     """Proxy of C svn_client_commit_item_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_commit_item_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_commit_item_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _client.svn_client_commit_item_t_path_set
-    __swig_getmethods__["path"] = _client.svn_client_commit_item_t_path_get
-    __swig_setmethods__["kind"] = _client.svn_client_commit_item_t_kind_set
-    __swig_getmethods__["kind"] = _client.svn_client_commit_item_t_kind_get
-    __swig_setmethods__["url"] = _client.svn_client_commit_item_t_url_set
-    __swig_getmethods__["url"] = _client.svn_client_commit_item_t_url_get
-    __swig_setmethods__["revision"] = _client.svn_client_commit_item_t_revision_set
-    __swig_getmethods__["revision"] = _client.svn_client_commit_item_t_revision_get
-    __swig_setmethods__["copyfrom_url"] = _client.svn_client_commit_item_t_copyfrom_url_set
-    __swig_getmethods__["copyfrom_url"] = _client.svn_client_commit_item_t_copyfrom_url_get
-    __swig_setmethods__["state_flags"] = _client.svn_client_commit_item_t_state_flags_set
-    __swig_getmethods__["state_flags"] = _client.svn_client_commit_item_t_state_flags_get
-    __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
+    path = _swig_property(_client.svn_client_commit_item_t_path_get, _client.svn_client_commit_item_t_path_set)
+    kind = _swig_property(_client.svn_client_commit_item_t_kind_get, _client.svn_client_commit_item_t_kind_set)
+    url = _swig_property(_client.svn_client_commit_item_t_url_get, _client.svn_client_commit_item_t_url_set)
+    revision = _swig_property(_client.svn_client_commit_item_t_revision_get, _client.svn_client_commit_item_t_revision_set)
+    copyfrom_url = _swig_property(_client.svn_client_commit_item_t_copyfrom_url_get, _client.svn_client_commit_item_t_copyfrom_url_set)
+    state_flags = _swig_property(_client.svn_client_commit_item_t_state_flags_get, _client.svn_client_commit_item_t_state_flags_set)
+    wcprop_changes = _swig_property(_client.svn_client_commit_item_t_wcprop_changes_get, _client.svn_client_commit_item_t_wcprop_changes_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -437,23 +535,57 @@ class svn_client_commit_item_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -463,7 +595,7 @@ class svn_client_commit_item_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -479,41 +611,34 @@ svn_client_commit_item_t_swigregister = _client.svn_client_commit_item_t_swigreg
 svn_client_commit_item_t_swigregister(svn_client_commit_item_t)
 
 
-def svn_client_commit_item3_create(*args):
+def svn_client_commit_item3_create(*args) -> "svn_client_commit_item3_t *":
     """svn_client_commit_item3_create(apr_pool_t pool) -> svn_client_commit_item3_t"""
     return _client.svn_client_commit_item3_create(*args)
 
-def svn_client_commit_item_create(*args):
+def svn_client_commit_item_create(*args) -> "svn_client_commit_item3_t const **":
     """svn_client_commit_item_create(apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_commit_item_create(*args)
 
-def svn_client_commit_item3_dup(*args):
+def svn_client_commit_item3_dup(*args) -> "svn_client_commit_item3_t *":
     """svn_client_commit_item3_dup(svn_client_commit_item3_t item, apr_pool_t pool) -> svn_client_commit_item3_t"""
     return _client.svn_client_commit_item3_dup(*args)
 
-def svn_client_commit_item2_dup(*args):
+def svn_client_commit_item2_dup(*args) -> "svn_client_commit_item2_t *":
     """svn_client_commit_item2_dup(svn_client_commit_item2_t item, apr_pool_t pool) -> svn_client_commit_item2_t"""
     return _client.svn_client_commit_item2_dup(*args)
 svn_client_diff_summarize_kind_normal = _client.svn_client_diff_summarize_kind_normal
 svn_client_diff_summarize_kind_added = _client.svn_client_diff_summarize_kind_added
 svn_client_diff_summarize_kind_modified = _client.svn_client_diff_summarize_kind_modified
 svn_client_diff_summarize_kind_deleted = _client.svn_client_diff_summarize_kind_deleted
-class svn_client_diff_summarize_t:
+class svn_client_diff_summarize_t(object):
     """Proxy of C svn_client_diff_summarize_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_diff_summarize_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_diff_summarize_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _client.svn_client_diff_summarize_t_path_set
-    __swig_getmethods__["path"] = _client.svn_client_diff_summarize_t_path_get
-    __swig_setmethods__["summarize_kind"] = _client.svn_client_diff_summarize_t_summarize_kind_set
-    __swig_getmethods__["summarize_kind"] = _client.svn_client_diff_summarize_t_summarize_kind_get
-    __swig_setmethods__["prop_changed"] = _client.svn_client_diff_summarize_t_prop_changed_set
-    __swig_getmethods__["prop_changed"] = _client.svn_client_diff_summarize_t_prop_changed_get
-    __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
+    path = _swig_property(_client.svn_client_diff_summarize_t_path_get, _client.svn_client_diff_summarize_t_path_set)
+    summarize_kind = _swig_property(_client.svn_client_diff_summarize_t_summarize_kind_get, _client.svn_client_diff_summarize_t_summarize_kind_set)
+    prop_changed = _swig_property(_client.svn_client_diff_summarize_t_prop_changed_get, _client.svn_client_diff_summarize_t_prop_changed_set)
+    node_kind = _swig_property(_client.svn_client_diff_summarize_t_node_kind_get, _client.svn_client_diff_summarize_t_node_kind_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -528,23 +653,57 @@ class svn_client_diff_summarize_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -554,7 +713,7 @@ class svn_client_diff_summarize_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -570,69 +729,40 @@ svn_client_diff_summarize_t_swigregister = _client.svn_client_diff_summarize_t_s
 svn_client_diff_summarize_t_swigregister(svn_client_diff_summarize_t)
 
 
-def svn_client_diff_summarize_dup(*args):
+def svn_client_diff_summarize_dup(*args) -> "svn_client_diff_summarize_t *":
     """svn_client_diff_summarize_dup(svn_client_diff_summarize_t diff, apr_pool_t pool) -> svn_client_diff_summarize_t"""
     return _client.svn_client_diff_summarize_dup(*args)
-class svn_client_ctx_t:
+class svn_client_ctx_t(object):
     """Proxy of C svn_client_ctx_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_ctx_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_ctx_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["auth_baton"] = _client.svn_client_ctx_t_auth_baton_set
-    __swig_getmethods__["auth_baton"] = _client.svn_client_ctx_t_auth_baton_get
-    __swig_setmethods__["notify_func"] = _client.svn_client_ctx_t_notify_func_set
-    __swig_getmethods__["notify_func"] = _client.svn_client_ctx_t_notify_func_get
-    __swig_setmethods__["notify_baton"] = _client.svn_client_ctx_t_notify_baton_set
-    __swig_getmethods__["notify_baton"] = _client.svn_client_ctx_t_notify_baton_get
-    __swig_setmethods__["log_msg_func"] = _client.svn_client_ctx_t_log_msg_func_set
-    __swig_getmethods__["log_msg_func"] = _client.svn_client_ctx_t_log_msg_func_get
-    __swig_setmethods__["log_msg_baton"] = _client.svn_client_ctx_t_log_msg_baton_set
-    __swig_getmethods__["log_msg_baton"] = _client.svn_client_ctx_t_log_msg_baton_get
-    __swig_setmethods__["config"] = _client.svn_client_ctx_t_config_set
-    __swig_getmethods__["config"] = _client.svn_client_ctx_t_config_get
-    __swig_setmethods__["cancel_func"] = _client.svn_client_ctx_t_cancel_func_set
-    __swig_getmethods__["cancel_func"] = _client.svn_client_ctx_t_cancel_func_get
-    __swig_setmethods__["cancel_baton"] = _client.svn_client_ctx_t_cancel_baton_set
-    __swig_getmethods__["cancel_baton"] = _client.svn_client_ctx_t_cancel_baton_get
-    __swig_setmethods__["notify_func2"] = _client.svn_client_ctx_t_notify_func2_set
-    __swig_getmethods__["notify_func2"] = _client.svn_client_ctx_t_notify_func2_get
-    __swig_setmethods__["notify_baton2"] = _client.svn_client_ctx_t_notify_baton2_set
-    __swig_getmethods__["notify_baton2"] = _client.svn_client_ctx_t_notify_baton2_get
-    __swig_setmethods__["log_msg_func2"] = _client.svn_client_ctx_t_log_msg_func2_set
-    __swig_getmethods__["log_msg_func2"] = _client.svn_client_ctx_t_log_msg_func2_get
-    __swig_setmethods__["log_msg_baton2"] = _client.svn_client_ctx_t_log_msg_baton2_set
-    __swig_getmethods__["log_msg_baton2"] = _client.svn_client_ctx_t_log_msg_baton2_get
-    __swig_setmethods__["progress_func"] = _client.svn_client_ctx_t_progress_func_set
-    __swig_getmethods__["progress_func"] = _client.svn_client_ctx_t_progress_func_get
-    __swig_setmethods__["progress_baton"] = _client.svn_client_ctx_t_progress_baton_set
-    __swig_getmethods__["progress_baton"] = _client.svn_client_ctx_t_progress_baton_get
-    __swig_setmethods__["log_msg_func3"] = _client.svn_client_ctx_t_log_msg_func3_set
-    __swig_getmethods__["log_msg_func3"] = _client.svn_client_ctx_t_log_msg_func3_get
-    __swig_setmethods__["log_msg_baton3"] = _client.svn_client_ctx_t_log_msg_baton3_set
-    __swig_getmethods__["log_msg_baton3"] = _client.svn_client_ctx_t_log_msg_baton3_get
-    __swig_setmethods__["mimetypes_map"] = _client.svn_client_ctx_t_mimetypes_map_set
-    __swig_getmethods__["mimetypes_map"] = _client.svn_client_ctx_t_mimetypes_map_get
-    __swig_setmethods__["conflict_func"] = _client.svn_client_ctx_t_conflict_func_set
-    __swig_getmethods__["conflict_func"] = _client.svn_client_ctx_t_conflict_func_get
-    __swig_setmethods__["conflict_baton"] = _client.svn_client_ctx_t_conflict_baton_set
-    __swig_getmethods__["conflict_baton"] = _client.svn_client_ctx_t_conflict_baton_get
-    __swig_setmethods__["client_name"] = _client.svn_client_ctx_t_client_name_set
-    __swig_getmethods__["client_name"] = _client.svn_client_ctx_t_client_name_get
-    __swig_setmethods__["conflict_func2"] = _client.svn_client_ctx_t_conflict_func2_set
-    __swig_getmethods__["conflict_func2"] = _client.svn_client_ctx_t_conflict_func2_get
-    __swig_setmethods__["conflict_baton2"] = _client.svn_client_ctx_t_conflict_baton2_set
-    __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
+    auth_baton = _swig_property(_client.svn_client_ctx_t_auth_baton_get, _client.svn_client_ctx_t_auth_baton_set)
+    notify_func = _swig_property(_client.svn_client_ctx_t_notify_func_get, _client.svn_client_ctx_t_notify_func_set)
+    notify_baton = _swig_property(_client.svn_client_ctx_t_notify_baton_get, _client.svn_client_ctx_t_notify_baton_set)
+    log_msg_func = _swig_property(_client.svn_client_ctx_t_log_msg_func_get, _client.svn_client_ctx_t_log_msg_func_set)
+    log_msg_baton = _swig_property(_client.svn_client_ctx_t_log_msg_baton_get, _client.svn_client_ctx_t_log_msg_baton_set)
+    config = _swig_property(_client.svn_client_ctx_t_config_get, _client.svn_client_ctx_t_config_set)
+    cancel_func = _swig_property(_client.svn_client_ctx_t_cancel_func_get, _client.svn_client_ctx_t_cancel_func_set)
+    cancel_baton = _swig_property(_client.svn_client_ctx_t_cancel_baton_get, _client.svn_client_ctx_t_cancel_baton_set)
+    notify_func2 = _swig_property(_client.svn_client_ctx_t_notify_func2_get, _client.svn_client_ctx_t_notify_func2_set)
+    notify_baton2 = _swig_property(_client.svn_client_ctx_t_notify_baton2_get, _client.svn_client_ctx_t_notify_baton2_set)
+    log_msg_func2 = _swig_property(_client.svn_client_ctx_t_log_msg_func2_get, _client.svn_client_ctx_t_log_msg_func2_set)
+    log_msg_baton2 = _swig_property(_client.svn_client_ctx_t_log_msg_baton2_get, _client.svn_client_ctx_t_log_msg_baton2_set)
+    progress_func = _swig_property(_client.svn_client_ctx_t_progress_func_get, _client.svn_client_ctx_t_progress_func_set)
+    progress_baton = _swig_property(_client.svn_client_ctx_t_progress_baton_get, _client.svn_client_ctx_t_progress_baton_set)
+    log_msg_func3 = _swig_property(_client.svn_client_ctx_t_log_msg_func3_get, _client.svn_client_ctx_t_log_msg_func3_set)
+    log_msg_baton3 = _swig_property(_client.svn_client_ctx_t_log_msg_baton3_get, _client.svn_client_ctx_t_log_msg_baton3_set)
+    mimetypes_map = _swig_property(_client.svn_client_ctx_t_mimetypes_map_get, _client.svn_client_ctx_t_mimetypes_map_set)
+    conflict_func = _swig_property(_client.svn_client_ctx_t_conflict_func_get, _client.svn_client_ctx_t_conflict_func_set)
+    conflict_baton = _swig_property(_client.svn_client_ctx_t_conflict_baton_get, _client.svn_client_ctx_t_conflict_baton_set)
+    client_name = _swig_property(_client.svn_client_ctx_t_client_name_get, _client.svn_client_ctx_t_client_name_set)
+    conflict_func2 = _swig_property(_client.svn_client_ctx_t_conflict_func2_get, _client.svn_client_ctx_t_conflict_func2_set)
+    conflict_baton2 = _swig_property(_client.svn_client_ctx_t_conflict_baton2_get, _client.svn_client_ctx_t_conflict_baton2_set)
+    wc_ctx = _swig_property(_client.svn_client_ctx_t_wc_ctx_get, _client.svn_client_ctx_t_wc_ctx_set)
+    check_tunnel_func = _swig_property(_client.svn_client_ctx_t_check_tunnel_func_get, _client.svn_client_ctx_t_check_tunnel_func_set)
+    open_tunnel_func = _swig_property(_client.svn_client_ctx_t_open_tunnel_func_get, _client.svn_client_ctx_t_open_tunnel_func_set)
+    tunnel_baton = _swig_property(_client.svn_client_ctx_t_tunnel_baton_get, _client.svn_client_ctx_t_tunnel_baton_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -647,23 +777,57 @@ class svn_client_ctx_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -673,7 +837,7 @@ class svn_client_ctx_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -689,237 +853,201 @@ svn_client_ctx_t_swigregister = _client.svn_client_ctx_t_swigregister
 svn_client_ctx_t_swigregister(svn_client_ctx_t)
 
 
-def svn_client_create_context2(*args):
+def svn_client_create_context2(*args) -> "svn_client_ctx_t **":
     """svn_client_create_context2(apr_hash_t cfg_hash, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_create_context2(*args)
 
-def svn_client_create_context(*args):
+def svn_client_create_context(*args) -> "svn_client_ctx_t **":
     """svn_client_create_context(apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_create_context(*args)
 SVN_CLIENT_AUTH_USERNAME = _client.SVN_CLIENT_AUTH_USERNAME
 SVN_CLIENT_AUTH_PASSWORD = _client.SVN_CLIENT_AUTH_PASSWORD
 
-def svn_client_args_to_target_array2(*args):
+def svn_client_args_to_target_array2(*args) -> "apr_array_header_t **":
     """svn_client_args_to_target_array2(apr_getopt_t * os, apr_array_header_t known_targets, svn_client_ctx_t ctx, svn_boolean_t keep_last_origpath_on_truepath_collision, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_args_to_target_array2(*args)
 
-def svn_client_args_to_target_array(*args):
+def svn_client_args_to_target_array(*args) -> "apr_array_header_t **":
     """svn_client_args_to_target_array(apr_getopt_t * os, apr_array_header_t known_targets, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_args_to_target_array(*args)
 
-def svn_client_checkout3(*args):
+def svn_client_checkout3(*args) -> "svn_revnum_t *":
     """svn_client_checkout3(char const * URL, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_checkout3(*args)
 
-def svn_client_checkout2(*args):
+def svn_client_checkout2(*args) -> "svn_revnum_t *":
     """svn_client_checkout2(char const * URL, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_checkout2(*args)
 
-def svn_client_checkout(*args):
+def svn_client_checkout(*args) -> "svn_revnum_t *":
     """svn_client_checkout(char const * URL, char const * path, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_checkout(*args)
 
-def svn_client_update4(*args):
+def svn_client_update4(*args) -> "apr_array_header_t **":
     """svn_client_update4(apr_array_header_t paths, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t make_parents, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_update4(*args)
 
-def svn_client_update3(*args):
+def svn_client_update3(*args) -> "apr_array_header_t **":
     """svn_client_update3(apr_array_header_t paths, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_update3(*args)
 
-def svn_client_update2(*args):
+def svn_client_update2(*args) -> "apr_array_header_t **":
     """svn_client_update2(apr_array_header_t paths, svn_opt_revision_t revision, svn_boolean_t recurse, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_update2(*args)
 
-def svn_client_update(*args):
+def svn_client_update(*args) -> "svn_revnum_t *":
     """svn_client_update(char const * path, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_update(*args)
 
-def svn_client_switch3(*args):
+def svn_client_switch3(*args) -> "svn_revnum_t *":
     """svn_client_switch3(char const * path, char const * url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_boolean_t ignore_ancestry, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_switch3(*args)
 
-def svn_client_switch2(*args):
+def svn_client_switch2(*args) -> "svn_revnum_t *":
     """svn_client_switch2(char const * path, char const * url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_switch2(*args)
 
-def svn_client_switch(*args):
+def svn_client_switch(*args) -> "svn_revnum_t *":
     """svn_client_switch(char const * path, char const * url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_switch(*args)
 
-def svn_client__layout_list(*args):
+def svn_client__layout_list(*args) -> "svn_error_t *":
     """svn_client__layout_list(char const * local_abspath, svn_client__layout_func_t layout, void * layout_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client__layout_list(*args)
 
-def svn_client_add5(*args):
+def svn_client_add5(*args) -> "svn_error_t *":
     """svn_client_add5(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t no_autoprops, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_add5(*args)
 
-def svn_client_add4(*args):
+def svn_client_add4(*args) -> "svn_error_t *":
     """svn_client_add4(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_add4(*args)
 
-def svn_client_add3(*args):
+def svn_client_add3(*args) -> "svn_error_t *":
     """svn_client_add3(char const * path, svn_boolean_t recursive, svn_boolean_t force, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_add3(*args)
 
-def svn_client_add2(*args):
+def svn_client_add2(*args) -> "svn_error_t *":
     """svn_client_add2(char const * path, svn_boolean_t recursive, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_add2(*args)
 
-def svn_client_add(*args):
+def svn_client_add(*args) -> "svn_error_t *":
     """svn_client_add(char const * path, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_add(*args)
 
-def svn_client_mkdir4(*args):
+def svn_client_mkdir4(*args) -> "svn_error_t *":
     """svn_client_mkdir4(apr_array_header_t paths, svn_boolean_t make_parents, 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_mkdir4(*args)
 
-def svn_client_mkdir3(*args):
+def svn_client_mkdir3(*args) -> "svn_commit_info_t **":
     """svn_client_mkdir3(apr_array_header_t paths, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_mkdir3(*args)
 
-def svn_client_mkdir2(*args):
+def svn_client_mkdir2(*args) -> "svn_commit_info_t **":
     """svn_client_mkdir2(apr_array_header_t paths, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_mkdir2(*args)
 
-def svn_client_mkdir(*args):
+def svn_client_mkdir(*args) -> "svn_client_commit_info_t **":
     """svn_client_mkdir(apr_array_header_t paths, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_mkdir(*args)
 
-def svn_client_delete4(*args):
+def svn_client_delete4(*args) -> "svn_error_t *":
     """svn_client_delete4(apr_array_header_t paths, svn_boolean_t force, svn_boolean_t keep_local, 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_delete4(*args)
 
-def svn_client_delete3(*args):
+def svn_client_delete3(*args) -> "svn_commit_info_t **":
     """svn_client_delete3(apr_array_header_t paths, svn_boolean_t force, svn_boolean_t keep_local, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_delete3(*args)
 
-def svn_client_delete2(*args):
+def svn_client_delete2(*args) -> "svn_commit_info_t **":
     """svn_client_delete2(apr_array_header_t paths, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_delete2(*args)
 
-def svn_client_delete(*args):
+def svn_client_delete(*args) -> "svn_client_commit_info_t **":
     """svn_client_delete(apr_array_header_t paths, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_delete(*args)
 
-def svn_client_import5(*args):
+def svn_client_import5(*args) -> "svn_error_t *":
     """svn_client_import5(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t no_autoprops, svn_boolean_t ignore_unknown_node_types, apr_hash_t revprop_table, svn_client_import_filter_func_t filter_callback, void * filter_baton, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_import5(*args)
 
-def svn_client_import4(*args):
+def svn_client_import4(*args) -> "svn_error_t *":
     """svn_client_import4(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t ignore_unknown_node_types, 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_import4(*args)
 
-def svn_client_import3(*args):
+def svn_client_import3(*args) -> "svn_commit_info_t **":
     """svn_client_import3(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t ignore_unknown_node_types, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_import3(*args)
 
-def svn_client_import2(*args):
+def svn_client_import2(*args) -> "svn_commit_info_t **":
     """svn_client_import2(char const * path, char const * url, svn_boolean_t nonrecursive, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_import2(*args)
 
-def svn_client_import(*args):
+def svn_client_import(*args) -> "svn_client_commit_info_t **":
     """svn_client_import(char const * path, char const * url, svn_boolean_t nonrecursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_import(*args)
 
-def svn_client_commit6(*args):
+def svn_client_commit6(*args) -> "svn_error_t *":
     """svn_client_commit6(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, svn_boolean_t commit_as_operations, svn_boolean_t include_file_externals, svn_boolean_t include_dir_externals, apr_array_header_t changelists, 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_commit6(*args)
 
-def svn_client_commit5(*args):
+def svn_client_commit5(*args) -> "svn_error_t *":
     """svn_client_commit5(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, svn_boolean_t commit_as_operations, apr_array_header_t changelists, 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_commit5(*args)
 
-def svn_client_commit4(*args):
+def svn_client_commit4(*args) -> "svn_commit_info_t **":
     """svn_client_commit4(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, apr_array_header_t changelists, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_commit4(*args)
 
-def svn_client_commit3(*args):
+def svn_client_commit3(*args) -> "svn_commit_info_t **":
     """svn_client_commit3(apr_array_header_t targets, svn_boolean_t recurse, svn_boolean_t keep_locks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_commit3(*args)
 
-def svn_client_commit2(*args):
+def svn_client_commit2(*args) -> "svn_client_commit_info_t **":
     """svn_client_commit2(apr_array_header_t targets, svn_boolean_t recurse, svn_boolean_t keep_locks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_commit2(*args)
 
-def svn_client_commit(*args):
+def svn_client_commit(*args) -> "svn_client_commit_info_t **":
     """svn_client_commit(apr_array_header_t targets, svn_boolean_t nonrecursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_commit(*args)
-class svn_client_status_t:
+class svn_client_status_t(object):
     """Proxy of C svn_client_status_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_status_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_status_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["kind"] = _client.svn_client_status_t_kind_set
-    __swig_getmethods__["kind"] = _client.svn_client_status_t_kind_get
-    __swig_setmethods__["local_abspath"] = _client.svn_client_status_t_local_abspath_set
-    __swig_getmethods__["local_abspath"] = _client.svn_client_status_t_local_abspath_get
-    __swig_setmethods__["filesize"] = _client.svn_client_status_t_filesize_set
-    __swig_getmethods__["filesize"] = _client.svn_client_status_t_filesize_get
-    __swig_setmethods__["versioned"] = _client.svn_client_status_t_versioned_set
-    __swig_getmethods__["versioned"] = _client.svn_client_status_t_versioned_get
-    __swig_setmethods__["conflicted"] = _client.svn_client_status_t_conflicted_set
-    __swig_getmethods__["conflicted"] = _client.svn_client_status_t_conflicted_get
-    __swig_setmethods__["node_status"] = _client.svn_client_status_t_node_status_set
-    __swig_getmethods__["node_status"] = _client.svn_client_status_t_node_status_get
-    __swig_setmethods__["text_status"] = _client.svn_client_status_t_text_status_set
-    __swig_getmethods__["text_status"] = _client.svn_client_status_t_text_status_get
-    __swig_setmethods__["prop_status"] = _client.svn_client_status_t_prop_status_set
-    __swig_getmethods__["prop_status"] = _client.svn_client_status_t_prop_status_get
-    __swig_setmethods__["wc_is_locked"] = _client.svn_client_status_t_wc_is_locked_set
-    __swig_getmethods__["wc_is_locked"] = _client.svn_client_status_t_wc_is_locked_get
-    __swig_setmethods__["copied"] = _client.svn_client_status_t_copied_set
-    __swig_getmethods__["copied"] = _client.svn_client_status_t_copied_get
-    __swig_setmethods__["repos_root_url"] = _client.svn_client_status_t_repos_root_url_set
-    __swig_getmethods__["repos_root_url"] = _client.svn_client_status_t_repos_root_url_get
-    __swig_setmethods__["repos_uuid"] = _client.svn_client_status_t_repos_uuid_set
-    __swig_getmethods__["repos_uuid"] = _client.svn_client_status_t_repos_uuid_get
-    __swig_setmethods__["repos_relpath"] = _client.svn_client_status_t_repos_relpath_set
-    __swig_getmethods__["repos_relpath"] = _client.svn_client_status_t_repos_relpath_get
-    __swig_setmethods__["revision"] = _client.svn_client_status_t_revision_set
-    __swig_getmethods__["revision"] = _client.svn_client_status_t_revision_get
-    __swig_setmethods__["changed_rev"] = _client.svn_client_status_t_changed_rev_set
-    __swig_getmethods__["changed_rev"] = _client.svn_client_status_t_changed_rev_get
-    __swig_setmethods__["changed_date"] = _client.svn_client_status_t_changed_date_set
-    __swig_getmethods__["changed_date"] = _client.svn_client_status_t_changed_date_get
-    __swig_setmethods__["changed_author"] = _client.svn_client_status_t_changed_author_set
-    __swig_getmethods__["changed_author"] = _client.svn_client_status_t_changed_author_get
-    __swig_setmethods__["switched"] = _client.svn_client_status_t_switched_set
-    __swig_getmethods__["switched"] = _client.svn_client_status_t_switched_get
-    __swig_setmethods__["file_external"] = _client.svn_client_status_t_file_external_set
-    __swig_getmethods__["file_external"] = _client.svn_client_status_t_file_external_get
-    __swig_setmethods__["lock"] = _client.svn_client_status_t_lock_set
-    __swig_getmethods__["lock"] = _client.svn_client_status_t_lock_get
-    __swig_setmethods__["changelist"] = _client.svn_client_status_t_changelist_set
-    __swig_getmethods__["changelist"] = _client.svn_client_status_t_changelist_get
-    __swig_setmethods__["depth"] = _client.svn_client_status_t_depth_set
-    __swig_getmethods__["depth"] = _client.svn_client_status_t_depth_get
-    __swig_setmethods__["ood_kind"] = _client.svn_client_status_t_ood_kind_set
-    __swig_getmethods__["ood_kind"] = _client.svn_client_status_t_ood_kind_get
-    __swig_setmethods__["repos_node_status"] = _client.svn_client_status_t_repos_node_status_set
-    __swig_getmethods__["repos_node_status"] = _client.svn_client_status_t_repos_node_status_get
-    __swig_setmethods__["repos_text_status"] = _client.svn_client_status_t_repos_text_status_set
-    __swig_getmethods__["repos_text_status"] = _client.svn_client_status_t_repos_text_status_get
-    __swig_setmethods__["repos_prop_status"] = _client.svn_client_status_t_repos_prop_status_set
-    __swig_getmethods__["repos_prop_status"] = _client.svn_client_status_t_repos_prop_status_get
-    __swig_setmethods__["repos_lock"] = _client.svn_client_status_t_repos_lock_set
-    __swig_getmethods__["repos_lock"] = _client.svn_client_status_t_repos_lock_get
-    __swig_setmethods__["ood_changed_rev"] = _client.svn_client_status_t_ood_changed_rev_set
-    __swig_getmethods__["ood_changed_rev"] = _client.svn_client_status_t_ood_changed_rev_get
-    __swig_setmethods__["ood_changed_date"] = _client.svn_client_status_t_ood_changed_date_set
-    __swig_getmethods__["ood_changed_date"] = _client.svn_client_status_t_ood_changed_date_get
-    __swig_setmethods__["ood_changed_author"] = _client.svn_client_status_t_ood_changed_author_set
-    __swig_getmethods__["ood_changed_author"] = _client.svn_client_status_t_ood_changed_author_get
-    __swig_setmethods__["backwards_compatibility_baton"] = _client.svn_client_status_t_backwards_compatibility_baton_set
-    __swig_getmethods__["backwards_compatibility_baton"] = _client.svn_client_status_t_backwards_compatibility_baton_get
-    __swig_setmethods__["moved_from_abspath"] = _client.svn_client_status_t_moved_from_abspath_set
-    __swig_getmethods__["moved_from_abspath"] = _client.svn_client_status_t_moved_from_abspath_get
-    __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
+    kind = _swig_property(_client.svn_client_status_t_kind_get, _client.svn_client_status_t_kind_set)
+    local_abspath = _swig_property(_client.svn_client_status_t_local_abspath_get, _client.svn_client_status_t_local_abspath_set)
+    filesize = _swig_property(_client.svn_client_status_t_filesize_get, _client.svn_client_status_t_filesize_set)
+    versioned = _swig_property(_client.svn_client_status_t_versioned_get, _client.svn_client_status_t_versioned_set)
+    conflicted = _swig_property(_client.svn_client_status_t_conflicted_get, _client.svn_client_status_t_conflicted_set)
+    node_status = _swig_property(_client.svn_client_status_t_node_status_get, _client.svn_client_status_t_node_status_set)
+    text_status = _swig_property(_client.svn_client_status_t_text_status_get, _client.svn_client_status_t_text_status_set)
+    prop_status = _swig_property(_client.svn_client_status_t_prop_status_get, _client.svn_client_status_t_prop_status_set)
+    wc_is_locked = _swig_property(_client.svn_client_status_t_wc_is_locked_get, _client.svn_client_status_t_wc_is_locked_set)
+    copied = _swig_property(_client.svn_client_status_t_copied_get, _client.svn_client_status_t_copied_set)
+    repos_root_url = _swig_property(_client.svn_client_status_t_repos_root_url_get, _client.svn_client_status_t_repos_root_url_set)
+    repos_uuid = _swig_property(_client.svn_client_status_t_repos_uuid_get, _client.svn_client_status_t_repos_uuid_set)
+    repos_relpath = _swig_property(_client.svn_client_status_t_repos_relpath_get, _client.svn_client_status_t_repos_relpath_set)
+    revision = _swig_property(_client.svn_client_status_t_revision_get, _client.svn_client_status_t_revision_set)
+    changed_rev = _swig_property(_client.svn_client_status_t_changed_rev_get, _client.svn_client_status_t_changed_rev_set)
+    changed_date = _swig_property(_client.svn_client_status_t_changed_date_get, _client.svn_client_status_t_changed_date_set)
+    changed_author = _swig_property(_client.svn_client_status_t_changed_author_get, _client.svn_client_status_t_changed_author_set)
+    switched = _swig_property(_client.svn_client_status_t_switched_get, _client.svn_client_status_t_switched_set)
+    file_external = _swig_property(_client.svn_client_status_t_file_external_get, _client.svn_client_status_t_file_external_set)
+    lock = _swig_property(_client.svn_client_status_t_lock_get, _client.svn_client_status_t_lock_set)
+    changelist = _swig_property(_client.svn_client_status_t_changelist_get, _client.svn_client_status_t_changelist_set)
+    depth = _swig_property(_client.svn_client_status_t_depth_get, _client.svn_client_status_t_depth_set)
+    ood_kind = _swig_property(_client.svn_client_status_t_ood_kind_get, _client.svn_client_status_t_ood_kind_set)
+    repos_node_status = _swig_property(_client.svn_client_status_t_repos_node_status_get, _client.svn_client_status_t_repos_node_status_set)
+    repos_text_status = _swig_property(_client.svn_client_status_t_repos_text_status_get, _client.svn_client_status_t_repos_text_status_set)
+    repos_prop_status = _swig_property(_client.svn_client_status_t_repos_prop_status_get, _client.svn_client_status_t_repos_prop_status_set)
+    repos_lock = _swig_property(_client.svn_client_status_t_repos_lock_get, _client.svn_client_status_t_repos_lock_set)
+    ood_changed_rev = _swig_property(_client.svn_client_status_t_ood_changed_rev_get, _client.svn_client_status_t_ood_changed_rev_set)
+    ood_changed_date = _swig_property(_client.svn_client_status_t_ood_changed_date_get, _client.svn_client_status_t_ood_changed_date_set)
+    ood_changed_author = _swig_property(_client.svn_client_status_t_ood_changed_author_get, _client.svn_client_status_t_ood_changed_author_set)
+    backwards_compatibility_baton = _swig_property(_client.svn_client_status_t_backwards_compatibility_baton_get, _client.svn_client_status_t_backwards_compatibility_baton_set)
+    moved_from_abspath = _swig_property(_client.svn_client_status_t_moved_from_abspath_get, _client.svn_client_status_t_moved_from_abspath_set)
+    moved_to_abspath = _swig_property(_client.svn_client_status_t_moved_to_abspath_get, _client.svn_client_status_t_moved_to_abspath_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -934,23 +1062,57 @@ class svn_client_status_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -960,7 +1122,7 @@ class svn_client_status_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -976,259 +1138,259 @@ svn_client_status_t_swigregister = _client.svn_client_status_t_swigregister
 svn_client_status_t_swigregister(svn_client_status_t)
 
 
-def svn_client_status_dup(*args):
+def svn_client_status_dup(*args) -> "svn_client_status_t *":
     """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"""
+def svn_client_status6(*args) -> "svn_revnum_t *":
+    """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, 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, svn_boolean_t get_all, svn_boolean_t update, 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"""
+def svn_client_status5(*args) -> "svn_revnum_t *":
+    """svn_client_status5(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 update, 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, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_status5(*args)
 
-def svn_client_status4(*args):
+def svn_client_status4(*args) -> "svn_revnum_t *":
     """svn_client_status4(char const * path, svn_opt_revision_t revision, svn_wc_status_func3_t status_func, void * status_baton, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_status4(*args)
 
-def svn_client_status3(*args):
+def svn_client_status3(*args) -> "svn_revnum_t *":
     """svn_client_status3(char const * path, svn_opt_revision_t revision, svn_wc_status_func2_t status_func, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_status3(*args)
 
-def svn_client_status2(*args):
+def svn_client_status2(*args) -> "svn_revnum_t *":
     """svn_client_status2(char const * path, svn_opt_revision_t revision, svn_wc_status_func2_t status_func, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_status2(*args)
 
-def svn_client_status(*args):
+def svn_client_status(*args) -> "svn_revnum_t *":
     """svn_client_status(char const * path, svn_opt_revision_t revision, svn_wc_status_func_t status_func, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_status(*args)
 
-def svn_client_log5(*args):
+def svn_client_log5(*args) -> "svn_error_t *":
     """svn_client_log5(apr_array_header_t targets, svn_opt_revision_t peg_revision, apr_array_header_t revision_ranges, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_log_entry_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_log5(*args)
 
-def svn_client_log4(*args):
+def svn_client_log4(*args) -> "svn_error_t *":
     """svn_client_log4(apr_array_header_t targets, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_log_entry_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_log4(*args)
 
-def svn_client_log3(*args):
+def svn_client_log3(*args) -> "svn_error_t *":
     """svn_client_log3(apr_array_header_t targets, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_log3(*args)
 
-def svn_client_log2(*args):
+def svn_client_log2(*args) -> "svn_error_t *":
     """svn_client_log2(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_log2(*args)
 
-def svn_client_log(*args):
+def svn_client_log(*args) -> "svn_error_t *":
     """svn_client_log(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_log(*args)
 
-def svn_client_blame6(*args):
+def svn_client_blame6(*args) -> "svn_revnum_t *, svn_revnum_t *":
     """svn_client_blame6(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver4_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_blame6(*args)
 
-def svn_client_blame5(*args):
+def svn_client_blame5(*args) -> "svn_error_t *":
     """svn_client_blame5(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver3_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_blame5(*args)
 
-def svn_client_blame4(*args):
+def svn_client_blame4(*args) -> "svn_error_t *":
     """svn_client_blame4(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_blame4(*args)
 
-def svn_client_blame3(*args):
+def svn_client_blame3(*args) -> "svn_error_t *":
     """svn_client_blame3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_blame3(*args)
 
-def svn_client_blame2(*args):
+def svn_client_blame2(*args) -> "svn_error_t *":
     """svn_client_blame2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_blame2(*args)
 
-def svn_client_blame(*args):
+def svn_client_blame(*args) -> "svn_error_t *":
     """svn_client_blame(char const * path_or_url, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_blame(*args)
 
-def svn_client_diff7(*args):
+def svn_client_diff7(*args) -> "svn_error_t *":
     """svn_client_diff7(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff7(*args)
 
-def svn_client_diff6(*args):
+def svn_client_diff6(*args) -> "svn_error_t *":
     """svn_client_diff6(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff6(*args)
 
-def svn_client_diff5(*args):
+def svn_client_diff5(*args) -> "svn_error_t *":
     """svn_client_diff5(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t use_git_diff_format, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff5(*args)
 
-def svn_client_diff4(*args):
+def svn_client_diff4(*args) -> "svn_error_t *":
     """svn_client_diff4(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff4(*args)
 
-def svn_client_diff3(*args):
+def svn_client_diff3(*args) -> "svn_error_t *":
     """svn_client_diff3(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff3(*args)
 
-def svn_client_diff2(*args):
+def svn_client_diff2(*args) -> "svn_error_t *":
     """svn_client_diff2(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff2(*args)
 
-def svn_client_diff(*args):
+def svn_client_diff(*args) -> "svn_error_t *":
     """svn_client_diff(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff(*args)
 
-def svn_client_diff_peg7(*args):
+def svn_client_diff_peg7(*args) -> "svn_error_t *":
     """svn_client_diff_peg7(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_peg7(*args)
 
-def svn_client_diff_peg6(*args):
+def svn_client_diff_peg6(*args) -> "svn_error_t *":
     """svn_client_diff_peg6(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_peg6(*args)
 
-def svn_client_diff_peg5(*args):
+def svn_client_diff_peg5(*args) -> "svn_error_t *":
     """svn_client_diff_peg5(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t use_git_diff_format, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_peg5(*args)
 
-def svn_client_diff_peg4(*args):
+def svn_client_diff_peg4(*args) -> "svn_error_t *":
     """svn_client_diff_peg4(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_peg4(*args)
 
-def svn_client_diff_peg3(*args):
+def svn_client_diff_peg3(*args) -> "svn_error_t *":
     """svn_client_diff_peg3(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_peg3(*args)
 
-def svn_client_diff_peg2(*args):
+def svn_client_diff_peg2(*args) -> "svn_error_t *":
     """svn_client_diff_peg2(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_peg2(*args)
 
-def svn_client_diff_peg(*args):
+def svn_client_diff_peg(*args) -> "svn_error_t *":
     """svn_client_diff_peg(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_peg(*args)
 
-def svn_client_diff_summarize2(*args):
+def svn_client_diff_summarize2(*args) -> "svn_error_t *":
     """svn_client_diff_summarize2(char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, svn_depth_t depth, svn_boolean_t ignore_ancestry, apr_array_header_t changelists, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_summarize2(*args)
 
-def svn_client_diff_summarize(*args):
+def svn_client_diff_summarize(*args) -> "svn_error_t *":
     """svn_client_diff_summarize(char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_summarize(*args)
 
-def svn_client_diff_summarize_peg2(*args):
+def svn_client_diff_summarize_peg2(*args) -> "svn_error_t *":
     """svn_client_diff_summarize_peg2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_depth_t depth, svn_boolean_t ignore_ancestry, apr_array_header_t changelists, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_summarize_peg2(*args)
 
-def svn_client_diff_summarize_peg(*args):
+def svn_client_diff_summarize_peg(*args) -> "svn_error_t *":
     """svn_client_diff_summarize_peg(char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_diff_summarize_peg(*args)
 
-def svn_client_get_merging_summary(*args):
+def svn_client_get_merging_summary(*args) -> "svn_boolean_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **":
     """svn_client_get_merging_summary(char const * source_path_or_url, svn_opt_revision_t source_revision, char const * target_path_or_url, svn_opt_revision_t target_revision, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_get_merging_summary(*args)
 
-def svn_client_merge5(*args):
+def svn_client_merge5(*args) -> "svn_error_t *":
     """svn_client_merge5(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge5(*args)
 
-def svn_client_merge4(*args):
+def svn_client_merge4(*args) -> "svn_error_t *":
     """svn_client_merge4(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge4(*args)
 
-def svn_client_merge3(*args):
+def svn_client_merge3(*args) -> "svn_error_t *":
     """svn_client_merge3(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge3(*args)
 
-def svn_client_merge2(*args):
+def svn_client_merge2(*args) -> "svn_error_t *":
     """svn_client_merge2(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge2(*args)
 
-def svn_client_merge(*args):
+def svn_client_merge(*args) -> "svn_error_t *":
     """svn_client_merge(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge(*args)
 
-def svn_client_merge_reintegrate(*args):
+def svn_client_merge_reintegrate(*args) -> "svn_error_t *":
     """svn_client_merge_reintegrate(char const * source_path_or_url, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge_reintegrate(*args)
 
-def svn_client_merge_peg5(*args):
+def svn_client_merge_peg5(*args) -> "svn_error_t *":
     """svn_client_merge_peg5(char const * source_path_or_url, apr_array_header_t ranges_to_merge, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge_peg5(*args)
 
-def svn_client_merge_peg4(*args):
+def svn_client_merge_peg4(*args) -> "svn_error_t *":
     """svn_client_merge_peg4(char const * source_path_or_url, apr_array_header_t ranges_to_merge, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge_peg4(*args)
 
-def svn_client_merge_peg3(*args):
+def svn_client_merge_peg3(*args) -> "svn_error_t *":
     """svn_client_merge_peg3(char const * source, apr_array_header_t ranges_to_merge, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge_peg3(*args)
 
-def svn_client_merge_peg2(*args):
+def svn_client_merge_peg2(*args) -> "svn_error_t *":
     """svn_client_merge_peg2(char const * source, svn_opt_revision_t revision1, svn_opt_revision_t revision2, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge_peg2(*args)
 
-def svn_client_merge_peg(*args):
+def svn_client_merge_peg(*args) -> "svn_error_t *":
     """svn_client_merge_peg(char const * source, svn_opt_revision_t revision1, svn_opt_revision_t revision2, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_merge_peg(*args)
 
-def svn_client_suggest_merge_sources(*args):
+def svn_client_suggest_merge_sources(*args) -> "apr_array_header_t **":
     """svn_client_suggest_merge_sources(char const * path_or_url, svn_opt_revision_t peg_revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_suggest_merge_sources(*args)
 
-def svn_client_mergeinfo_get_merged(*args):
+def svn_client_mergeinfo_get_merged(*args) -> "apr_hash_t **":
     """svn_client_mergeinfo_get_merged(char const * path_or_url, svn_opt_revision_t peg_revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_mergeinfo_get_merged(*args)
 
-def svn_client_mergeinfo_log2(*args):
+def svn_client_mergeinfo_log2(*args) -> "svn_error_t *":
     """svn_client_mergeinfo_log2(svn_boolean_t finding_merged, char const * target_path_or_url, svn_opt_revision_t target_peg_revision, char const * source_path_or_url, svn_opt_revision_t source_peg_revision, svn_opt_revision_t source_start_revision, svn_opt_revision_t source_end_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, svn_depth_t depth, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_mergeinfo_log2(*args)
 
-def svn_client_mergeinfo_log(*args):
+def svn_client_mergeinfo_log(*args) -> "svn_error_t *":
     """svn_client_mergeinfo_log(svn_boolean_t finding_merged, char const * target_path_or_url, svn_opt_revision_t target_peg_revision, char const * source_path_or_url, svn_opt_revision_t source_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, svn_depth_t depth, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_mergeinfo_log(*args)
 
-def svn_client_mergeinfo_log_merged(*args):
+def svn_client_mergeinfo_log_merged(*args) -> "svn_error_t *":
     """svn_client_mergeinfo_log_merged(char const * path_or_url, svn_opt_revision_t peg_revision, char const * merge_source_path_or_url, svn_opt_revision_t src_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_mergeinfo_log_merged(*args)
 
-def svn_client_mergeinfo_log_eligible(*args):
+def svn_client_mergeinfo_log_eligible(*args) -> "svn_error_t *":
     """svn_client_mergeinfo_log_eligible(char const * path_or_url, svn_opt_revision_t peg_revision, char const * merge_source_path_or_url, svn_opt_revision_t src_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_mergeinfo_log_eligible(*args)
 
-def svn_client_vacuum(*args):
+def svn_client_vacuum(*args) -> "svn_error_t *":
     """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):
+def svn_client_cleanup2(*args) -> "svn_error_t *":
     """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):
+def svn_client_cleanup(*args) -> "svn_error_t *":
     """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)
 
-def svn_client_upgrade(*args):
+def svn_client_upgrade(*args) -> "svn_error_t *":
     """svn_client_upgrade(char const * wcroot_dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_upgrade(*args)
 
-def svn_client_relocate2(*args):
+def svn_client_relocate2(*args) -> "svn_error_t *":
     """svn_client_relocate2(char const * wcroot_dir, char const * from_prefix, char const * to_prefix, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_relocate2(*args)
 
-def svn_client_relocate(*args):
+def svn_client_relocate(*args) -> "svn_error_t *":
     """svn_client_relocate(char const * dir, char const * from_prefix, char const * to_prefix, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_relocate(*args)
 
-def svn_client_revert4(*args):
+def svn_client_revert4(*args) -> "svn_error_t *":
     """svn_client_revert4(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_boolean_t added_keep_local, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_revert4(*args)
 
-def svn_client_revert3(*args):
+def svn_client_revert3(*args) -> "svn_error_t *":
     """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):
+def svn_client_revert2(*args) -> "svn_error_t *":
     """svn_client_revert2(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_revert2(*args)
 
-def svn_client_revert(*args):
+def svn_client_revert(*args) -> "svn_error_t *":
     """svn_client_revert(apr_array_header_t paths, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_revert(*args)
 svn_client_conflict_option_undefined = _client.svn_client_conflict_option_undefined
@@ -1262,203 +1424,197 @@ svn_client_conflict_option_both_moved_file_move_merge = _client.svn_client_confl
 svn_client_conflict_option_both_moved_dir_merge = _client.svn_client_conflict_option_both_moved_dir_merge
 svn_client_conflict_option_both_moved_dir_move_merge = _client.svn_client_conflict_option_both_moved_dir_move_merge
 
-def svn_client_conflict_option_set_merged_propval(option, merged_propval):
+def svn_client_conflict_option_set_merged_propval(option: 'svn_client_conflict_option_t *', merged_propval: 'svn_string_t const *') -> "void":
     """svn_client_conflict_option_set_merged_propval(svn_client_conflict_option_t * option, svn_string_t const * merged_propval)"""
     return _client.svn_client_conflict_option_set_merged_propval(option, merged_propval)
 
-def svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args):
+def svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args) -> "apr_array_header_t **":
     """svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args)
 
-def svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args):
+def svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args) -> "apr_array_header_t **":
     """svn_client_conflict_option_get_moved_to_repos_relpath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args)
 
-def svn_client_conflict_option_set_moved_to_repos_relpath2(*args):
+def svn_client_conflict_option_set_moved_to_repos_relpath2(*args) -> "svn_error_t *":
     """svn_client_conflict_option_set_moved_to_repos_relpath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_option_set_moved_to_repos_relpath2(*args)
 
-def svn_client_conflict_option_set_moved_to_repos_relpath(*args):
+def svn_client_conflict_option_set_moved_to_repos_relpath(*args) -> "svn_error_t *":
     """svn_client_conflict_option_set_moved_to_repos_relpath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_option_set_moved_to_repos_relpath(*args)
 
-def svn_client_conflict_option_get_moved_to_abspath_candidates2(*args):
+def svn_client_conflict_option_get_moved_to_abspath_candidates2(*args) -> "apr_array_header_t **":
     """svn_client_conflict_option_get_moved_to_abspath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_option_get_moved_to_abspath_candidates2(*args)
 
-def svn_client_conflict_option_get_moved_to_abspath_candidates(*args):
+def svn_client_conflict_option_get_moved_to_abspath_candidates(*args) -> "apr_array_header_t **":
     """svn_client_conflict_option_get_moved_to_abspath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_option_get_moved_to_abspath_candidates(*args)
 
-def svn_client_conflict_option_set_moved_to_abspath2(*args):
+def svn_client_conflict_option_set_moved_to_abspath2(*args) -> "svn_error_t *":
     """svn_client_conflict_option_set_moved_to_abspath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_option_set_moved_to_abspath2(*args)
 
-def svn_client_conflict_option_set_moved_to_abspath(*args):
+def svn_client_conflict_option_set_moved_to_abspath(*args) -> "svn_error_t *":
     """svn_client_conflict_option_set_moved_to_abspath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_option_set_moved_to_abspath(*args)
 
-def svn_client_conflict_option_find_by_id(options, option_id):
+def svn_client_conflict_option_find_by_id(options: 'apr_array_header_t', option_id: 'svn_client_conflict_option_id_t') -> "svn_client_conflict_option_t *":
     """svn_client_conflict_option_find_by_id(apr_array_header_t options, svn_client_conflict_option_id_t option_id) -> svn_client_conflict_option_t *"""
     return _client.svn_client_conflict_option_find_by_id(options, option_id)
 
-def svn_client_conflict_get(*args):
+def svn_client_conflict_get(*args) -> "svn_client_conflict_t **":
     """svn_client_conflict_get(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_get(*args)
 
-def svn_client_conflict_walk(*args):
+def svn_client_conflict_walk(*args) -> "svn_error_t *":
     """svn_client_conflict_walk(char const * local_abspath, svn_depth_t depth, svn_client_conflict_walk_func_t conflict_walk_func, void * conflict_walk_func_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_walk(*args)
 
-def svn_client_conflict_get_conflicted(*args):
+def svn_client_conflict_get_conflicted(*args) -> "svn_boolean_t *, apr_array_header_t **, svn_boolean_t *":
     """svn_client_conflict_get_conflicted(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_get_conflicted(*args)
 
-def svn_client_conflict_prop_get_description(*args):
+def svn_client_conflict_prop_get_description(*args) -> "char const **":
     """svn_client_conflict_prop_get_description(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_prop_get_description(*args)
 
-def svn_client_conflict_tree_get_description(*args):
+def svn_client_conflict_tree_get_description(*args) -> "char const **, char const **":
     """svn_client_conflict_tree_get_description(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_tree_get_description(*args)
 
-def svn_client_conflict_text_get_resolution_options(*args):
+def svn_client_conflict_text_get_resolution_options(*args) -> "apr_array_header_t **":
     """svn_client_conflict_text_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_text_get_resolution_options(*args)
 
-def svn_client_conflict_prop_get_resolution_options(*args):
+def svn_client_conflict_prop_get_resolution_options(*args) -> "apr_array_header_t **":
     """svn_client_conflict_prop_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_prop_get_resolution_options(*args)
 
-def svn_client_conflict_tree_get_resolution_options(*args):
+def svn_client_conflict_tree_get_resolution_options(*args) -> "apr_array_header_t **":
     """svn_client_conflict_tree_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_tree_get_resolution_options(*args)
 
-def svn_client_conflict_tree_get_details(*args):
+def svn_client_conflict_tree_get_details(*args) -> "svn_error_t *":
     """svn_client_conflict_tree_get_details(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_tree_get_details(*args)
 
-def svn_client_conflict_option_get_id(option):
+def svn_client_conflict_option_get_id(option: 'svn_client_conflict_option_t *') -> "svn_client_conflict_option_id_t":
     """svn_client_conflict_option_get_id(svn_client_conflict_option_t * option) -> svn_client_conflict_option_id_t"""
     return _client.svn_client_conflict_option_get_id(option)
 
-def svn_client_conflict_option_get_label(*args):
+def svn_client_conflict_option_get_label(*args) -> "char const *":
     """svn_client_conflict_option_get_label(svn_client_conflict_option_t * option, apr_pool_t result_pool) -> char const *"""
     return _client.svn_client_conflict_option_get_label(*args)
 
-def svn_client_conflict_option_get_description(*args):
+def svn_client_conflict_option_get_description(*args) -> "char const *":
     """svn_client_conflict_option_get_description(svn_client_conflict_option_t * option, apr_pool_t result_pool) -> char const *"""
     return _client.svn_client_conflict_option_get_description(*args)
 
-def svn_client_conflict_get_recommended_option_id(conflict):
+def svn_client_conflict_get_recommended_option_id(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t":
     """svn_client_conflict_get_recommended_option_id(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t"""
     return _client.svn_client_conflict_get_recommended_option_id(conflict)
 
-def svn_client_conflict_get_local_abspath(conflict):
+def svn_client_conflict_get_local_abspath(conflict: 'svn_client_conflict_t *') -> "char const *":
     """svn_client_conflict_get_local_abspath(svn_client_conflict_t * conflict) -> char const *"""
     return _client.svn_client_conflict_get_local_abspath(conflict)
 
-def svn_client_conflict_get_operation(conflict):
+def svn_client_conflict_get_operation(conflict: 'svn_client_conflict_t *') -> "svn_wc_operation_t":
     """svn_client_conflict_get_operation(svn_client_conflict_t * conflict) -> svn_wc_operation_t"""
     return _client.svn_client_conflict_get_operation(conflict)
 
-def svn_client_conflict_get_incoming_change(conflict):
+def svn_client_conflict_get_incoming_change(conflict: 'svn_client_conflict_t *') -> "svn_wc_conflict_action_t":
     """svn_client_conflict_get_incoming_change(svn_client_conflict_t * conflict) -> svn_wc_conflict_action_t"""
     return _client.svn_client_conflict_get_incoming_change(conflict)
 
-def svn_client_conflict_get_local_change(conflict):
+def svn_client_conflict_get_local_change(conflict: 'svn_client_conflict_t *') -> "svn_wc_conflict_reason_t":
     """svn_client_conflict_get_local_change(svn_client_conflict_t * conflict) -> svn_wc_conflict_reason_t"""
     return _client.svn_client_conflict_get_local_change(conflict)
 
-def svn_client_conflict_get_repos_info(*args):
+def svn_client_conflict_get_repos_info(*args) -> "char const **, char const **":
     """svn_client_conflict_get_repos_info(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_get_repos_info(*args)
 
-def svn_client_conflict_get_incoming_old_repos_location(*args):
+def svn_client_conflict_get_incoming_old_repos_location(*args) -> "char const **, svn_revnum_t *, svn_node_kind_t *":
     """svn_client_conflict_get_incoming_old_repos_location(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_get_incoming_old_repos_location(*args)
 
-def svn_client_conflict_get_incoming_new_repos_location(*args):
+def svn_client_conflict_get_incoming_new_repos_location(*args) -> "char const **, svn_revnum_t *, svn_node_kind_t *":
     """svn_client_conflict_get_incoming_new_repos_location(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_get_incoming_new_repos_location(*args)
 
-def svn_client_conflict_tree_get_victim_node_kind(conflict):
+def svn_client_conflict_tree_get_victim_node_kind(conflict: 'svn_client_conflict_t *') -> "svn_node_kind_t":
     """svn_client_conflict_tree_get_victim_node_kind(svn_client_conflict_t * conflict) -> svn_node_kind_t"""
     return _client.svn_client_conflict_tree_get_victim_node_kind(conflict)
 
-def svn_client_conflict_tree_resolve(*args):
+def svn_client_conflict_tree_resolve(*args) -> "svn_error_t *":
     """svn_client_conflict_tree_resolve(svn_client_conflict_t * conflict, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_tree_resolve(*args)
 
-def svn_client_conflict_tree_resolve_by_id(*args):
+def svn_client_conflict_tree_resolve_by_id(*args) -> "svn_error_t *":
     """svn_client_conflict_tree_resolve_by_id(svn_client_conflict_t * conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_tree_resolve_by_id(*args)
 
-def svn_client_conflict_tree_get_resolution(conflict):
+def svn_client_conflict_tree_get_resolution(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t":
     """svn_client_conflict_tree_get_resolution(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t"""
     return _client.svn_client_conflict_tree_get_resolution(conflict)
 
-def svn_client_conflict_prop_get_reject_abspath(conflict):
+def svn_client_conflict_prop_get_reject_abspath(conflict: 'svn_client_conflict_t *') -> "char const *":
     """svn_client_conflict_prop_get_reject_abspath(svn_client_conflict_t * conflict) -> char const *"""
     return _client.svn_client_conflict_prop_get_reject_abspath(conflict)
 
-def svn_client_conflict_prop_get_propvals(*args):
+def svn_client_conflict_prop_get_propvals(*args) -> "svn_string_t **, svn_string_t **, svn_string_t **, svn_string_t **":
     """svn_client_conflict_prop_get_propvals(svn_client_conflict_t * conflict, char const * propname, apr_pool_t result_pool) -> svn_error_t"""
     return _client.svn_client_conflict_prop_get_propvals(*args)
 
-def svn_client_conflict_prop_resolve(*args):
+def svn_client_conflict_prop_resolve(*args) -> "svn_error_t *":
     """svn_client_conflict_prop_resolve(svn_client_conflict_t * conflict, char const * propname, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_prop_resolve(*args)
 
-def svn_client_conflict_prop_resolve_by_id(*args):
+def svn_client_conflict_prop_resolve_by_id(*args) -> "svn_error_t *":
     """svn_client_conflict_prop_resolve_by_id(svn_client_conflict_t * conflict, char const * propname, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_prop_resolve_by_id(*args)
 
-def svn_client_conflict_prop_get_resolution(conflict, propname):
+def svn_client_conflict_prop_get_resolution(conflict: 'svn_client_conflict_t *', propname: 'char const *') -> "svn_client_conflict_option_id_t":
     """svn_client_conflict_prop_get_resolution(svn_client_conflict_t * conflict, char const * propname) -> svn_client_conflict_option_id_t"""
     return _client.svn_client_conflict_prop_get_resolution(conflict, propname)
 
-def svn_client_conflict_text_get_mime_type(conflict):
+def svn_client_conflict_text_get_mime_type(conflict: 'svn_client_conflict_t *') -> "char const *":
     """svn_client_conflict_text_get_mime_type(svn_client_conflict_t * conflict) -> char const *"""
     return _client.svn_client_conflict_text_get_mime_type(conflict)
 
-def svn_client_conflict_text_get_contents(*args):
+def svn_client_conflict_text_get_contents(*args) -> "char const **, char const **, char const **, char const **":
     """svn_client_conflict_text_get_contents(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_text_get_contents(*args)
 
-def svn_client_conflict_text_resolve(*args):
+def svn_client_conflict_text_resolve(*args) -> "svn_error_t *":
     """svn_client_conflict_text_resolve(svn_client_conflict_t * conflict, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_text_resolve(*args)
 
-def svn_client_conflict_text_resolve_by_id(*args):
+def svn_client_conflict_text_resolve_by_id(*args) -> "svn_error_t *":
     """svn_client_conflict_text_resolve_by_id(svn_client_conflict_t * conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_conflict_text_resolve_by_id(*args)
 
-def svn_client_conflict_text_get_resolution(conflict):
+def svn_client_conflict_text_get_resolution(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t":
     """svn_client_conflict_text_get_resolution(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t"""
     return _client.svn_client_conflict_text_get_resolution(conflict)
 
-def svn_client_resolved(*args):
+def svn_client_resolved(*args) -> "svn_error_t *":
     """svn_client_resolved(char const * path, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_resolved(*args)
 
-def svn_client_resolve(*args):
+def svn_client_resolve(*args) -> "svn_error_t *":
     """svn_client_resolve(char const * path, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_resolve(*args)
-class svn_client_copy_source_t:
+class svn_client_copy_source_t(object):
     """Proxy of C svn_client_copy_source_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_copy_source_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_copy_source_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _client.svn_client_copy_source_t_path_set
-    __swig_getmethods__["path"] = _client.svn_client_copy_source_t_path_get
-    __swig_setmethods__["revision"] = _client.svn_client_copy_source_t_revision_set
-    __swig_getmethods__["revision"] = _client.svn_client_copy_source_t_revision_get
-    __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
+    path = _swig_property(_client.svn_client_copy_source_t_path_get, _client.svn_client_copy_source_t_path_set)
+    revision = _swig_property(_client.svn_client_copy_source_t_revision_get, _client.svn_client_copy_source_t_revision_set)
+    peg_revision = _swig_property(_client.svn_client_copy_source_t_peg_revision_get, _client.svn_client_copy_source_t_peg_revision_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1473,23 +1629,57 @@ class svn_client_copy_source_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1499,7 +1689,7 @@ class svn_client_copy_source_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1515,580 +1705,245 @@ 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):
+def svn_client_copy7(*args) -> "svn_error_t *":
     """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):
+def svn_client_copy6(*args) -> "svn_error_t *":
     """svn_client_copy6(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, 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_copy6(*args)
 
-def svn_client_copy5(*args):
+def svn_client_copy5(*args) -> "svn_commit_info_t **":
     """svn_client_copy5(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, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_copy5(*args)
 
-def svn_client_copy4(*args):
+def svn_client_copy4(*args) -> "svn_commit_info_t **":
     """svn_client_copy4(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_copy4(*args)
 
-def svn_client_copy3(*args):
+def svn_client_copy3(*args) -> "svn_commit_info_t **":
     """svn_client_copy3(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_copy3(*args)
 
-def svn_client_copy2(*args):
+def svn_client_copy2(*args) -> "svn_commit_info_t **":
     """svn_client_copy2(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_copy2(*args)
 
-def svn_client_copy(*args):
+def svn_client_copy(*args) -> "svn_client_commit_info_t **":
     """svn_client_copy(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_copy(*args)
 
-def svn_client_move7(*args):
+def svn_client_move7(*args) -> "svn_error_t *":
     """svn_client_move7(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t move_as_child, svn_boolean_t make_parents, svn_boolean_t allow_mixed_revisions, svn_boolean_t metadata_only, 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_move7(*args)
 
-def svn_client_move6(*args):
+def svn_client_move6(*args) -> "svn_error_t *":
     """svn_client_move6(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t move_as_child, svn_boolean_t make_parents, 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_move6(*args)
 
-def svn_client_move5(*args):
+def svn_client_move5(*args) -> "svn_commit_info_t **":
     """svn_client_move5(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t force, svn_boolean_t move_as_child, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_move5(*args)
 
-def svn_client_move4(*args):
+def svn_client_move4(*args) -> "svn_commit_info_t **":
     """svn_client_move4(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_move4(*args)
 
-def svn_client_move3(*args):
+def svn_client_move3(*args) -> "svn_commit_info_t **":
     """svn_client_move3(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_move3(*args)
 
-def svn_client_move2(*args):
+def svn_client_move2(*args) -> "svn_client_commit_info_t **":
     """svn_client_move2(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_move2(*args)
 
-def svn_client_move(*args):
+def svn_client_move(*args) -> "svn_client_commit_info_t **":
     """svn_client_move(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_move(*args)
 
-def svn_client_propset_remote(*args):
+def svn_client_propset_remote(*args) -> "svn_error_t *":
     """svn_client_propset_remote(char const * propname, svn_string_t const * propval, char const * url, svn_boolean_t skip_checks, svn_revnum_t base_revision_for_url, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_propset_remote(*args)
 
-def svn_client_propset_local(*args):
+def svn_client_propset_local(*args) -> "svn_error_t *":
     """svn_client_propset_local(char const * propname, svn_string_t const * propval, apr_array_header_t targets, svn_depth_t depth, svn_boolean_t skip_checks, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_propset_local(*args)
 
-def svn_client_propset3(*args):
+def svn_client_propset3(*args) -> "svn_commit_info_t **":
     """svn_client_propset3(char const * propname, svn_string_t const * propval, char const * target, svn_depth_t depth, svn_boolean_t skip_checks, svn_revnum_t base_revision_for_url, apr_array_header_t changelists, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_propset3(*args)
 
-def svn_client_propset2(*args):
+def svn_client_propset2(*args) -> "svn_error_t *":
     """svn_client_propset2(char const * propname, svn_string_t const * propval, char const * target, svn_boolean_t recurse, svn_boolean_t skip_checks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_propset2(*args)
 
-def svn_client_propset(*args):
+def svn_client_propset(*args) -> "svn_error_t *":
     """svn_client_propset(char const * propname, svn_string_t const * propval, char const * target, svn_boolean_t recurse, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_propset(*args)
 
-def svn_client_revprop_set2(*args):
+def svn_client_revprop_set2(*args) -> "svn_revnum_t *":
     """svn_client_revprop_set2(char const * propname, svn_string_t const * propval, svn_string_t const * original_propval, char const * URL, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_revprop_set2(*args)
 
-def svn_client_revprop_set(*args):
+def svn_client_revprop_set(*args) -> "svn_revnum_t *":
     """svn_client_revprop_set(char const * propname, svn_string_t const * propval, char const * URL, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_revprop_set(*args)
 
-def svn_client_propget5(*args):
+def svn_client_propget5(*args) -> "apr_hash_t **, apr_array_header_t **, svn_revnum_t *":
     """svn_client_propget5(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_propget5(*args)
 
-def svn_client_propget4(*args):
+def svn_client_propget4(*args) -> "apr_hash_t **, svn_revnum_t *":
     """svn_client_propget4(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_propget4(*args)
 
-def svn_client_propget3(*args):
+def svn_client_propget3(*args) -> "apr_hash_t **, svn_revnum_t *":
     """svn_client_propget3(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_propget3(*args)
 
-def svn_client_propget2(*args):
+def svn_client_propget2(*args) -> "apr_hash_t **":
     """svn_client_propget2(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_propget2(*args)
 
-def svn_client_propget(*args):
+def svn_client_propget(*args) -> "apr_hash_t **":
     """svn_client_propget(char const * propname, char const * target, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_propget(*args)
 
-def svn_client_revprop_get(*args):
+def svn_client_revprop_get(*args) -> "svn_string_t **, svn_revnum_t *":
     """svn_client_revprop_get(char const * propname, char const * URL, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_revprop_get(*args)
 
-def svn_client_proplist4(*args):
+def svn_client_proplist4(*args) -> "svn_error_t *":
     """svn_client_proplist4(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t get_target_inherited_props, svn_proplist_receiver2_t receiver, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_proplist4(*args)
 
-def svn_client_proplist3(*args):
+def svn_client_proplist3(*args) -> "svn_error_t *":
     """svn_client_proplist3(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_proplist_receiver_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_proplist3(*args)
 
-def svn_client_proplist2(*args):
+def svn_client_proplist2(*args) -> "apr_array_header_t **":
     """svn_client_proplist2(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_proplist2(*args)
 
-def svn_client_proplist(*args):
+def svn_client_proplist(*args) -> "apr_array_header_t **":
     """svn_client_proplist(char const * target, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_proplist(*args)
 
-def svn_client_revprop_list(*args):
+def svn_client_revprop_list(*args) -> "apr_hash_t **, svn_revnum_t *":
     """svn_client_revprop_list(char const * URL, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_revprop_list(*args)
 
-def svn_client_export5(*args):
+def svn_client_export5(*args) -> "svn_revnum_t *":
     """svn_client_export5(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_boolean_t ignore_keywords, svn_depth_t depth, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_export5(*args)
 
-def svn_client_export4(*args):
+def svn_client_export4(*args) -> "svn_revnum_t *":
     """svn_client_export4(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_depth_t depth, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_export4(*args)
 
-def svn_client_export3(*args):
+def svn_client_export3(*args) -> "svn_revnum_t *":
     """svn_client_export3(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_boolean_t recurse, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_export3(*args)
 
-def svn_client_export2(*args):
+def svn_client_export2(*args) -> "svn_revnum_t *":
     """svn_client_export2(char const * from_path_or_url, char const * to_path, svn_opt_revision_t revision, svn_boolean_t force, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_export2(*args)
 
-def svn_client_export(*args):
+def svn_client_export(*args) -> "svn_revnum_t *":
     """svn_client_export(char const * from_path_or_url, char const * to_path, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_export(*args)
 
-def svn_client_list4(*args):
+def svn_client_list4(*args) -> "svn_error_t *":
     """svn_client_list4(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, apr_array_header_t patterns, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_boolean_t include_externals, svn_client_list_func2_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_list4(*args)
 
-def svn_client_list3(*args):
+def svn_client_list3(*args) -> "svn_error_t *":
     """svn_client_list3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_boolean_t include_externals, svn_client_list_func2_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_list3(*args)
 
-def svn_client_list2(*args):
+def svn_client_list2(*args) -> "svn_error_t *":
     """svn_client_list2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_client_list_func_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_list2(*args)
 
-def svn_client_list(*args):
+def svn_client_list(*args) -> "svn_error_t *":
     """svn_client_list(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_client_list_func_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_list(*args)
 
-def svn_client_ls3(*args):
+def svn_client_ls3(*args) -> "apr_hash_t **, apr_hash_t **":
     """svn_client_ls3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_ls3(*args)
 
-def svn_client_ls2(*args):
+def svn_client_ls2(*args) -> "apr_hash_t **":
     """svn_client_ls2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_ls2(*args)
 
-def svn_client_ls(*args):
+def svn_client_ls(*args) -> "apr_hash_t **":
     """svn_client_ls(char const * path_or_url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_ls(*args)
 
-def svn_client_cat3(*args):
+def svn_client_cat3(*args) -> "apr_hash_t **":
     """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):
+def svn_client_cat2(*args) -> "svn_error_t *":
     """svn_client_cat2(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_cat2(*args)
 
-def svn_client_cat(*args):
+def svn_client_cat(*args) -> "svn_error_t *":
     """svn_client_cat(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_cat(*args)
-class svn_client__shelf_t:
-    """Proxy of C svn_client__shelf_t struct."""
-
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client__shelf_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client__shelf_t, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _client.svn_client__shelf_t_name_set
-    __swig_getmethods__["name"] = _client.svn_client__shelf_t_name_get
-    __swig_setmethods__["max_version"] = _client.svn_client__shelf_t_max_version_set
-    __swig_getmethods__["max_version"] = _client.svn_client__shelf_t_max_version_get
-    __swig_setmethods__["wc_root_abspath"] = _client.svn_client__shelf_t_wc_root_abspath_set
-    __swig_getmethods__["wc_root_abspath"] = _client.svn_client__shelf_t_wc_root_abspath_get
-    __swig_setmethods__["shelves_dir"] = _client.svn_client__shelf_t_shelves_dir_set
-    __swig_getmethods__["shelves_dir"] = _client.svn_client__shelf_t_shelves_dir_get
-    __swig_setmethods__["revprops"] = _client.svn_client__shelf_t_revprops_set
-    __swig_getmethods__["revprops"] = _client.svn_client__shelf_t_revprops_get
-    __swig_setmethods__["ctx"] = _client.svn_client__shelf_t_ctx_set
-    __swig_getmethods__["ctx"] = _client.svn_client__shelf_t_ctx_get
-    __swig_setmethods__["pool"] = _client.svn_client__shelf_t_pool_set
-    __swig_getmethods__["pool"] = _client.svn_client__shelf_t_pool_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)
-
-
-    def __init__(self):
-        """__init__(svn_client__shelf_t self) -> svn_client__shelf_t"""
-        this = _client.new_svn_client__shelf_t()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_destroy__ = _client.delete_svn_client__shelf_t
-    __del__ = lambda self: None
-svn_client__shelf_t_swigregister = _client.svn_client__shelf_t_swigregister
-svn_client__shelf_t_swigregister(svn_client__shelf_t)
-
-class svn_client__shelf_version_t:
-    """Proxy of C svn_client__shelf_version_t struct."""
-
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client__shelf_version_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client__shelf_version_t, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["shelf"] = _client.svn_client__shelf_version_t_shelf_set
-    __swig_getmethods__["shelf"] = _client.svn_client__shelf_version_t_shelf_get
-    __swig_setmethods__["mtime"] = _client.svn_client__shelf_version_t_mtime_set
-    __swig_getmethods__["mtime"] = _client.svn_client__shelf_version_t_mtime_get
-    __swig_setmethods__["files_dir_abspath"] = _client.svn_client__shelf_version_t_files_dir_abspath_set
-    __swig_getmethods__["files_dir_abspath"] = _client.svn_client__shelf_version_t_files_dir_abspath_get
-    __swig_setmethods__["version_number"] = _client.svn_client__shelf_version_t_version_number_set
-    __swig_getmethods__["version_number"] = _client.svn_client__shelf_version_t_version_number_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)
-
-
-    def __init__(self):
-        """__init__(svn_client__shelf_version_t self) -> svn_client__shelf_version_t"""
-        this = _client.new_svn_client__shelf_version_t()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_destroy__ = _client.delete_svn_client__shelf_version_t
-    __del__ = lambda self: None
-svn_client__shelf_version_t_swigregister = _client.svn_client__shelf_version_t_swigregister
-svn_client__shelf_version_t_swigregister(svn_client__shelf_version_t)
-
-
-def svn_client__shelf_open_or_create(*args):
-    """svn_client__shelf_open_or_create(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_open_or_create(*args)
-
-def svn_client__shelf_open_existing(*args):
-    """svn_client__shelf_open_existing(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_open_existing(*args)
-
-def svn_client__shelf_close(*args):
-    """svn_client__shelf_close(svn_client__shelf_t shelf, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_close(*args)
-
-def svn_client__shelf_delete(*args):
-    """svn_client__shelf_delete(char const * name, char const * local_abspath, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_delete(*args)
-
-def svn_client__shelf_mods_editor(*args):
-    """svn_client__shelf_mods_editor(svn_client__shelf_version_t shelf_version, svn_wc_notify_func2_t notify_func, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_mods_editor(*args)
-
-def svn_client__shelf_save_new_version3(*args):
-    """svn_client__shelf_save_new_version3(svn_client__shelf_t shelf, apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_status_func_t shelved_func, void * shelved_baton, svn_client_status_func_t not_shelved_func, void * not_shelved_baton, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_save_new_version3(*args)
-
-def svn_client__shelf_delete_newer_versions(*args):
-    """svn_client__shelf_delete_newer_versions(svn_client__shelf_t shelf, svn_client__shelf_version_t shelf_version, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_delete_newer_versions(*args)
-
-def svn_client__shelf_version_open(*args):
-    """svn_client__shelf_version_open(svn_client__shelf_t shelf, int version_number, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_version_open(*args)
-
-def svn_client__shelf_get_newest_version(*args):
-    """svn_client__shelf_get_newest_version(svn_client__shelf_t shelf, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_get_newest_version(*args)
-
-def svn_client__shelf_get_all_versions(*args):
-    """svn_client__shelf_get_all_versions(svn_client__shelf_t shelf, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_get_all_versions(*args)
-
-def svn_client__shelf_apply(*args):
-    """svn_client__shelf_apply(svn_client__shelf_version_t shelf_version, svn_boolean_t dry_run, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_apply(*args)
-
-def svn_client__shelf_test_apply_file(*args):
-    """svn_client__shelf_test_apply_file(svn_client__shelf_version_t shelf_version, char const * file_relpath, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_test_apply_file(*args)
-
-def svn_client__shelf_unapply(*args):
-    """svn_client__shelf_unapply(svn_client__shelf_version_t shelf_version, svn_boolean_t dry_run, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_unapply(*args)
-
-def svn_client__shelf_replay(*args):
-    """svn_client__shelf_replay(svn_client__shelf_version_t shelf_version, char const * top_relpath, svn_delta_editor_t editor, void * edit_baton, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_replay(*args)
-
-def svn_client__shelf_paths_changed(*args):
-    """svn_client__shelf_paths_changed(svn_client__shelf_version_t shelf_version, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_paths_changed(*args)
-
-def svn_client__shelf_revprop_set(*args):
-    """svn_client__shelf_revprop_set(svn_client__shelf_t shelf, char const * prop_name, svn_string_t const * prop_val, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_revprop_set(*args)
-
-def svn_client__shelf_revprop_set_all(*args):
-    """svn_client__shelf_revprop_set_all(svn_client__shelf_t shelf, apr_hash_t revprop_table, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_revprop_set_all(*args)
-
-def svn_client__shelf_revprop_get(*args):
-    """svn_client__shelf_revprop_get(svn_client__shelf_t shelf, char const * prop_name, apr_pool_t result_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_revprop_get(*args)
-
-def svn_client__shelf_revprop_list(*args):
-    """svn_client__shelf_revprop_list(svn_client__shelf_t shelf, apr_pool_t result_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_revprop_list(*args)
-
-def svn_client__shelf_set_log_message(*args):
-    """svn_client__shelf_set_log_message(svn_client__shelf_t shelf, char const * log_message, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_set_log_message(*args)
-
-def svn_client__shelf_get_log_message(*args):
-    """svn_client__shelf_get_log_message(svn_client__shelf_t shelf, apr_pool_t result_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_get_log_message(*args)
-class svn_client__shelf_info_t:
-    """Proxy of C svn_client__shelf_info_t struct."""
-
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client__shelf_info_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client__shelf_info_t, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["mtime"] = _client.svn_client__shelf_info_t_mtime_set
-    __swig_getmethods__["mtime"] = _client.svn_client__shelf_info_t_mtime_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)
-
-
-    def __init__(self):
-        """__init__(svn_client__shelf_info_t self) -> svn_client__shelf_info_t"""
-        this = _client.new_svn_client__shelf_info_t()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_destroy__ = _client.delete_svn_client__shelf_info_t
-    __del__ = lambda self: None
-svn_client__shelf_info_t_swigregister = _client.svn_client__shelf_info_t_swigregister
-svn_client__shelf_info_t_swigregister(svn_client__shelf_info_t)
-
-
-def svn_client__shelf_list(*args):
-    """svn_client__shelf_list(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_list(*args)
-
-def svn_client__shelf_version_status_walk(*args):
-    """svn_client__shelf_version_status_walk(svn_client__shelf_version_t shelf_version, char const * wc_relpath, svn_wc_status_func4_t walk_func, void * walk_baton, apr_pool_t scratch_pool) -> svn_error_t"""
-    return _client.svn_client__shelf_version_status_walk(*args)
-
-def svn_client_add_to_changelist(*args):
+def svn_client_add_to_changelist(*args) -> "svn_error_t *":
     """svn_client_add_to_changelist(apr_array_header_t paths, char const * changelist, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_add_to_changelist(*args)
 
-def svn_client_remove_from_changelists(*args):
+def svn_client_remove_from_changelists(*args) -> "svn_error_t *":
     """svn_client_remove_from_changelists(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_remove_from_changelists(*args)
 
-def svn_client_get_changelists(*args):
+def svn_client_get_changelists(*args) -> "svn_error_t *":
     """svn_client_get_changelists(char const * path, apr_array_header_t changelists, svn_depth_t depth, svn_changelist_receiver_t callback_func, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_get_changelists(*args)
 
-def svn_client_lock(*args):
+def svn_client_lock(*args) -> "svn_error_t *":
     """svn_client_lock(apr_array_header_t targets, char const * comment, svn_boolean_t steal_lock, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_lock(*args)
 
-def svn_client_unlock(*args):
+def svn_client_unlock(*args) -> "svn_error_t *":
     """svn_client_unlock(apr_array_header_t targets, svn_boolean_t break_lock, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_unlock(*args)
-class svn_info_t:
+class svn_info_t(object):
     """Proxy of C svn_info_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_info_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_info_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["URL"] = _client.svn_info_t_URL_set
-    __swig_getmethods__["URL"] = _client.svn_info_t_URL_get
-    __swig_setmethods__["rev"] = _client.svn_info_t_rev_set
-    __swig_getmethods__["rev"] = _client.svn_info_t_rev_get
-    __swig_setmethods__["kind"] = _client.svn_info_t_kind_set
-    __swig_getmethods__["kind"] = _client.svn_info_t_kind_get
-    __swig_setmethods__["repos_root_URL"] = _client.svn_info_t_repos_root_URL_set
-    __swig_getmethods__["repos_root_URL"] = _client.svn_info_t_repos_root_URL_get
-    __swig_setmethods__["repos_UUID"] = _client.svn_info_t_repos_UUID_set
-    __swig_getmethods__["repos_UUID"] = _client.svn_info_t_repos_UUID_get
-    __swig_setmethods__["last_changed_rev"] = _client.svn_info_t_last_changed_rev_set
-    __swig_getmethods__["last_changed_rev"] = _client.svn_info_t_last_changed_rev_get
-    __swig_setmethods__["last_changed_date"] = _client.svn_info_t_last_changed_date_set
-    __swig_getmethods__["last_changed_date"] = _client.svn_info_t_last_changed_date_get
-    __swig_setmethods__["last_changed_author"] = _client.svn_info_t_last_changed_author_set
-    __swig_getmethods__["last_changed_author"] = _client.svn_info_t_last_changed_author_get
-    __swig_setmethods__["lock"] = _client.svn_info_t_lock_set
-    __swig_getmethods__["lock"] = _client.svn_info_t_lock_get
-    __swig_setmethods__["has_wc_info"] = _client.svn_info_t_has_wc_info_set
-    __swig_getmethods__["has_wc_info"] = _client.svn_info_t_has_wc_info_get
-    __swig_setmethods__["schedule"] = _client.svn_info_t_schedule_set
-    __swig_getmethods__["schedule"] = _client.svn_info_t_schedule_get
-    __swig_setmethods__["copyfrom_url"] = _client.svn_info_t_copyfrom_url_set
-    __swig_getmethods__["copyfrom_url"] = _client.svn_info_t_copyfrom_url_get
-    __swig_setmethods__["copyfrom_rev"] = _client.svn_info_t_copyfrom_rev_set
-    __swig_getmethods__["copyfrom_rev"] = _client.svn_info_t_copyfrom_rev_get
-    __swig_setmethods__["text_time"] = _client.svn_info_t_text_time_set
-    __swig_getmethods__["text_time"] = _client.svn_info_t_text_time_get
-    __swig_setmethods__["prop_time"] = _client.svn_info_t_prop_time_set
-    __swig_getmethods__["prop_time"] = _client.svn_info_t_prop_time_get
-    __swig_setmethods__["checksum"] = _client.svn_info_t_checksum_set
-    __swig_getmethods__["checksum"] = _client.svn_info_t_checksum_get
-    __swig_setmethods__["conflict_old"] = _client.svn_info_t_conflict_old_set
-    __swig_getmethods__["conflict_old"] = _client.svn_info_t_conflict_old_get
-    __swig_setmethods__["conflict_new"] = _client.svn_info_t_conflict_new_set
-    __swig_getmethods__["conflict_new"] = _client.svn_info_t_conflict_new_get
-    __swig_setmethods__["conflict_wrk"] = _client.svn_info_t_conflict_wrk_set
-    __swig_getmethods__["conflict_wrk"] = _client.svn_info_t_conflict_wrk_get
-    __swig_setmethods__["prejfile"] = _client.svn_info_t_prejfile_set
-    __swig_getmethods__["prejfile"] = _client.svn_info_t_prejfile_get
-    __swig_setmethods__["changelist"] = _client.svn_info_t_changelist_set
-    __swig_getmethods__["changelist"] = _client.svn_info_t_changelist_get
-    __swig_setmethods__["depth"] = _client.svn_info_t_depth_set
-    __swig_getmethods__["depth"] = _client.svn_info_t_depth_get
-    __swig_setmethods__["working_size"] = _client.svn_info_t_working_size_set
-    __swig_getmethods__["working_size"] = _client.svn_info_t_working_size_get
-    __swig_setmethods__["size"] = _client.svn_info_t_size_set
-    __swig_getmethods__["size"] = _client.svn_info_t_size_get
-    __swig_setmethods__["size64"] = _client.svn_info_t_size64_set
-    __swig_getmethods__["size64"] = _client.svn_info_t_size64_get
-    __swig_setmethods__["working_size64"] = _client.svn_info_t_working_size64_set
-    __swig_getmethods__["working_size64"] = _client.svn_info_t_working_size64_get
-    __swig_setmethods__["tree_conflict"] = _client.svn_info_t_tree_conflict_set
-    __swig_getmethods__["tree_conflict"] = _client.svn_info_t_tree_conflict_get
+    URL = _swig_property(_client.svn_info_t_URL_get, _client.svn_info_t_URL_set)
+    rev = _swig_property(_client.svn_info_t_rev_get, _client.svn_info_t_rev_set)
+    kind = _swig_property(_client.svn_info_t_kind_get, _client.svn_info_t_kind_set)
+    repos_root_URL = _swig_property(_client.svn_info_t_repos_root_URL_get, _client.svn_info_t_repos_root_URL_set)
+    repos_UUID = _swig_property(_client.svn_info_t_repos_UUID_get, _client.svn_info_t_repos_UUID_set)
+    last_changed_rev = _swig_property(_client.svn_info_t_last_changed_rev_get, _client.svn_info_t_last_changed_rev_set)
+    last_changed_date = _swig_property(_client.svn_info_t_last_changed_date_get, _client.svn_info_t_last_changed_date_set)
+    last_changed_author = _swig_property(_client.svn_info_t_last_changed_author_get, _client.svn_info_t_last_changed_author_set)
+    lock = _swig_property(_client.svn_info_t_lock_get, _client.svn_info_t_lock_set)
+    has_wc_info = _swig_property(_client.svn_info_t_has_wc_info_get, _client.svn_info_t_has_wc_info_set)
+    schedule = _swig_property(_client.svn_info_t_schedule_get, _client.svn_info_t_schedule_set)
+    copyfrom_url = _swig_property(_client.svn_info_t_copyfrom_url_get, _client.svn_info_t_copyfrom_url_set)
+    copyfrom_rev = _swig_property(_client.svn_info_t_copyfrom_rev_get, _client.svn_info_t_copyfrom_rev_set)
+    text_time = _swig_property(_client.svn_info_t_text_time_get, _client.svn_info_t_text_time_set)
+    prop_time = _swig_property(_client.svn_info_t_prop_time_get, _client.svn_info_t_prop_time_set)
+    checksum = _swig_property(_client.svn_info_t_checksum_get, _client.svn_info_t_checksum_set)
+    conflict_old = _swig_property(_client.svn_info_t_conflict_old_get, _client.svn_info_t_conflict_old_set)
+    conflict_new = _swig_property(_client.svn_info_t_conflict_new_get, _client.svn_info_t_conflict_new_set)
+    conflict_wrk = _swig_property(_client.svn_info_t_conflict_wrk_get, _client.svn_info_t_conflict_wrk_set)
+    prejfile = _swig_property(_client.svn_info_t_prejfile_get, _client.svn_info_t_prejfile_set)
+    changelist = _swig_property(_client.svn_info_t_changelist_get, _client.svn_info_t_changelist_set)
+    depth = _swig_property(_client.svn_info_t_depth_get, _client.svn_info_t_depth_set)
+    working_size = _swig_property(_client.svn_info_t_working_size_get, _client.svn_info_t_working_size_set)
+    size = _swig_property(_client.svn_info_t_size_get, _client.svn_info_t_size_set)
+    size64 = _swig_property(_client.svn_info_t_size64_get, _client.svn_info_t_size64_set)
+    working_size64 = _swig_property(_client.svn_info_t_working_size64_get, _client.svn_info_t_working_size64_set)
+    tree_conflict = _swig_property(_client.svn_info_t_tree_conflict_get, _client.svn_info_t_tree_conflict_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2103,23 +1958,57 @@ class svn_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2129,7 +2018,7 @@ class svn_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2145,39 +2034,25 @@ svn_info_t_swigregister = _client.svn_info_t_swigregister
 svn_info_t_swigregister(svn_info_t)
 
 
-def svn_info_dup(*args):
+def svn_info_dup(*args) -> "svn_info_t *":
     """svn_info_dup(svn_info_t info, apr_pool_t pool) -> svn_info_t"""
     return _client.svn_info_dup(*args)
-class svn_client_info2_t:
+class svn_client_info2_t(object):
     """Proxy of C svn_client_info2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_info2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_info2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["URL"] = _client.svn_client_info2_t_URL_set
-    __swig_getmethods__["URL"] = _client.svn_client_info2_t_URL_get
-    __swig_setmethods__["rev"] = _client.svn_client_info2_t_rev_set
-    __swig_getmethods__["rev"] = _client.svn_client_info2_t_rev_get
-    __swig_setmethods__["repos_root_URL"] = _client.svn_client_info2_t_repos_root_URL_set
-    __swig_getmethods__["repos_root_URL"] = _client.svn_client_info2_t_repos_root_URL_get
-    __swig_setmethods__["repos_UUID"] = _client.svn_client_info2_t_repos_UUID_set
-    __swig_getmethods__["repos_UUID"] = _client.svn_client_info2_t_repos_UUID_get
-    __swig_setmethods__["kind"] = _client.svn_client_info2_t_kind_set
-    __swig_getmethods__["kind"] = _client.svn_client_info2_t_kind_get
-    __swig_setmethods__["size"] = _client.svn_client_info2_t_size_set
-    __swig_getmethods__["size"] = _client.svn_client_info2_t_size_get
-    __swig_setmethods__["last_changed_rev"] = _client.svn_client_info2_t_last_changed_rev_set
-    __swig_getmethods__["last_changed_rev"] = _client.svn_client_info2_t_last_changed_rev_get
-    __swig_setmethods__["last_changed_date"] = _client.svn_client_info2_t_last_changed_date_set
-    __swig_getmethods__["last_changed_date"] = _client.svn_client_info2_t_last_changed_date_get
-    __swig_setmethods__["last_changed_author"] = _client.svn_client_info2_t_last_changed_author_set
-    __swig_getmethods__["last_changed_author"] = _client.svn_client_info2_t_last_changed_author_get
-    __swig_setmethods__["lock"] = _client.svn_client_info2_t_lock_set
-    __swig_getmethods__["lock"] = _client.svn_client_info2_t_lock_get
-    __swig_setmethods__["wc_info"] = _client.svn_client_info2_t_wc_info_set
-    __swig_getmethods__["wc_info"] = _client.svn_client_info2_t_wc_info_get
+    URL = _swig_property(_client.svn_client_info2_t_URL_get, _client.svn_client_info2_t_URL_set)
+    rev = _swig_property(_client.svn_client_info2_t_rev_get, _client.svn_client_info2_t_rev_set)
+    repos_root_URL = _swig_property(_client.svn_client_info2_t_repos_root_URL_get, _client.svn_client_info2_t_repos_root_URL_set)
+    repos_UUID = _swig_property(_client.svn_client_info2_t_repos_UUID_get, _client.svn_client_info2_t_repos_UUID_set)
+    kind = _swig_property(_client.svn_client_info2_t_kind_get, _client.svn_client_info2_t_kind_set)
+    size = _swig_property(_client.svn_client_info2_t_size_get, _client.svn_client_info2_t_size_set)
+    last_changed_rev = _swig_property(_client.svn_client_info2_t_last_changed_rev_get, _client.svn_client_info2_t_last_changed_rev_set)
+    last_changed_date = _swig_property(_client.svn_client_info2_t_last_changed_date_get, _client.svn_client_info2_t_last_changed_date_set)
+    last_changed_author = _swig_property(_client.svn_client_info2_t_last_changed_author_get, _client.svn_client_info2_t_last_changed_author_set)
+    lock = _swig_property(_client.svn_client_info2_t_lock_get, _client.svn_client_info2_t_lock_set)
+    wc_info = _swig_property(_client.svn_client_info2_t_wc_info_get, _client.svn_client_info2_t_wc_info_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2192,23 +2067,57 @@ class svn_client_info2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2218,7 +2127,7 @@ class svn_client_info2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2234,80 +2143,77 @@ svn_client_info2_t_swigregister = _client.svn_client_info2_t_swigregister
 svn_client_info2_t_swigregister(svn_client_info2_t)
 
 
-def svn_client_info2_dup(*args):
+def svn_client_info2_dup(*args) -> "svn_client_info2_t *":
     """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):
+def svn_client_info4(*args) -> "svn_error_t *":
     """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):
+def svn_client_info3(*args) -> "svn_error_t *":
     """svn_client_info3(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, 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_info3(*args)
 
-def svn_client_info2(*args):
+def svn_client_info2(*args) -> "svn_error_t *":
     """svn_client_info2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_info_receiver_t receiver, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_info2(*args)
 
-def svn_client_info(*args):
+def svn_client_info(*args) -> "svn_error_t *":
     """svn_client_info(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_info_receiver_t receiver, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_info(*args)
 
-def svn_client_get_wc_root(*args):
+def svn_client_get_wc_root(*args) -> "char const **":
     """svn_client_get_wc_root(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_get_wc_root(*args)
 
-def svn_client_min_max_revisions(*args):
+def svn_client_min_max_revisions(*args) -> "svn_revnum_t *, svn_revnum_t *":
     """svn_client_min_max_revisions(char const * local_abspath, svn_boolean_t committed, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_min_max_revisions(*args)
 
-def svn_client_patch(*args):
+def svn_client_patch(*args) -> "svn_error_t *":
     """svn_client_patch(char const * patch_abspath, char const * wc_dir_abspath, svn_boolean_t dry_run, int strip_count, svn_boolean_t reverse, svn_boolean_t ignore_whitespace, svn_boolean_t remove_tempfiles, svn_client_patch_func_t patch_func, void * patch_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_patch(*args)
 
-def svn_client_url_from_path2(*args):
+def svn_client_url_from_path2(*args) -> "char const **":
     """svn_client_url_from_path2(char const * path_or_url, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_url_from_path2(*args)
 
-def svn_client_url_from_path(*args):
+def svn_client_url_from_path(*args) -> "char const **":
     """svn_client_url_from_path(char const * path_or_url, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_url_from_path(*args)
 
-def svn_client_get_repos_root(*args):
+def svn_client_get_repos_root(*args) -> "char const **, char const **":
     """svn_client_get_repos_root(char const * abspath_or_url, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_get_repos_root(*args)
 
-def svn_client_root_url_from_path(*args):
+def svn_client_root_url_from_path(*args) -> "char const **":
     """svn_client_root_url_from_path(char const * path_or_url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_root_url_from_path(*args)
 
-def svn_client_uuid_from_url(*args):
+def svn_client_uuid_from_url(*args) -> "char const **":
     """svn_client_uuid_from_url(char const * url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_uuid_from_url(*args)
 
-def svn_client_uuid_from_path2(*args):
+def svn_client_uuid_from_path2(*args) -> "char const **":
     """svn_client_uuid_from_path2(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_uuid_from_path2(*args)
 
-def svn_client_uuid_from_path(*args):
+def svn_client_uuid_from_path(*args) -> "char const **":
     """svn_client_uuid_from_path(char const * path, svn_wc_adm_access_t * adm_access, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_uuid_from_path(*args)
 
-def svn_client_open_ra_session2(*args):
+def svn_client_open_ra_session2(*args) -> "svn_ra_session_t **":
     """svn_client_open_ra_session2(char const * url, char const * wri_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_open_ra_session2(*args)
 
-def svn_client_open_ra_session(*args):
+def svn_client_open_ra_session(*args) -> "svn_ra_session_t **":
     """svn_client_open_ra_session(char const * url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_open_ra_session(*args)
-class svn_client_conflict_t:
+class svn_client_conflict_t(object):
     """Proxy of C svn_client_conflict_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_conflict_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_conflict_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2326,23 +2232,57 @@ class svn_client_conflict_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2352,18 +2292,15 @@ class svn_client_conflict_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_client_conflict_t_swigregister = _client.svn_client_conflict_t_swigregister
 svn_client_conflict_t_swigregister(svn_client_conflict_t)
 
-class svn_client_conflict_option_t:
+class svn_client_conflict_option_t(object):
     """Proxy of C svn_client_conflict_option_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_conflict_option_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_conflict_option_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2382,23 +2319,57 @@ class svn_client_conflict_option_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2408,94 +2379,91 @@ class svn_client_conflict_option_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_client_conflict_option_t_swigregister = _client.svn_client_conflict_option_t_swigregister
 svn_client_conflict_option_t_swigregister(svn_client_conflict_option_t)
 
 
-def svn_proplist_invoke_receiver2(*args):
+def svn_proplist_invoke_receiver2(*args) -> "svn_error_t *":
     """svn_proplist_invoke_receiver2(svn_proplist_receiver2_t _obj, void * baton, char const * path, apr_hash_t prop_hash, apr_array_header_t inherited_props, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_proplist_invoke_receiver2(*args)
 
-def svn_proplist_invoke_receiver(*args):
+def svn_proplist_invoke_receiver(*args) -> "svn_error_t *":
     """svn_proplist_invoke_receiver(svn_proplist_receiver_t _obj, void * baton, char const * path, apr_hash_t prop_hash, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_proplist_invoke_receiver(*args)
 
-def svn_client_invoke_get_commit_log3(*args):
+def svn_client_invoke_get_commit_log3(*args) -> "char const **, char const **":
     """svn_client_invoke_get_commit_log3(svn_client_get_commit_log3_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_get_commit_log3(*args)
 
-def svn_client_invoke_get_commit_log2(*args):
+def svn_client_invoke_get_commit_log2(*args) -> "char const **, char const **":
     """svn_client_invoke_get_commit_log2(svn_client_get_commit_log2_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_get_commit_log2(*args)
 
-def svn_client_invoke_get_commit_log(*args):
+def svn_client_invoke_get_commit_log(*args) -> "char const **, char const **":
     """svn_client_invoke_get_commit_log(svn_client_get_commit_log_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_get_commit_log(*args)
 
-def svn_client_invoke_blame_receiver4(*args):
+def svn_client_invoke_blame_receiver4(*args) -> "svn_error_t *":
     """svn_client_invoke_blame_receiver4(svn_client_blame_receiver4_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, svn_string_t const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_blame_receiver4(*args)
 
-def svn_client_invoke_blame_receiver3(*args):
+def svn_client_invoke_blame_receiver3(*args) -> "svn_error_t *":
     """svn_client_invoke_blame_receiver3(svn_client_blame_receiver3_t _obj, void * baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, char const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_blame_receiver3(*args)
 
-def svn_client_invoke_blame_receiver2(*args):
+def svn_client_invoke_blame_receiver2(*args) -> "svn_error_t *":
     """svn_client_invoke_blame_receiver2(svn_client_blame_receiver2_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, char const * author, char const * date, svn_revnum_t merged_revision, char const * merged_author, char const * merged_date, char const * merged_path, char const * line, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_blame_receiver2(*args)
 
-def svn_client_invoke_blame_receiver(*args):
+def svn_client_invoke_blame_receiver(*args) -> "svn_error_t *":
     """svn_client_invoke_blame_receiver(svn_client_blame_receiver_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, char const * author, char const * date, char const * line, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_blame_receiver(*args)
 
-def svn_client_invoke_diff_summarize_func(*args):
+def svn_client_invoke_diff_summarize_func(*args) -> "svn_error_t *":
     """svn_client_invoke_diff_summarize_func(svn_client_diff_summarize_func_t _obj, svn_client_diff_summarize_t diff, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_diff_summarize_func(*args)
 
-def svn_client_invoke__layout_func(*args):
+def svn_client_invoke__layout_func(*args) -> "svn_error_t *":
     """svn_client_invoke__layout_func(svn_client__layout_func_t _obj, void * layout_baton, char const * local_abspath, char const * repos_root_url, svn_boolean_t not_present, svn_boolean_t url_changed, char const * url, svn_boolean_t revision_changed, svn_revnum_t revision, svn_boolean_t depth_changed, svn_depth_t depth, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_invoke__layout_func(*args)
 
-def svn_client_invoke_import_filter_func(*args):
+def svn_client_invoke_import_filter_func(*args) -> "svn_boolean_t *":
     """svn_client_invoke_import_filter_func(svn_client_import_filter_func_t _obj, void * baton, char const * local_abspath, svn_io_dirent2_t dirent, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_invoke_import_filter_func(*args)
 
-def svn_client_invoke_status_func(*args):
+def svn_client_invoke_status_func(*args) -> "svn_error_t *":
     """svn_client_invoke_status_func(svn_client_status_func_t _obj, void * baton, char const * path, svn_client_status_t status, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_invoke_status_func(*args)
 
-def svn_client_invoke_conflict_walk_func(*args):
+def svn_client_invoke_conflict_walk_func(*args) -> "svn_error_t *":
     """svn_client_invoke_conflict_walk_func(svn_client_conflict_walk_func_t _obj, void * baton, svn_client_conflict_t * conflict, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_invoke_conflict_walk_func(*args)
 
-def svn_client_invoke_list_func2(*args):
+def svn_client_invoke_list_func2(*args) -> "svn_error_t *":
     """svn_client_invoke_list_func2(svn_client_list_func2_t _obj, void * baton, char const * path, svn_dirent_t dirent, svn_lock_t lock, char const * abs_path, char const * external_parent_url, char const * external_target, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_invoke_list_func2(*args)
 
-def svn_client_invoke_list_func(*args):
+def svn_client_invoke_list_func(*args) -> "svn_error_t *":
     """svn_client_invoke_list_func(svn_client_list_func_t _obj, void * baton, char const * path, svn_dirent_t dirent, svn_lock_t lock, char const * abs_path, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_client_invoke_list_func(*args)
 
-def svn_info_invoke_receiver(*args):
+def svn_info_invoke_receiver(*args) -> "svn_error_t *":
     """svn_info_invoke_receiver(svn_info_receiver_t _obj, void * baton, char const * path, svn_info_t info, apr_pool_t pool) -> svn_error_t"""
     return _client.svn_info_invoke_receiver(*args)
 
-def svn_client_invoke_info_receiver2(*args):
+def svn_client_invoke_info_receiver2(*args) -> "svn_error_t *":
     """svn_client_invoke_info_receiver2(svn_client_info_receiver2_t _obj, void * baton, char const * abspath_or_url, svn_client_info2_t info, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_invoke_info_receiver2(*args)
 
-def svn_client_invoke_patch_func(*args):
+def svn_client_invoke_patch_func(*args) -> "svn_boolean_t *":
     """svn_client_invoke_patch_func(svn_client_patch_func_t _obj, void * baton, char const * canon_path_from_patchfile, char const * patch_abspath, char const * reject_abspath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _client.svn_client_invoke_patch_func(*args)
-class svn_proplist_receiver2_t:
+class svn_proplist_receiver2_t(object):
     """Proxy of C svn_proplist_receiver2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_proplist_receiver2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_proplist_receiver2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2514,23 +2482,57 @@ class svn_proplist_receiver2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2540,7 +2542,7 @@ class svn_proplist_receiver2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2549,13 +2551,10 @@ class svn_proplist_receiver2_t:
 svn_proplist_receiver2_t_swigregister = _client.svn_proplist_receiver2_t_swigregister
 svn_proplist_receiver2_t_swigregister(svn_proplist_receiver2_t)
 
-class svn_proplist_receiver_t:
+class svn_proplist_receiver_t(object):
     """Proxy of C svn_proplist_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_proplist_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_proplist_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2574,23 +2573,57 @@ class svn_proplist_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2600,7 +2633,7 @@ class svn_proplist_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2609,13 +2642,10 @@ class svn_proplist_receiver_t:
 svn_proplist_receiver_t_swigregister = _client.svn_proplist_receiver_t_swigregister
 svn_proplist_receiver_t_swigregister(svn_proplist_receiver_t)
 
-class svn_client_get_commit_log3_t:
+class svn_client_get_commit_log3_t(object):
     """Proxy of C svn_client_get_commit_log3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_get_commit_log3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_get_commit_log3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2634,23 +2664,57 @@ class svn_client_get_commit_log3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2660,7 +2724,7 @@ class svn_client_get_commit_log3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2669,13 +2733,10 @@ class svn_client_get_commit_log3_t:
 svn_client_get_commit_log3_t_swigregister = _client.svn_client_get_commit_log3_t_swigregister
 svn_client_get_commit_log3_t_swigregister(svn_client_get_commit_log3_t)
 
-class svn_client_get_commit_log2_t:
+class svn_client_get_commit_log2_t(object):
     """Proxy of C svn_client_get_commit_log2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_get_commit_log2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_get_commit_log2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2694,23 +2755,57 @@ class svn_client_get_commit_log2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2720,7 +2815,7 @@ class svn_client_get_commit_log2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2729,13 +2824,10 @@ class svn_client_get_commit_log2_t:
 svn_client_get_commit_log2_t_swigregister = _client.svn_client_get_commit_log2_t_swigregister
 svn_client_get_commit_log2_t_swigregister(svn_client_get_commit_log2_t)
 
-class svn_client_get_commit_log_t:
+class svn_client_get_commit_log_t(object):
     """Proxy of C svn_client_get_commit_log_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_get_commit_log_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_get_commit_log_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2754,23 +2846,57 @@ class svn_client_get_commit_log_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2780,7 +2906,7 @@ class svn_client_get_commit_log_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2789,13 +2915,10 @@ class svn_client_get_commit_log_t:
 svn_client_get_commit_log_t_swigregister = _client.svn_client_get_commit_log_t_swigregister
 svn_client_get_commit_log_t_swigregister(svn_client_get_commit_log_t)
 
-class svn_client_blame_receiver4_t:
+class svn_client_blame_receiver4_t(object):
     """Proxy of C svn_client_blame_receiver4_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_blame_receiver4_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_blame_receiver4_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2814,23 +2937,57 @@ class svn_client_blame_receiver4_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2840,7 +2997,7 @@ class svn_client_blame_receiver4_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2849,13 +3006,10 @@ class svn_client_blame_receiver4_t:
 svn_client_blame_receiver4_t_swigregister = _client.svn_client_blame_receiver4_t_swigregister
 svn_client_blame_receiver4_t_swigregister(svn_client_blame_receiver4_t)
 
-class svn_client_blame_receiver3_t:
+class svn_client_blame_receiver3_t(object):
     """Proxy of C svn_client_blame_receiver3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_blame_receiver3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_blame_receiver3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2874,23 +3028,57 @@ class svn_client_blame_receiver3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2900,7 +3088,7 @@ class svn_client_blame_receiver3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2909,13 +3097,10 @@ class svn_client_blame_receiver3_t:
 svn_client_blame_receiver3_t_swigregister = _client.svn_client_blame_receiver3_t_swigregister
 svn_client_blame_receiver3_t_swigregister(svn_client_blame_receiver3_t)
 
-class svn_client_blame_receiver2_t:
+class svn_client_blame_receiver2_t(object):
     """Proxy of C svn_client_blame_receiver2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_blame_receiver2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_blame_receiver2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2934,23 +3119,57 @@ class svn_client_blame_receiver2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2960,7 +3179,7 @@ class svn_client_blame_receiver2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2969,13 +3188,10 @@ class svn_client_blame_receiver2_t:
 svn_client_blame_receiver2_t_swigregister = _client.svn_client_blame_receiver2_t_swigregister
 svn_client_blame_receiver2_t_swigregister(svn_client_blame_receiver2_t)
 
-class svn_client_blame_receiver_t:
+class svn_client_blame_receiver_t(object):
     """Proxy of C svn_client_blame_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_blame_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_blame_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2994,23 +3210,57 @@ class svn_client_blame_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3020,7 +3270,7 @@ class svn_client_blame_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3029,13 +3279,10 @@ class svn_client_blame_receiver_t:
 svn_client_blame_receiver_t_swigregister = _client.svn_client_blame_receiver_t_swigregister
 svn_client_blame_receiver_t_swigregister(svn_client_blame_receiver_t)
 
-class svn_client_diff_summarize_func_t:
+class svn_client_diff_summarize_func_t(object):
     """Proxy of C svn_client_diff_summarize_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_diff_summarize_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_diff_summarize_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3054,23 +3301,57 @@ class svn_client_diff_summarize_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3080,7 +3361,7 @@ class svn_client_diff_summarize_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3089,13 +3370,10 @@ class svn_client_diff_summarize_func_t:
 svn_client_diff_summarize_func_t_swigregister = _client.svn_client_diff_summarize_func_t_swigregister
 svn_client_diff_summarize_func_t_swigregister(svn_client_diff_summarize_func_t)
 
-class svn_client__layout_func_t:
+class svn_client__layout_func_t(object):
     """Proxy of C svn_client__layout_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client__layout_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client__layout_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3114,23 +3392,57 @@ class svn_client__layout_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3140,7 +3452,7 @@ class svn_client__layout_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3149,13 +3461,10 @@ class svn_client__layout_func_t:
 svn_client__layout_func_t_swigregister = _client.svn_client__layout_func_t_swigregister
 svn_client__layout_func_t_swigregister(svn_client__layout_func_t)
 
-class svn_client_import_filter_func_t:
+class svn_client_import_filter_func_t(object):
     """Proxy of C svn_client_import_filter_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_import_filter_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_import_filter_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3174,23 +3483,57 @@ class svn_client_import_filter_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3200,7 +3543,7 @@ class svn_client_import_filter_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3209,13 +3552,10 @@ class svn_client_import_filter_func_t:
 svn_client_import_filter_func_t_swigregister = _client.svn_client_import_filter_func_t_swigregister
 svn_client_import_filter_func_t_swigregister(svn_client_import_filter_func_t)
 
-class svn_client_status_func_t:
+class svn_client_status_func_t(object):
     """Proxy of C svn_client_status_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_status_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_status_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3234,23 +3574,57 @@ class svn_client_status_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3260,7 +3634,7 @@ class svn_client_status_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3269,13 +3643,10 @@ class svn_client_status_func_t:
 svn_client_status_func_t_swigregister = _client.svn_client_status_func_t_swigregister
 svn_client_status_func_t_swigregister(svn_client_status_func_t)
 
-class svn_client_conflict_walk_func_t:
+class svn_client_conflict_walk_func_t(object):
     """Proxy of C svn_client_conflict_walk_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_conflict_walk_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_conflict_walk_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3294,23 +3665,57 @@ class svn_client_conflict_walk_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3320,7 +3725,7 @@ class svn_client_conflict_walk_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3329,13 +3734,10 @@ class svn_client_conflict_walk_func_t:
 svn_client_conflict_walk_func_t_swigregister = _client.svn_client_conflict_walk_func_t_swigregister
 svn_client_conflict_walk_func_t_swigregister(svn_client_conflict_walk_func_t)
 
-class svn_client_list_func2_t:
+class svn_client_list_func2_t(object):
     """Proxy of C svn_client_list_func2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_list_func2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_list_func2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3354,23 +3756,57 @@ class svn_client_list_func2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3380,7 +3816,7 @@ class svn_client_list_func2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3389,13 +3825,10 @@ class svn_client_list_func2_t:
 svn_client_list_func2_t_swigregister = _client.svn_client_list_func2_t_swigregister
 svn_client_list_func2_t_swigregister(svn_client_list_func2_t)
 
-class svn_client_list_func_t:
+class svn_client_list_func_t(object):
     """Proxy of C svn_client_list_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_list_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_list_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3414,23 +3847,57 @@ class svn_client_list_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3440,7 +3907,7 @@ class svn_client_list_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3449,13 +3916,10 @@ class svn_client_list_func_t:
 svn_client_list_func_t_swigregister = _client.svn_client_list_func_t_swigregister
 svn_client_list_func_t_swigregister(svn_client_list_func_t)
 
-class svn_info_receiver_t:
+class svn_info_receiver_t(object):
     """Proxy of C svn_info_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_info_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_info_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3474,23 +3938,57 @@ class svn_info_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3500,7 +3998,7 @@ class svn_info_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3509,13 +4007,10 @@ class svn_info_receiver_t:
 svn_info_receiver_t_swigregister = _client.svn_info_receiver_t_swigregister
 svn_info_receiver_t_swigregister(svn_info_receiver_t)
 
-class svn_client_info_receiver2_t:
+class svn_client_info_receiver2_t(object):
     """Proxy of C svn_client_info_receiver2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_info_receiver2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_info_receiver2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3534,23 +4029,57 @@ class svn_client_info_receiver2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3560,7 +4089,7 @@ class svn_client_info_receiver2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3569,13 +4098,10 @@ class svn_client_info_receiver2_t:
 svn_client_info_receiver2_t_swigregister = _client.svn_client_info_receiver2_t_swigregister
 svn_client_info_receiver2_t_swigregister(svn_client_info_receiver2_t)
 
-class svn_client_patch_func_t:
+class svn_client_patch_func_t(object):
     """Proxy of C svn_client_patch_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_patch_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_client_patch_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3594,23 +4120,57 @@ class svn_client_patch_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3620,7 +4180,7 @@ class svn_client_patch_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
diff --git a/subversion/bindings/swig/python/core.c b/subversion/bindings/swig/python/core.c
index 67a70da..d294308 100644
--- a/subversion/bindings/swig/python/core.c
+++ b/subversion/bindings/swig/python/core.c
@@ -8,13 +8,15 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+
+
 
 #ifndef SWIGPYTHON
 #define SWIGPYTHON
 #endif
 
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#define SWIG_PYTHON_CLASSIC
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -3099,52 +3101,54 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_svn_checksum_ctx_t swig_types[113]
 #define SWIGTYPE_p_svn_checksum_kind_t swig_types[114]
 #define SWIGTYPE_p_svn_checksum_t swig_types[115]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[116]
-#define SWIGTYPE_p_svn_config_t swig_types[117]
-#define SWIGTYPE_p_svn_depth_t swig_types[118]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[119]
-#define SWIGTYPE_p_svn_dirent_t swig_types[120]
-#define SWIGTYPE_p_svn_errno_t swig_types[121]
-#define SWIGTYPE_p_svn_error_t swig_types[122]
-#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[123]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[124]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[125]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[126]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[127]
-#define SWIGTYPE_p_svn_lock_t swig_types[128]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[129]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[130]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[131]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[132]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[133]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[134]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[135]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[136]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[137]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[138]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[139]
-#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[140]
-#define SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides swig_types[141]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[142]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[143]
-#define SWIGTYPE_p_svn_prop_kind swig_types[144]
-#define SWIGTYPE_p_svn_prop_t swig_types[145]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[146]
-#define SWIGTYPE_p_svn_stream_t swig_types[147]
-#define SWIGTYPE_p_svn_string_t swig_types[148]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[149]
-#define SWIGTYPE_p_svn_tristate_t swig_types[150]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[151]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[152]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[153]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[154]
-#define SWIGTYPE_p_svn_version_t swig_types[155]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[156]
-#define SWIGTYPE_p_unsigned_char swig_types[157]
-#define SWIGTYPE_p_unsigned_long swig_types[158]
-#define SWIGTYPE_p_void swig_types[159]
-static swig_type_info *swig_types[161];
-static swig_module_info swig_module = {swig_types, 160, 0, 0, 0, 0};
+#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[116]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[117]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[118]
+#define SWIGTYPE_p_svn_config_t swig_types[119]
+#define SWIGTYPE_p_svn_depth_t swig_types[120]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[121]
+#define SWIGTYPE_p_svn_dirent_t swig_types[122]
+#define SWIGTYPE_p_svn_errno_t swig_types[123]
+#define SWIGTYPE_p_svn_error_t swig_types[124]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[125]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[126]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[127]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[128]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[129]
+#define SWIGTYPE_p_svn_lock_t swig_types[130]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[131]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[132]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[133]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[134]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[135]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[136]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[137]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[138]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[139]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[140]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[141]
+#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[142]
+#define SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides swig_types[143]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[144]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[145]
+#define SWIGTYPE_p_svn_prop_kind swig_types[146]
+#define SWIGTYPE_p_svn_prop_t swig_types[147]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[148]
+#define SWIGTYPE_p_svn_stream_t swig_types[149]
+#define SWIGTYPE_p_svn_string_t swig_types[150]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[151]
+#define SWIGTYPE_p_svn_tristate_t swig_types[152]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[153]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[154]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[155]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[156]
+#define SWIGTYPE_p_svn_version_t swig_types[157]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[158]
+#define SWIGTYPE_p_unsigned_char swig_types[159]
+#define SWIGTYPE_p_unsigned_long swig_types[160]
+#define SWIGTYPE_p_void swig_types[161]
+static swig_type_info *swig_types[163];
+static swig_module_info swig_module = {swig_types, 162, 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)
 
@@ -3155,6 +3159,12 @@ static swig_module_info swig_module = {swig_types, 160, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
 
 /*-----------------------------------------------
               @(target):= _core.so
@@ -3181,6 +3191,7 @@ static swig_module_info swig_module = {swig_types, 160, 0, 0, 0, 0};
 
 
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 
 
 static PyObject * _global_py_pool = NULL;
@@ -4027,7 +4038,7 @@ SWIGINTERN PyObject *_wrap_apr_initialize(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   apr_status_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)":apr_initialize")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"apr_initialize",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4046,7 +4057,7 @@ fail:
 SWIGINTERN PyObject *_wrap_apr_terminate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   
-  if (!PyArg_ParseTuple(args,(char *)":apr_terminate")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"apr_terminate",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4071,7 +4082,7 @@ SWIGINTERN PyObject *_wrap_apr_time_ansi_put(PyObject *SWIGUNUSEDPARM(self), PyO
   apr_status_t result;
   
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O:apr_time_ansi_put",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"apr_time_ansi_put",1,1,&obj0)) SWIG_fail;
   {
     arg2 = (time_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -4107,7 +4118,7 @@ SWIGINTERN PyObject *_wrap_apr_pool_destroy(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:apr_pool_destroy",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"apr_pool_destroy",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -4148,7 +4159,7 @@ SWIGINTERN PyObject *_wrap_apr_pool_clear(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:apr_pool_clear",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"apr_pool_clear",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -4193,7 +4204,7 @@ SWIGINTERN PyObject *_wrap_apr_file_open_stdout(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:apr_file_open_stdout",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"apr_file_open_stdout",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -4244,7 +4255,7 @@ SWIGINTERN PyObject *_wrap_apr_file_open_stderr(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:apr_file_open_stderr",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"apr_file_open_stderr",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -4294,7 +4305,7 @@ SWIGINTERN PyObject *_wrap_svn_time_to_cstring(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_time_to_cstring",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_time_to_cstring",1,2,&obj0,&obj1)) SWIG_fail;
   arg1 = (apr_time_t) PyLong_AsLongLong(obj0); 
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -4333,6 +4344,7 @@ SWIGINTERN PyObject *_wrap_svn_time_from_cstring(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_int64_t temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -4341,7 +4353,11 @@ SWIGINTERN PyObject *_wrap_svn_time_from_cstring(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_time_from_cstring",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_time_from_cstring",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_time_from_cstring", "data");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -4398,7 +4414,7 @@ SWIGINTERN PyObject *_wrap_svn_time_to_human_cstring(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_time_to_human_cstring",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_time_to_human_cstring",1,2,&obj0,&obj1)) SWIG_fail;
   arg1 = (apr_time_t) PyLong_AsLongLong(obj0); 
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -4441,6 +4457,7 @@ SWIGINTERN PyObject *_wrap_svn_parse_date(PyObject *SWIGUNUSEDPARM(self), PyObje
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   apr_int64_t temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -4451,7 +4468,11 @@ SWIGINTERN PyObject *_wrap_svn_parse_date(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_parse_date",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_parse_date",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_parse_date", "text");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   arg4 = (apr_time_t) PyLong_AsLongLong(obj1); 
   if (obj2) {
     /* Verify that the user supplied a valid pool */
@@ -4504,7 +4525,7 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_sleep_for_timestamps(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_sleep_for_timestamps")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_sleep_for_timestamps",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4527,7 +4548,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_apr_err_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_error_t_apr_err_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_apr_err_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4554,7 +4575,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_apr_err_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   apr_status_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_apr_err_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_apr_err_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4575,7 +4596,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_message_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_message_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_message_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4597,7 +4618,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_child_set(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_error_t_child_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_child_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4624,7 +4645,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_child_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   struct svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_child_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_child_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4653,7 +4674,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_pool_set(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_error_t_pool_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_pool_set",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4688,7 +4709,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_pool_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   apr_pool_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_pool_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_pool_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4710,7 +4731,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_file_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_file_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4732,7 +4753,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_line_set(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_error_t_line_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_line_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4759,7 +4780,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_line_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   long result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_line_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_error_t_line_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4778,7 +4799,7 @@ SWIGINTERN PyObject *_wrap_new_svn_error_t(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   struct svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_error_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_error_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4800,7 +4821,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_error_t(PyObject *SWIGUNUSEDPARM(self), Py
   struct svn_error_t *arg1 = (struct svn_error_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_error_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_error_t",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4824,7 +4845,7 @@ fail:
 
 SWIGINTERN PyObject *svn_error_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4835,7 +4856,7 @@ SWIGINTERN PyObject *_wrap_svn_node_kind_to_word(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_node_kind_to_word",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_node_kind_to_word",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_node_kind_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -4860,9 +4881,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_node_kind_from_word(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_node_kind_from_word",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_node_kind_from_word",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_node_kind_from_word", "word");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -4884,7 +4910,7 @@ SWIGINTERN PyObject *_wrap_svn_tristate__to_word(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_tristate__to_word",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_tristate__to_word",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_tristate_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -4909,9 +4935,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_tristate__from_word(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_tristate__from_word",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_tristate__from_word",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_tristate__from_word", "word");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -4935,11 +4966,16 @@ SWIGINTERN PyObject *_wrap_svn_revnum_parse(PyObject *SWIGUNUSEDPARM(self), PyOb
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   char *temp3 ;
+  PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
   arg1 = &temp1;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_revnum_parse",&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_revnum_parse",1,1,&obj0)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_revnum_parse", "str");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -4972,7 +5008,7 @@ SWIGINTERN PyObject *_wrap_svn_revnum_parse(PyObject *SWIGUNUSEDPARM(self), PyOb
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -4990,7 +5026,7 @@ SWIGINTERN PyObject *_wrap_svn_depth_to_word(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_depth_to_word",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_depth_to_word",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_depth_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -5015,9 +5051,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_depth_from_word(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_depth_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_depth_from_word",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_depth_from_word",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_depth_from_word", "word");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -5040,7 +5081,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_kind_set(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5067,7 +5108,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_kind_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5089,7 +5130,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_size_set(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_size_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5111,7 +5152,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_size_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_size_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5133,7 +5174,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_has_props_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_has_props_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_has_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5160,7 +5201,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_has_props_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_has_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_has_props_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5182,7 +5223,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_created_rev_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_created_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_created_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5209,7 +5250,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_created_rev_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_created_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_created_rev_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5231,7 +5272,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_time_set(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_time_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_time_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5253,7 +5294,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_time_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_time_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_time_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5274,7 +5315,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_last_author_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_last_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_t_last_author_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5293,7 +5334,7 @@ SWIGINTERN PyObject *_wrap_new_svn_dirent_t(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   struct svn_dirent_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_dirent_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_dirent_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -5315,7 +5356,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_dirent_t(PyObject *SWIGUNUSEDPARM(self), P
   struct svn_dirent_t *arg1 = (struct svn_dirent_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_dirent_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_dirent_t",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5339,7 +5380,7 @@ fail:
 
 SWIGINTERN PyObject *svn_dirent_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_dirent_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5358,7 +5399,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_dup(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_dirent_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5407,7 +5448,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_create(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_dirent_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -5445,7 +5486,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_revision_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_commit_info_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5472,7 +5513,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_revision_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5492,8 +5533,9 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_date_set(PyObject *SWIGUNUSEDPARM(s
   struct svn_commit_info_t *arg1 = (struct svn_commit_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_commit_info_t_date_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5501,6 +5543,10 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_date_set(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_commit_info_t_date_set", "date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->date) free((char *)arg1->date);
@@ -5521,7 +5567,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_date_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5541,8 +5587,9 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_author_set(PyObject *SWIGUNUSEDPARM
   struct svn_commit_info_t *arg1 = (struct svn_commit_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_commit_info_t_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_author_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5550,6 +5597,10 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_author_set(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_commit_info_t_author_set", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->author) free((char *)arg1->author);
@@ -5570,7 +5621,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_author_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_author_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5590,8 +5641,9 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_post_commit_err_set(PyObject *SWIGU
   struct svn_commit_info_t *arg1 = (struct svn_commit_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_commit_info_t_post_commit_err_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_post_commit_err_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5599,6 +5651,10 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_post_commit_err_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_commit_info_t_post_commit_err_set", "post_commit_err");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->post_commit_err) free((char *)arg1->post_commit_err);
@@ -5619,7 +5675,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_post_commit_err_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_post_commit_err_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_post_commit_err_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5639,8 +5695,9 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_repos_root_set(PyObject *SWIGUNUSED
   struct svn_commit_info_t *arg1 = (struct svn_commit_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_commit_info_t_repos_root_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_repos_root_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5648,6 +5705,10 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_repos_root_set(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_commit_info_t_repos_root_set", "repos_root");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_root) free((char *)arg1->repos_root);
@@ -5668,7 +5729,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_repos_root_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_repos_root_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_t_repos_root_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5687,7 +5748,7 @@ SWIGINTERN PyObject *_wrap_new_svn_commit_info_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_commit_info_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_commit_info_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_commit_info_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -5709,7 +5770,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_commit_info_t(PyObject *SWIGUNUSEDPARM(sel
   struct svn_commit_info_t *arg1 = (struct svn_commit_info_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_commit_info_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_commit_info_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5733,7 +5794,7 @@ fail:
 
 SWIGINTERN PyObject *svn_commit_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_commit_info_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5750,7 +5811,7 @@ SWIGINTERN PyObject *_wrap_svn_create_commit_info(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_create_commit_info",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_create_commit_info",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -5795,7 +5856,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_dup(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_commit_info_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_info_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5859,7 +5920,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_action_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_action_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_action_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5879,8 +5940,9 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_path_set(PyObject *S
   struct svn_log_changed_path2_t *arg1 = (struct svn_log_changed_path2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_log_changed_path2_t_copyfrom_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_copyfrom_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5888,6 +5950,10 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_path_set(PyObject *S
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_log_changed_path2_t_copyfrom_path_set", "copyfrom_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_path) free((char *)arg1->copyfrom_path);
@@ -5908,7 +5974,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_path_get(PyObject *S
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_copyfrom_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_copyfrom_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5930,7 +5996,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_rev_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path2_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5957,7 +6023,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_rev_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5979,7 +6045,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_node_kind_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path2_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_node_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6006,7 +6072,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_node_kind_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_node_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_node_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6028,7 +6094,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_text_modified_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path2_t_text_modified_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_text_modified_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6055,7 +6121,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_text_modified_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_text_modified_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_text_modified_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6077,7 +6143,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_props_modified_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path2_t_props_modified_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_props_modified_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6104,7 +6170,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_props_modified_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_props_modified_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_t_props_modified_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6123,7 +6189,7 @@ SWIGINTERN PyObject *_wrap_new_svn_log_changed_path2_t(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   struct svn_log_changed_path2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_log_changed_path2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_log_changed_path2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -6145,7 +6211,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_log_changed_path2_t(PyObject *SWIGUNUSEDPA
   struct svn_log_changed_path2_t *arg1 = (struct svn_log_changed_path2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_log_changed_path2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_log_changed_path2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6169,7 +6235,7 @@ fail:
 
 SWIGINTERN PyObject *svn_log_changed_path2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_log_changed_path2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6186,7 +6252,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_create(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_log_changed_path2_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6231,7 +6297,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_dup(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_log_changed_path2_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path2_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6295,7 +6361,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_action_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path_t_action_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path_t_action_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6316,7 +6382,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_copyfrom_path_get(PyObject *SW
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path_t_copyfrom_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path_t_copyfrom_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6338,7 +6404,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_copyfrom_rev_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6365,7 +6431,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_copyfrom_rev_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6384,7 +6450,7 @@ SWIGINTERN PyObject *_wrap_new_svn_log_changed_path_t(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   struct svn_log_changed_path_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_log_changed_path_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_log_changed_path_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -6406,7 +6472,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_log_changed_path_t(PyObject *SWIGUNUSEDPAR
   struct svn_log_changed_path_t *arg1 = (struct svn_log_changed_path_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_log_changed_path_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_log_changed_path_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6430,7 +6496,7 @@ fail:
 
 SWIGINTERN PyObject *svn_log_changed_path_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_log_changed_path_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6449,7 +6515,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_dup(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_log_changed_path_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_changed_path_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6495,7 +6561,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_changed_paths_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_changed_paths_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_changed_paths_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6530,7 +6596,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_changed_paths_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_changed_paths_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_changed_paths_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6554,7 +6620,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_revision_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6581,7 +6647,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_revision_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6605,7 +6671,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_revprops_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_revprops_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_revprops_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6639,7 +6705,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_revprops_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_revprops_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_revprops_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6663,7 +6729,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_has_children_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_has_children_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_has_children_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6690,7 +6756,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_has_children_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_has_children_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_has_children_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6714,7 +6780,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_changed_paths2_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_changed_paths2_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_changed_paths2_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6749,7 +6815,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_changed_paths2_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_changed_paths2_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_changed_paths2_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6773,7 +6839,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_non_inheritable_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_non_inheritable_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_non_inheritable_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6800,7 +6866,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_non_inheritable_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_non_inheritable_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_non_inheritable_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6822,7 +6888,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_subtractive_merge_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_subtractive_merge_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_subtractive_merge_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6849,7 +6915,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_subtractive_merge_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_subtractive_merge_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_t_subtractive_merge_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6868,7 +6934,7 @@ SWIGINTERN PyObject *_wrap_new_svn_log_entry_t(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   struct svn_log_entry_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_log_entry_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_log_entry_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -6890,7 +6956,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_log_entry_t(PyObject *SWIGUNUSEDPARM(self)
   struct svn_log_entry_t *arg1 = (struct svn_log_entry_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_log_entry_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_log_entry_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6914,7 +6980,7 @@ fail:
 
 SWIGINTERN PyObject *svn_log_entry_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_log_entry_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6931,7 +6997,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_create(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_log_entry_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6976,7 +7042,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_dup(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_log_entry_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_entry_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7019,6 +7085,7 @@ SWIGINTERN PyObject *_wrap_svn_mime_type_validate(PyObject *SWIGUNUSEDPARM(self)
   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 ;
   
@@ -7026,7 +7093,11 @@ SWIGINTERN PyObject *_wrap_svn_mime_type_validate(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_mime_type_validate",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mime_type_validate",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_mime_type_validate", "mime_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -7069,9 +7140,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_mime_type_is_binary(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_mime_type_is_binary",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mime_type_is_binary",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_mime_type_is_binary", "mime_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -7092,8 +7168,9 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_path_set(PyObject *SWIGUNUSEDPARM(self), P
   struct svn_lock_t *arg1 = (struct svn_lock_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_lock_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7101,6 +7178,10 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_path_set(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_lock_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -7121,7 +7202,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_path_get(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7141,8 +7222,9 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_token_set(PyObject *SWIGUNUSEDPARM(self),
   struct svn_lock_t *arg1 = (struct svn_lock_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_lock_t_token_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_token_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7150,6 +7232,10 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_token_set(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_lock_t_token_set", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->token) free((char *)arg1->token);
@@ -7170,7 +7256,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_token_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_token_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_token_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7190,8 +7276,9 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_owner_set(PyObject *SWIGUNUSEDPARM(self),
   struct svn_lock_t *arg1 = (struct svn_lock_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_lock_t_owner_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_owner_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7199,6 +7286,10 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_owner_set(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_lock_t_owner_set", "owner");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->owner) free((char *)arg1->owner);
@@ -7219,7 +7310,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_owner_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_owner_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_owner_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7239,8 +7330,9 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_comment_set(PyObject *SWIGUNUSEDPARM(self)
   struct svn_lock_t *arg1 = (struct svn_lock_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_lock_t_comment_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_comment_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7248,6 +7340,10 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_comment_set(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_lock_t_comment_set", "comment");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->comment) free((char *)arg1->comment);
@@ -7268,7 +7364,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_comment_get(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_comment_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_comment_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7290,7 +7386,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_is_dav_comment_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_lock_t_is_dav_comment_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_is_dav_comment_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7317,7 +7413,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_is_dav_comment_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_is_dav_comment_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_is_dav_comment_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7339,7 +7435,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_creation_date_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_lock_t_creation_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_creation_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7361,7 +7457,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_creation_date_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_creation_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_creation_date_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7383,7 +7479,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_expiration_date_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_lock_t_expiration_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_expiration_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7405,7 +7501,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_expiration_date_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_expiration_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_t_expiration_date_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7424,7 +7520,7 @@ SWIGINTERN PyObject *_wrap_new_svn_lock_t(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   struct svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_lock_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_lock_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -7446,7 +7542,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_lock_t(PyObject *SWIGUNUSEDPARM(self), PyO
   struct svn_lock_t *arg1 = (struct svn_lock_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_lock_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_lock_t",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7470,7 +7566,7 @@ fail:
 
 SWIGINTERN PyObject *svn_lock_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_lock_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7487,7 +7583,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_create(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_lock_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -7532,7 +7628,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_lock_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_lock_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7581,7 +7677,7 @@ SWIGINTERN PyObject *_wrap_svn_uuid_generate(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_uuid_generate",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uuid_generate",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -7618,7 +7714,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_start_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_merge_range_t_start_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_merge_range_t_start_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7645,7 +7741,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_start_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_merge_range_t_start_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_merge_range_t_start_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7667,7 +7763,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_end_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_merge_range_t_end_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_merge_range_t_end_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7694,7 +7790,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_end_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_merge_range_t_end_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_merge_range_t_end_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7716,7 +7812,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_inheritable_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_merge_range_t_inheritable_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_merge_range_t_inheritable_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7743,7 +7839,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_inheritable_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_merge_range_t_inheritable_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_merge_range_t_inheritable_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7762,7 +7858,7 @@ SWIGINTERN PyObject *_wrap_new_svn_merge_range_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_merge_range_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_merge_range_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_merge_range_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -7784,7 +7880,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_merge_range_t(PyObject *SWIGUNUSEDPARM(sel
   struct svn_merge_range_t *arg1 = (struct svn_merge_range_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_merge_range_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_merge_range_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7808,7 +7904,7 @@ fail:
 
 SWIGINTERN PyObject *svn_merge_range_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_merge_range_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7827,7 +7923,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_dup(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_merge_range_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_merge_range_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7872,7 +7968,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_contains_rev(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_merge_range_contains_rev",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_merge_range_contains_rev",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7907,7 +8003,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_range_start_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_location_segment_t_range_start_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_location_segment_t_range_start_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7934,7 +8030,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_range_start_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_location_segment_t_range_start_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_location_segment_t_range_start_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7956,7 +8052,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_range_end_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_location_segment_t_range_end_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_location_segment_t_range_end_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7983,7 +8079,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_range_end_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_location_segment_t_range_end_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_location_segment_t_range_end_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8003,8 +8099,9 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_path_set(PyObject *SWIGUNUSEDP
   struct svn_location_segment_t *arg1 = (struct svn_location_segment_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_location_segment_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_location_segment_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8012,6 +8109,10 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_path_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_location_segment_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -8032,7 +8133,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_path_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_location_segment_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_location_segment_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8051,7 +8152,7 @@ SWIGINTERN PyObject *_wrap_new_svn_location_segment_t(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   struct svn_location_segment_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_location_segment_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_location_segment_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -8073,7 +8174,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_location_segment_t(PyObject *SWIGUNUSEDPAR
   struct svn_location_segment_t *arg1 = (struct svn_location_segment_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_location_segment_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_location_segment_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8097,7 +8198,7 @@ fail:
 
 SWIGINTERN PyObject *svn_location_segment_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_location_segment_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8116,7 +8217,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_dup(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_location_segment_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_location_segment_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8155,7 +8256,7 @@ fail:
 
 SWIGINTERN PyObject *svn_version_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_version_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8178,7 +8279,7 @@ SWIGINTERN PyObject *_wrap_svn_log_invoke_entry_receiver(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_log_invoke_entry_receiver",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_invoke_entry_receiver",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_log_entry_receiver_t * tmp =
     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);
@@ -8256,6 +8357,9 @@ SWIGINTERN PyObject *_wrap_svn_log_invoke_message_receiver(PyObject *SWIGUNUSEDP
   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 ;
   
@@ -8263,7 +8367,7 @@ SWIGINTERN PyObject *_wrap_svn_log_invoke_message_receiver(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOsss|O:svn_log_invoke_message_receiver",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&arg7,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_log_invoke_message_receiver",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     svn_log_message_receiver_t * tmp =
     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);
@@ -8300,6 +8404,18 @@ SWIGINTERN PyObject *_wrap_svn_log_invoke_message_receiver(PyObject *SWIGUNUSEDP
       SWIG_fail;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_log_invoke_message_receiver", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_log_invoke_message_receiver", "date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_log_invoke_message_receiver", "message");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
     if (obj7 != Py_None && obj7 != _global_py_pool) {
@@ -8357,7 +8473,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_invoke_callback2(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_commit_invoke_callback2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_invoke_callback2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_commit_callback2_t * tmp =
     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);
@@ -8428,10 +8544,12 @@ SWIGINTERN PyObject *_wrap_svn_commit_invoke_callback(PyObject *SWIGUNUSEDPARM(s
   void *arg5 = (void *) 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOssO:svn_commit_invoke_callback",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_commit_invoke_callback",5,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_commit_callback_t * tmp =
     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);
@@ -8447,6 +8565,14 @@ SWIGINTERN PyObject *_wrap_svn_commit_invoke_callback(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_commit_invoke_callback", "date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_commit_invoke_callback", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None) {
       arg5 = NULL;
     } else if (SWIG_ConvertPtr(obj4, (void **) &arg5, 0, 0) == -1) {
@@ -8487,7 +8613,7 @@ SWIGINTERN PyObject *_wrap_svn_cancel_invoke_func(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_cancel_invoke_func",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cancel_invoke_func",2,2,&obj0,&obj1)) SWIG_fail;
   {
     svn_cancel_func_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj0);
@@ -8547,7 +8673,7 @@ SWIGINTERN PyObject *_wrap_svn_location_invoke_segment_receiver(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_location_invoke_segment_receiver",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_location_invoke_segment_receiver",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_location_segment_receiver_t * tmp =
     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);
@@ -8611,42 +8737,42 @@ fail:
 
 SWIGINTERN PyObject *svn_log_entry_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_log_message_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_commit_callback2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_commit_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_cancel_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_location_segment_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8668,7 +8794,7 @@ SWIGINTERN PyObject *_wrap_svn_pool_create(PyObject *SWIGUNUSEDPARM(self), PyObj
   {
     arg2 = NULL;
   }
-  if (!PyArg_ParseTuple(args,(char *)"|OO:svn_pool_create",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_pool_create",0,2,&obj0,&obj1)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -8713,7 +8839,7 @@ SWIGINTERN PyObject *_wrap_svn_pool_create_allocator(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   apr_allocator_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_pool_create_allocator",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_pool_create_allocator",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -8744,7 +8870,7 @@ SWIGINTERN PyObject *_wrap_svn_ver_compatible(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ver_compatible",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ver_compatible",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8780,7 +8906,7 @@ SWIGINTERN PyObject *_wrap_svn_ver_equal(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ver_equal",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ver_equal",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8813,8 +8939,9 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_label_set(PyObject *SWIGUNUSE
   struct svn_version_checklist_t *arg1 = (struct svn_version_checklist_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_checklist_t_label_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_checklist_t_label_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8822,6 +8949,10 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_label_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_version_checklist_t_label_set", "label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->label) free((char *)arg1->label);
@@ -8842,7 +8973,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_label_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_checklist_t_label_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_checklist_t_label_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8864,7 +8995,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_version_query_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_version_checklist_t_version_query_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_checklist_t_version_query_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8891,7 +9022,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_version_query_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_version_t *(*result)(void) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_checklist_t_version_query_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_checklist_t_version_query_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8910,7 +9041,7 @@ SWIGINTERN PyObject *_wrap_new_svn_version_checklist_t(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   struct svn_version_checklist_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_version_checklist_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_version_checklist_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -8932,7 +9063,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_version_checklist_t(PyObject *SWIGUNUSEDPA
   struct svn_version_checklist_t *arg1 = (struct svn_version_checklist_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_version_checklist_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_version_checklist_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8956,7 +9087,7 @@ fail:
 
 SWIGINTERN PyObject *svn_version_checklist_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_version_checklist_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8971,7 +9102,7 @@ SWIGINTERN PyObject *_wrap_svn_ver_check_list2(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_ver_check_list2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ver_check_list2",3,3,&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()) {
@@ -9023,7 +9154,7 @@ SWIGINTERN PyObject *_wrap_svn_ver_check_list(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ver_check_list",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ver_check_list",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9065,7 +9196,7 @@ SWIGINTERN PyObject *_wrap_svn_subr_version(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_subr_version")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_subr_version",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -9096,7 +9227,7 @@ SWIGINTERN PyObject *_wrap_svn_version_extended(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_version_extended",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_extended",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -9139,7 +9270,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_build_date(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_build_date",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_build_date",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9167,7 +9298,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_build_time(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_build_time",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_build_time",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9195,7 +9326,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_build_host(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_build_host",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_build_host",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9223,7 +9354,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_copyright(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_copyright",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_copyright",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9251,7 +9382,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_runtime_host(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_runtime_host",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_runtime_host",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9279,7 +9410,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_runtime_osname(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_runtime_osname",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_runtime_osname",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9306,8 +9437,9 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_name_set(PyObject *SWIGU
   struct svn_version_ext_linked_lib_t *arg1 = (struct svn_version_ext_linked_lib_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_linked_lib_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_linked_lib_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9315,6 +9447,10 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_name_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_version_ext_linked_lib_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -9335,7 +9471,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_name_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_linked_lib_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_linked_lib_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9355,8 +9491,9 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_compiled_version_set(PyO
   struct svn_version_ext_linked_lib_t *arg1 = (struct svn_version_ext_linked_lib_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_linked_lib_t_compiled_version_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_linked_lib_t_compiled_version_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9364,6 +9501,10 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_compiled_version_set(PyO
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_version_ext_linked_lib_t_compiled_version_set", "compiled_version");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->compiled_version) free((char *)arg1->compiled_version);
@@ -9384,7 +9525,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_compiled_version_get(PyO
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_linked_lib_t_compiled_version_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_linked_lib_t_compiled_version_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9404,8 +9545,9 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_runtime_version_set(PyOb
   struct svn_version_ext_linked_lib_t *arg1 = (struct svn_version_ext_linked_lib_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_linked_lib_t_runtime_version_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_linked_lib_t_runtime_version_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9413,6 +9555,10 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_runtime_version_set(PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_version_ext_linked_lib_t_runtime_version_set", "runtime_version");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->runtime_version) free((char *)arg1->runtime_version);
@@ -9433,7 +9579,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_runtime_version_get(PyOb
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_linked_lib_t_runtime_version_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_linked_lib_t_runtime_version_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9452,7 +9598,7 @@ SWIGINTERN PyObject *_wrap_new_svn_version_ext_linked_lib_t(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   struct svn_version_ext_linked_lib_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_version_ext_linked_lib_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_version_ext_linked_lib_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -9474,7 +9620,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_version_ext_linked_lib_t(PyObject *SWIGUNU
   struct svn_version_ext_linked_lib_t *arg1 = (struct svn_version_ext_linked_lib_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_version_ext_linked_lib_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_version_ext_linked_lib_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9498,7 +9644,7 @@ fail:
 
 SWIGINTERN PyObject *svn_version_ext_linked_lib_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_version_ext_linked_lib_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9509,7 +9655,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_libs(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_linked_libs",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_linked_libs",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9537,8 +9683,9 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_name_set(PyObject *SWIGU
   struct svn_version_ext_loaded_lib_t *arg1 = (struct svn_version_ext_loaded_lib_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_loaded_lib_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_loaded_lib_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9546,6 +9693,10 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_name_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_version_ext_loaded_lib_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -9566,7 +9717,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_name_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_loaded_lib_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_loaded_lib_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9586,8 +9737,9 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_version_set(PyObject *SW
   struct svn_version_ext_loaded_lib_t *arg1 = (struct svn_version_ext_loaded_lib_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_loaded_lib_t_version_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_loaded_lib_t_version_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9595,6 +9747,10 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_version_set(PyObject *SW
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_version_ext_loaded_lib_t_version_set", "version");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->version) free((char *)arg1->version);
@@ -9615,7 +9771,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_version_get(PyObject *SW
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_loaded_lib_t_version_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_loaded_lib_t_version_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9634,7 +9790,7 @@ SWIGINTERN PyObject *_wrap_new_svn_version_ext_loaded_lib_t(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   struct svn_version_ext_loaded_lib_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_version_ext_loaded_lib_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_version_ext_loaded_lib_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -9656,7 +9812,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_version_ext_loaded_lib_t(PyObject *SWIGUNU
   struct svn_version_ext_loaded_lib_t *arg1 = (struct svn_version_ext_loaded_lib_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_version_ext_loaded_lib_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_version_ext_loaded_lib_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9680,7 +9836,7 @@ fail:
 
 SWIGINTERN PyObject *svn_version_ext_loaded_lib_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_version_ext_loaded_lib_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9691,7 +9847,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_libs(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_loaded_libs",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_ext_loaded_libs",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9716,7 +9872,7 @@ fail:
 
 SWIGINTERN PyObject *svn_version_extended_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_version_extended_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9727,7 +9883,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_invoke_version_query(PyObject *
   PyObject * obj0 = 0 ;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_checklist_invoke_version_query",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_checklist_invoke_version_query",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9756,7 +9912,7 @@ SWIGINTERN PyObject *_wrap_svn_version_invoke_func(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_version_invoke_func",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_version_invoke_func",1,1,&obj0)) SWIG_fail;
   {
     svn_version_func_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_void__p_svn_version_t, svn_argnum_obj0);
@@ -9783,7 +9939,7 @@ fail:
 
 SWIGINTERN PyObject *svn_version_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_void__p_svn_version_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9802,7 +9958,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_prop_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9853,7 +10009,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_array_dup(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_array_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_array_dup",1,2,&obj0,&obj1)) 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()) {
@@ -9895,8 +10051,9 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_path_or_url_set(PyObject *S
   struct svn_prop_inherited_item_t *arg1 = (struct svn_prop_inherited_item_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_prop_inherited_item_t_path_or_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_inherited_item_t_path_or_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9904,6 +10061,10 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_path_or_url_set(PyObject *S
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_prop_inherited_item_t_path_or_url_set", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path_or_url) free((char *)arg1->path_or_url);
@@ -9924,7 +10085,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_path_or_url_get(PyObject *S
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_inherited_item_t_path_or_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_inherited_item_t_path_or_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9946,7 +10107,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_prop_hash_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_prop_inherited_item_t_prop_hash_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_inherited_item_t_prop_hash_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9973,7 +10134,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_prop_hash_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_inherited_item_t_prop_hash_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_inherited_item_t_prop_hash_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9993,7 +10154,7 @@ SWIGINTERN PyObject *_wrap_new_svn_prop_inherited_item_t(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   struct svn_prop_inherited_item_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_prop_inherited_item_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_prop_inherited_item_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -10015,7 +10176,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_prop_inherited_item_t(PyObject *SWIGUNUSED
   struct svn_prop_inherited_item_t *arg1 = (struct svn_prop_inherited_item_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_prop_inherited_item_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_prop_inherited_item_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10039,7 +10200,7 @@ fail:
 
 SWIGINTERN PyObject *svn_prop_inherited_item_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_prop_inherited_item_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -10058,7 +10219,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_hash_to_array(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_hash_to_array",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_hash_to_array",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -10116,7 +10277,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_array_to_hash(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_array_to_hash",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_array_to_hash",1,2,&obj0,&obj1)) 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()) {
@@ -10167,7 +10328,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_hash_dup(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_hash_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_hash_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -10216,9 +10377,10 @@ SWIGINTERN PyObject *_wrap_svn_prop_get_value(PyObject *SWIGUNUSEDPARM(self), Py
   apr_hash_t *arg1 = (apr_hash_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_prop_get_value",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_get_value",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10226,6 +10388,10 @@ SWIGINTERN PyObject *_wrap_svn_prop_get_value(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_prop_get_value", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (char *)svn_prop_get_value((apr_hash_t const *)arg1,(char const *)arg2);
@@ -10243,9 +10409,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_property_kind2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_prop_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_property_kind2",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_property_kind2",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_property_kind2", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10267,10 +10438,15 @@ SWIGINTERN PyObject *_wrap_svn_property_kind(PyObject *SWIGUNUSEDPARM(self), PyO
   char *arg2 = (char *) 0 ;
   int temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   svn_prop_kind_t result;
   
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_property_kind",&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_property_kind",1,1,&obj0)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_property_kind", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10295,9 +10471,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_prop_is_svn_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_prop_is_svn_prop",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_is_svn_prop",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_prop_is_svn_prop", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10327,7 +10508,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_has_svn_prop(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_has_svn_prop",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_has_svn_prop",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -10373,9 +10554,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_prop_is_boolean(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_prop_is_boolean",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_is_boolean",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_prop_is_boolean", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10394,9 +10580,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_prop_is_known_svn_rev_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_prop_is_known_svn_rev_prop",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_is_known_svn_rev_prop",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_prop_is_known_svn_rev_prop", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10415,9 +10606,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_prop_is_known_svn_node_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_prop_is_known_svn_node_prop",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_is_known_svn_node_prop",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_prop_is_known_svn_node_prop", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10436,9 +10632,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_prop_is_known_svn_file_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_prop_is_known_svn_file_prop",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_is_known_svn_file_prop",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_prop_is_known_svn_file_prop", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10457,9 +10658,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_prop_is_known_svn_dir_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_prop_is_known_svn_dir_prop",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_is_known_svn_dir_prop",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_prop_is_known_svn_dir_prop", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10478,9 +10684,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_prop_needs_translation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_prop_needs_translation",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_needs_translation",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_prop_needs_translation", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10519,7 +10730,7 @@ SWIGINTERN PyObject *_wrap_svn_categorize_props(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_categorize_props",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_categorize_props",1,2,&obj0,&obj1)) 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()) {
@@ -10593,7 +10804,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_diffs(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_prop_diffs",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_diffs",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -10665,9 +10876,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_prop_name_is_valid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_prop_name_is_valid",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_name_is_valid",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_prop_name_is_valid", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -10688,8 +10904,9 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_name_set(PyObject *SWIGUNU
   struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc3_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10697,6 +10914,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_name_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_subcommand_desc3_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -10717,7 +10938,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_name_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10739,7 +10960,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_cmd_func_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_cmd_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_cmd_func_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10766,7 +10987,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_cmd_func_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_opt_subcommand_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_cmd_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_cmd_func_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10788,7 +11009,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_aliases_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_aliases_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_aliases_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10822,7 +11043,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_aliases_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   char **result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_aliases_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_aliases_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10845,7 +11066,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_help_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_help_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_help_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10879,7 +11100,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_help_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char **result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_help_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_help_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10902,7 +11123,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_valid_options_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_valid_options_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_valid_options_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10936,7 +11157,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_valid_options_get(PyObject
   PyObject * obj0 = 0 ;
   int *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_valid_options_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_valid_options_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10958,7 +11179,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_get(PyObjec
   PyObject * obj0 = 0 ;
   svn_opt_subcommand_desc3_t_desc_overrides *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_desc_overrides_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_desc_overrides_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10978,7 +11199,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc3_t(PyObject *SWIGUNUSEDPA
   PyObject *resultobj = 0;
   struct svn_opt_subcommand_desc3_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_subcommand_desc3_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_opt_subcommand_desc3_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -11000,7 +11221,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc3_t(PyObject *SWIGUNUSE
   struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc3_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_opt_subcommand_desc3_t",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11024,7 +11245,7 @@ fail:
 
 SWIGINTERN PyObject *svn_opt_subcommand_desc3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_subcommand_desc3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -11036,7 +11257,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_set(P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_desc_overrides_optch_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_desc_overrides_optch_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11063,7 +11284,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_get(P
   PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_desc_overrides_optch_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_desc_overrides_optch_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11083,8 +11304,9 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_set(Py
   svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc3_t_desc_overrides_desc_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_desc_overrides_desc_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11092,6 +11314,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_set(Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_subcommand_desc3_t_desc_overrides_desc_set", "desc");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->desc) free((char *)arg1->desc);
@@ -11112,7 +11338,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_get(Py
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_desc_overrides_desc_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc3_t_desc_overrides_desc_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11131,7 +11357,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc3_t_desc_overrides(PyObjec
   PyObject *resultobj = 0;
   svn_opt_subcommand_desc3_t_desc_overrides *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_subcommand_desc3_t_desc_overrides")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_opt_subcommand_desc3_t_desc_overrides",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -11153,7 +11379,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc3_t_desc_overrides(PyOb
   svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc3_t_desc_overrides",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_opt_subcommand_desc3_t_desc_overrides",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11177,7 +11403,7 @@ fail:
 
 SWIGINTERN PyObject *svn_opt_subcommand_desc3_t_desc_overrides_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -11187,8 +11413,9 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_name_set(PyObject *SWIGUNU
   struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc2_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11196,6 +11423,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_name_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_subcommand_desc2_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -11216,7 +11447,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_name_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11238,7 +11469,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_cmd_func_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc2_t_cmd_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_cmd_func_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11265,7 +11496,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_cmd_func_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_opt_subcommand_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_cmd_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_cmd_func_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11287,7 +11518,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_aliases_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc2_t_aliases_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_aliases_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11321,7 +11552,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_aliases_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   char **result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_aliases_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_aliases_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11342,8 +11573,9 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_help_set(PyObject *SWIGUNU
   struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc2_t_help_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_help_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11351,6 +11583,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_help_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_subcommand_desc2_t_help_set", "help");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->help) free((char *)arg1->help);
@@ -11371,7 +11607,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_help_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_help_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_help_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11393,7 +11629,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_valid_options_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc2_t_valid_options_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_valid_options_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11427,7 +11663,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_valid_options_get(PyObject
   PyObject * obj0 = 0 ;
   int *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_valid_options_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_valid_options_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11449,7 +11685,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_get(PyObjec
   PyObject * obj0 = 0 ;
   svn_opt_subcommand_desc2_t_desc_overrides *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_desc_overrides_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_desc_overrides_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11469,7 +11705,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc2_t(PyObject *SWIGUNUSEDPA
   PyObject *resultobj = 0;
   struct svn_opt_subcommand_desc2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_subcommand_desc2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_opt_subcommand_desc2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -11491,7 +11727,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc2_t(PyObject *SWIGUNUSE
   struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_opt_subcommand_desc2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11515,7 +11751,7 @@ fail:
 
 SWIGINTERN PyObject *svn_opt_subcommand_desc2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_subcommand_desc2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -11527,7 +11763,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_set(P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc2_t_desc_overrides_optch_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_desc_overrides_optch_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11554,7 +11790,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_get(P
   PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_desc_overrides_optch_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_desc_overrides_optch_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11574,8 +11810,9 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_set(Py
   svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc2_t_desc_overrides_desc_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_desc_overrides_desc_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11583,6 +11820,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_set(Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_subcommand_desc2_t_desc_overrides_desc_set", "desc");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->desc) free((char *)arg1->desc);
@@ -11603,7 +11844,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_get(Py
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_desc_overrides_desc_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc2_t_desc_overrides_desc_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11622,7 +11863,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc2_t_desc_overrides(PyObjec
   PyObject *resultobj = 0;
   svn_opt_subcommand_desc2_t_desc_overrides *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_subcommand_desc2_t_desc_overrides")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_opt_subcommand_desc2_t_desc_overrides",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -11644,7 +11885,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc2_t_desc_overrides(PyOb
   svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc2_t_desc_overrides",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_opt_subcommand_desc2_t_desc_overrides",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11668,7 +11909,7 @@ fail:
 
 SWIGINTERN PyObject *svn_opt_subcommand_desc2_t_desc_overrides_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -11678,8 +11919,9 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_name_set(PyObject *SWIGUNUS
   struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11687,6 +11929,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_name_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_subcommand_desc_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -11707,7 +11953,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_name_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11729,7 +11975,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_cmd_func_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc_t_cmd_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_cmd_func_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11756,7 +12002,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_cmd_func_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_opt_subcommand_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_cmd_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_cmd_func_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11778,7 +12024,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_aliases_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc_t_aliases_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_aliases_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11812,7 +12058,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_aliases_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char **result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_aliases_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_aliases_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11833,8 +12079,9 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_help_set(PyObject *SWIGUNUS
   struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc_t_help_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_help_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11842,6 +12089,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_help_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_subcommand_desc_t_help_set", "help");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->help) free((char *)arg1->help);
@@ -11862,7 +12113,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_help_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_help_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_help_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11884,7 +12135,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_valid_options_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc_t_valid_options_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_valid_options_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11918,7 +12169,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_valid_options_get(PyObject
   PyObject * obj0 = 0 ;
   int *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_valid_options_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_desc_t_valid_options_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11938,7 +12189,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc_t(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   struct svn_opt_subcommand_desc_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_subcommand_desc_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_opt_subcommand_desc_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -11960,7 +12211,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc_t(PyObject *SWIGUNUSED
   struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_opt_subcommand_desc_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11984,7 +12235,7 @@ fail:
 
 SWIGINTERN PyObject *svn_opt_subcommand_desc_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_subcommand_desc_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -11994,9 +12245,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand3(PyObject *SWIGUNUSE
   svn_opt_subcommand_desc3_t *arg1 = (svn_opt_subcommand_desc3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_opt_subcommand_desc3_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_get_canonical_subcommand3",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_get_canonical_subcommand3",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12004,6 +12256,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand3(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_get_canonical_subcommand3", "cmd_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_opt_subcommand_desc3_t *)svn_opt_get_canonical_subcommand3((struct svn_opt_subcommand_desc3_t const *)arg1,(char const *)arg2);
@@ -12024,9 +12280,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand2(PyObject *SWIGUNUSE
   svn_opt_subcommand_desc2_t *arg1 = (svn_opt_subcommand_desc2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_opt_subcommand_desc2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_get_canonical_subcommand2",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_get_canonical_subcommand2",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12034,6 +12291,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand2(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_get_canonical_subcommand2", "cmd_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_opt_subcommand_desc2_t *)svn_opt_get_canonical_subcommand2((struct svn_opt_subcommand_desc2_t const *)arg1,(char const *)arg2);
@@ -12054,9 +12315,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand(PyObject *SWIGUNUSED
   svn_opt_subcommand_desc_t *arg1 = (svn_opt_subcommand_desc_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_opt_subcommand_desc_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_get_canonical_subcommand",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_get_canonical_subcommand",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12064,6 +12326,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_get_canonical_subcommand", "cmd_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_opt_subcommand_desc_t *)svn_opt_get_canonical_subcommand((struct svn_opt_subcommand_desc_t const *)arg1,(char const *)arg2);
@@ -12097,7 +12363,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code3(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_opt_get_option_from_code3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_get_option_from_code3",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (int)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -12164,7 +12430,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code2(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_opt_get_option_from_code2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_get_option_from_code2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (int)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -12221,7 +12487,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   apr_getopt_option_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_get_option_from_code",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_get_option_from_code",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (int)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -12262,7 +12528,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option4(PyObject *SWIGUNUSED
   svn_boolean_t result;
   
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_takes_option4",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_takes_option4",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12308,7 +12574,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option3(PyObject *SWIGUNUSED
   svn_boolean_t result;
   
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_takes_option3",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_takes_option3",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12350,7 +12616,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option2(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_takes_option2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_takes_option2",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12386,7 +12652,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_takes_option",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_takes_option",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12424,8 +12690,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help3(PyObject *SWIGUNUSEDPARM(
   FILE *arg6 = (FILE *) 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 ;
   
@@ -12433,7 +12701,11 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help3(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOs|OO:svn_opt_print_generic_help3",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_print_generic_help3",4,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_opt_print_generic_help3", "header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -12446,6 +12718,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help3(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_opt_print_generic_help3", "footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -12456,7 +12732,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help3(PyObject *SWIGUNUSEDPARM(
   }
   if (obj5) {
     {
-      arg6 = PyFile_AsFile(obj5);
+      arg6 = svn_swig_py_as_file(obj5);
       if (arg6 == NULL) {
         PyErr_SetString(PyExc_ValueError, "Must pass in a valid file object");
         SWIG_fail;
@@ -12494,8 +12770,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help2(PyObject *SWIGUNUSEDPARM(
   FILE *arg6 = (FILE *) 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 ;
   
@@ -12503,7 +12781,11 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help2(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOs|OO:svn_opt_print_generic_help2",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_print_generic_help2",4,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_opt_print_generic_help2", "header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -12516,6 +12798,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help2(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_opt_print_generic_help2", "footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -12526,7 +12812,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help2(PyObject *SWIGUNUSEDPARM(
   }
   if (obj5) {
     {
-      arg6 = PyFile_AsFile(obj5);
+      arg6 = svn_swig_py_as_file(obj5);
       if (arg6 == NULL) {
         PyErr_SetString(PyExc_ValueError, "Must pass in a valid file object");
         SWIG_fail;
@@ -12572,7 +12858,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_format_option(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_opt_format_option",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_format_option",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12609,7 +12895,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_format_option(PyObject *SWIGUNUSEDPARM(self),
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -12638,6 +12924,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help4(PyObject *SWIGUNUSEDPARM(sel
   PyObject *_global_py_pool = NULL ;
   int temp4 ;
   int res4 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -12647,7 +12934,11 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help4(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg5 = _global_pool;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_opt_subcommand_help4",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_help4",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_opt_subcommand_help4", "subcommand");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -12706,6 +12997,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help3(PyObject *SWIGUNUSEDPARM(sel
   PyObject *_global_py_pool = NULL ;
   int temp4 ;
   int res4 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -12715,7 +13007,11 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help3(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg5 = _global_pool;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_opt_subcommand_help3",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_help3",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_opt_subcommand_help3", "subcommand");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -12771,6 +13067,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help2(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *arg4 = (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 ;
@@ -12779,7 +13076,11 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help2(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_opt_subcommand_help2",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_help2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_opt_subcommand_help2", "subcommand");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -12829,6 +13130,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *arg4 = (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 ;
@@ -12837,7 +13139,11 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_opt_subcommand_help",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_subcommand_help",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_opt_subcommand_help", "subcommand");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -12886,7 +13192,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_value_t_number_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_value_t_number_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_value_t_number_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12913,7 +13219,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_value_t_number_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_value_t_number_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_value_t_number_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12935,7 +13241,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_value_t_date_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_value_t_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_value_t_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12957,7 +13263,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_value_t_date_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_value_t_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_value_t_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12976,7 +13282,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_revision_value_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   union svn_opt_revision_value_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_revision_value_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_opt_revision_value_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -12998,7 +13304,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_revision_value_t(PyObject *SWIGUNUSEDP
   union svn_opt_revision_value_t *arg1 = (union svn_opt_revision_value_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_revision_value_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_opt_revision_value_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13022,7 +13328,7 @@ fail:
 
 SWIGINTERN PyObject *svn_opt_revision_value_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_revision_value_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -13034,7 +13340,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_t_kind_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13061,7 +13367,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_t_kind_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   enum svn_opt_revision_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13083,7 +13389,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_t_value_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_t_value_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_t_value_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13110,7 +13416,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_t_value_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_opt_revision_value_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_t_value_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_t_value_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13130,7 +13436,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_revision_t(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   struct svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_revision_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_opt_revision_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -13152,7 +13458,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_revision_t(PyObject *SWIGUNUSEDPARM(se
   struct svn_opt_revision_t *arg1 = (struct svn_opt_revision_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_revision_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_opt_revision_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13176,7 +13482,7 @@ fail:
 
 SWIGINTERN PyObject *svn_opt_revision_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_revision_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -13188,7 +13494,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_range_t_start_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_range_t_start_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_range_t_start_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13215,7 +13521,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_range_t_start_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_range_t_start_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_range_t_start_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13238,7 +13544,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_range_t_end_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_range_t_end_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_range_t_end_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13265,7 +13571,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_range_t_end_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_range_t_end_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_revision_range_t_end_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13285,7 +13591,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_revision_range_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_opt_revision_range_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_revision_range_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_opt_revision_range_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -13307,7 +13613,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_revision_range_t(PyObject *SWIGUNUSEDP
   struct svn_opt_revision_range_t *arg1 = (struct svn_opt_revision_range_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_revision_range_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_opt_revision_range_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13331,7 +13637,7 @@ fail:
 
 SWIGINTERN PyObject *svn_opt_revision_range_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_revision_range_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -13346,6 +13652,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revision(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   int result;
   
@@ -13353,7 +13660,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revision(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_opt_parse_revision",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_parse_revision",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13366,6 +13673,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revision(PyObject *SWIGUNUSEDPARM(self)
       SWIG_fail;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_opt_parse_revision", "arg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -13403,6 +13714,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revision_to_range(PyObject *SWIGUNUSEDP
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   int result;
   
@@ -13410,13 +13722,17 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revision_to_range(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_opt_parse_revision_to_range",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_parse_revision_to_range",2,3,&obj0,&obj1,&obj2)) 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;
     }
   }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_parse_revision_to_range", "arg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -13466,7 +13782,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_resolve_revisions(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_opt_resolve_revisions",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_resolve_revisions",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13549,7 +13865,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_args_to_target_array3(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_opt_args_to_target_array3",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_args_to_target_array3",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13623,7 +13939,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_args_to_target_array2(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_opt_args_to_target_array2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_args_to_target_array2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13686,6 +14002,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revprop(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -13694,7 +14011,11 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revprop(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_opt_parse_revprop",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_parse_revprop",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_opt_parse_revprop", "revprop_spec");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -13750,7 +14071,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_push_implicit_dot_target(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_opt_push_implicit_dot_target",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_push_implicit_dot_target",1,2,&obj0,&obj1)) 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()) {
@@ -13805,7 +14126,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_num_args(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_opt_parse_num_args",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_parse_num_args",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13877,7 +14198,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_all_args(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_opt_parse_all_args",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_parse_all_args",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13936,6 +14257,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_path(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   char *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -13944,13 +14266,17 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_path(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_opt_parse_path",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_parse_path",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_parse_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -13985,7 +14311,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_path(PyObject *SWIGUNUSEDPARM(self), Py
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -14022,11 +14348,15 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help5(PyObject *SWIGUNUSEDPARM(self), P
   int temp10 ;
   int res10 = SWIG_TMPOBJ ;
   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 ;
   svn_error_t *result = 0 ;
   
@@ -14035,7 +14365,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help5(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg12 = _global_pool;
   arg10 = &temp10;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOssOOs|O:svn_opt_print_help5",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7,&obj8,&arg11,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_print_help5",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14043,6 +14373,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help5(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_print_help5", "pgm_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -14061,6 +14395,14 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help5(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_opt_print_help5", "version_footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_opt_print_help5", "header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -14072,6 +14414,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help5(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_opt_print_help5", "footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj10) {
     /* Verify that the user supplied a valid pool */
     if (obj10 != Py_None && obj10 != _global_py_pool) {
@@ -14136,11 +14482,15 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P
   int temp10 ;
   int res10 = SWIG_TMPOBJ ;
   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 ;
   svn_error_t *result = 0 ;
   
@@ -14149,7 +14499,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg12 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_print_help4",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14157,6 +14507,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_print_help4", "pgm_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -14175,6 +14529,14 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_opt_print_help4", "version_footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_opt_print_help4", "header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -14186,6 +14548,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_opt_print_help4", "footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj10) {
     /* Verify that the user supplied a valid pool */
     if (obj10 != Py_None && obj10 != _global_py_pool) {
@@ -14249,10 +14615,14 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help3(PyObject *SWIGUNUSEDPARM(self), P
   int temp9 ;
   int res9 = SWIG_TMPOBJ ;
   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 ;
   svn_error_t *result = 0 ;
   
@@ -14261,7 +14631,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help3(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg11 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_print_help3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14269,6 +14639,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help3(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_print_help3", "pgm_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -14281,6 +14655,14 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help3(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_opt_print_help3", "version_footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_opt_print_help3", "header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -14292,6 +14674,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help3(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
+  {
+    arg10 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_opt_print_help3", "footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj9) {
     /* Verify that the user supplied a valid pool */
     if (obj9 != Py_None && obj9 != _global_py_pool) {
@@ -14352,10 +14738,14 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help2(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   svn_error_t *result = 0 ;
   
@@ -14363,7 +14753,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_print_help2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14371,6 +14761,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_print_help2", "pgm_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -14383,6 +14777,14 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_opt_print_help2", "version_footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_opt_print_help2", "header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -14394,6 +14796,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help2(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_opt_print_help2", "footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj9) {
     /* Verify that the user supplied a valid pool */
     if (obj9 != Py_None && obj9 != _global_py_pool) {
@@ -14448,10 +14854,14 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
   svn_error_t *result = 0 ;
   
@@ -14459,7 +14869,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_opt_print_help",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14467,6 +14877,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_opt_print_help", "pgm_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -14479,6 +14893,14 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_opt_print_help", "version_footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_opt_print_help", "header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -14490,6 +14912,10 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help(PyObject *SWIGUNUSEDPARM(self), Py
       SWIG_fail;
     }
   }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_opt_print_help", "footer");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj9) {
     /* Verify that the user supplied a valid pool */
     if (obj9 != Py_None && obj9 != _global_py_pool) {
@@ -14533,12 +14959,17 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_init(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   FILE *arg2 = (FILE *) 0 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"sO:svn_cmdline_init",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cmdline_init",2,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_cmdline_init", "progname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
-    arg2 = PyFile_AsFile(obj1);
+    arg2 = svn_swig_py_as_file(obj1);
     if (arg2 == NULL) {
       PyErr_SetString(PyExc_ValueError, "Must pass in a valid file object");
       SWIG_fail;
@@ -14580,6 +15011,9 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton2(PyObject *SWIGUNUSEDPA
   PyObject *_global_py_pool = NULL ;
   svn_auth_baton_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -14596,7 +15030,7 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton2(PyObject *SWIGUNUSEDPA
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cmdline_create_auth_baton2",12,13,&obj0,&obj1,&obj2,&obj3,&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)) {
@@ -14604,6 +15038,18 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton2(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_cmdline_create_auth_baton2", "username");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_cmdline_create_auth_baton2", "password");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_cmdline_create_auth_baton2", "config_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -14711,6 +15157,9 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton(PyObject *SWIGUNUSEDPAR
   PyObject *_global_py_pool = NULL ;
   svn_auth_baton_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -14723,7 +15172,7 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg11 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OzzzOOOO|O:svn_cmdline_create_auth_baton",&obj0,&arg3,&arg4,&arg5,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cmdline_create_auth_baton",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -14731,6 +15180,18 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_cmdline_create_auth_baton", "username");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_cmdline_create_auth_baton", "password");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_cmdline_create_auth_baton", "config_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -14802,8 +15263,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_cred_kind_set(PyObject *SWIGUNUSE
   struct svn_auth_provider_t *arg1 = (struct svn_auth_provider_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_provider_t_cred_kind_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_t_cred_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14811,6 +15273,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_cred_kind_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_provider_t_cred_kind_set", "cred_kind");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->cred_kind) free((char *)arg1->cred_kind);
@@ -14831,7 +15297,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_cred_kind_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_t_cred_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_t_cred_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14853,7 +15319,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_first_credentials_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_t_first_credentials_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_t_first_credentials_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14880,7 +15346,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_first_credentials_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_t_first_credentials_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_t_first_credentials_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14902,7 +15368,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_next_credentials_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_t_next_credentials_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_t_next_credentials_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14929,7 +15395,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_next_credentials_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_t_next_credentials_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_t_next_credentials_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14951,7 +15417,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_save_credentials_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_t_save_credentials_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_t_save_credentials_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14978,7 +15444,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_save_credentials_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_t_save_credentials_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_t_save_credentials_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14997,7 +15463,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_provider_t(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   struct svn_auth_provider_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_auth_provider_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_auth_provider_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -15019,7 +15485,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_provider_t(PyObject *SWIGUNUSEDPARM(s
   struct svn_auth_provider_t *arg1 = (struct svn_auth_provider_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_provider_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_auth_provider_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15043,7 +15509,7 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_provider_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_provider_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -15055,7 +15521,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_vtable_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_object_t_vtable_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_object_t_vtable_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15082,7 +15548,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_vtable_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_auth_provider_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_object_t_vtable_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_object_t_vtable_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15105,7 +15571,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_provider_baton_set(PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_object_t_provider_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_object_t_provider_baton_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15134,7 +15600,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_provider_baton_get(PyObjec
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_object_t_provider_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_object_t_provider_baton_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15177,7 +15643,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_provider_object_t(PyObject *SWIGUNUSEDPA
   PyObject *resultobj = 0;
   struct svn_auth_provider_object_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_auth_provider_object_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_auth_provider_object_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -15199,7 +15665,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_provider_object_t(PyObject *SWIGUNUSE
   struct svn_auth_provider_object_t *arg1 = (struct svn_auth_provider_object_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_provider_object_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_auth_provider_object_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15223,7 +15689,7 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_provider_object_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_provider_object_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -15233,8 +15699,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_username_set(PyObject *SWIGUNU
   struct svn_auth_cred_simple_t *arg1 = (struct svn_auth_cred_simple_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_auth_cred_simple_t_username_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_simple_t_username_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15242,6 +15709,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_username_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_auth_cred_simple_t_username_set", "username");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->username) free((char *)arg1->username);
@@ -15262,7 +15733,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_username_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_simple_t_username_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_simple_t_username_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15282,8 +15753,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_password_set(PyObject *SWIGUNU
   struct svn_auth_cred_simple_t *arg1 = (struct svn_auth_cred_simple_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_auth_cred_simple_t_password_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_simple_t_password_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15291,6 +15763,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_password_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_auth_cred_simple_t_password_set", "password");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->password) free((char *)arg1->password);
@@ -15311,7 +15787,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_password_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_simple_t_password_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_simple_t_password_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15333,7 +15809,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_may_save_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_simple_t_may_save_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_simple_t_may_save_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15360,7 +15836,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_may_save_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_simple_t_may_save_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_simple_t_may_save_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15379,7 +15855,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_simple_t(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   struct svn_auth_cred_simple_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_auth_cred_simple_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_auth_cred_simple_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -15401,7 +15877,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_simple_t(PyObject *SWIGUNUSEDPAR
   struct svn_auth_cred_simple_t *arg1 = (struct svn_auth_cred_simple_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_simple_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_auth_cred_simple_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15425,7 +15901,7 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_cred_simple_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_cred_simple_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -15435,8 +15911,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_username_set(PyObject *SWIGU
   struct svn_auth_cred_username_t *arg1 = (struct svn_auth_cred_username_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_auth_cred_username_t_username_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_username_t_username_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15444,6 +15921,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_username_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_auth_cred_username_t_username_set", "username");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->username) free((char *)arg1->username);
@@ -15464,7 +15945,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_username_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_username_t_username_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_username_t_username_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15486,7 +15967,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_may_save_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_username_t_may_save_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_username_t_may_save_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15513,7 +15994,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_may_save_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_username_t_may_save_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_username_t_may_save_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15532,7 +16013,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_username_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_auth_cred_username_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_auth_cred_username_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_auth_cred_username_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -15554,7 +16035,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_username_t(PyObject *SWIGUNUSEDP
   struct svn_auth_cred_username_t *arg1 = (struct svn_auth_cred_username_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_username_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_auth_cred_username_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15578,7 +16059,7 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_cred_username_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_cred_username_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -15588,8 +16069,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_cert_file_set(PyObjec
   struct svn_auth_cred_ssl_client_cert_t *arg1 = (struct svn_auth_cred_ssl_client_cert_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_cred_ssl_client_cert_t_cert_file_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_client_cert_t_cert_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15597,6 +16079,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_cert_file_set(PyObjec
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_cred_ssl_client_cert_t_cert_file_set", "cert_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->cert_file) free((char *)arg1->cert_file);
@@ -15617,7 +16103,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_cert_file_get(PyObjec
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_client_cert_t_cert_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_client_cert_t_cert_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15639,7 +16125,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_may_save_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_ssl_client_cert_t_may_save_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_client_cert_t_may_save_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15666,7 +16152,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_may_save_get(PyObject
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_client_cert_t_may_save_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_client_cert_t_may_save_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15685,7 +16171,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_ssl_client_cert_t(PyObject *SWIGUNU
   PyObject *resultobj = 0;
   struct svn_auth_cred_ssl_client_cert_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_auth_cred_ssl_client_cert_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_auth_cred_ssl_client_cert_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -15707,7 +16193,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_ssl_client_cert_t(PyObject *SWIG
   struct svn_auth_cred_ssl_client_cert_t *arg1 = (struct svn_auth_cred_ssl_client_cert_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_ssl_client_cert_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_auth_cred_ssl_client_cert_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15731,7 +16217,7 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_cred_ssl_client_cert_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -15741,8 +16227,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_password_set(PyObj
   struct svn_auth_cred_ssl_client_cert_pw_t *arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_auth_cred_ssl_client_cert_pw_t_password_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_client_cert_pw_t_password_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15750,6 +16237,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_password_set(PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_auth_cred_ssl_client_cert_pw_t_password_set", "password");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->password) free((char *)arg1->password);
@@ -15770,7 +16261,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_password_get(PyObj
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_client_cert_pw_t_password_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_client_cert_pw_t_password_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15792,7 +16283,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_may_save_set(PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_ssl_client_cert_pw_t_may_save_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_client_cert_pw_t_may_save_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15819,7 +16310,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_may_save_get(PyObj
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_client_cert_pw_t_may_save_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_client_cert_pw_t_may_save_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15838,7 +16329,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_ssl_client_cert_pw_t(PyObject *SWIG
   PyObject *resultobj = 0;
   struct svn_auth_cred_ssl_client_cert_pw_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_auth_cred_ssl_client_cert_pw_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_auth_cred_ssl_client_cert_pw_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -15860,7 +16351,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_ssl_client_cert_pw_t(PyObject *S
   struct svn_auth_cred_ssl_client_cert_pw_t *arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_ssl_client_cert_pw_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_auth_cred_ssl_client_cert_pw_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15884,7 +16375,7 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_cred_ssl_client_cert_pw_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -15894,8 +16385,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_hostname_set(PyObject
   struct svn_auth_ssl_server_cert_info_t *arg1 = (struct svn_auth_ssl_server_cert_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_hostname_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_hostname_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15903,6 +16395,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_hostname_set(PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_ssl_server_cert_info_t_hostname_set", "hostname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->hostname) free((char *)arg1->hostname);
@@ -15923,7 +16419,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_hostname_get(PyObject
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_hostname_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_hostname_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15943,8 +16439,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_fingerprint_set(PyObj
   struct svn_auth_ssl_server_cert_info_t *arg1 = (struct svn_auth_ssl_server_cert_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_fingerprint_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_fingerprint_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15952,6 +16449,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_fingerprint_set(PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_ssl_server_cert_info_t_fingerprint_set", "fingerprint");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->fingerprint) free((char *)arg1->fingerprint);
@@ -15972,7 +16473,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_fingerprint_get(PyObj
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_fingerprint_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_fingerprint_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15992,8 +16493,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_from_set(PyObje
   struct svn_auth_ssl_server_cert_info_t *arg1 = (struct svn_auth_ssl_server_cert_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_valid_from_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_valid_from_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16001,6 +16503,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_from_set(PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_ssl_server_cert_info_t_valid_from_set", "valid_from");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->valid_from) free((char *)arg1->valid_from);
@@ -16021,7 +16527,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_from_get(PyObje
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_valid_from_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_valid_from_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16041,8 +16547,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_until_set(PyObj
   struct svn_auth_ssl_server_cert_info_t *arg1 = (struct svn_auth_ssl_server_cert_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_valid_until_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_valid_until_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16050,6 +16557,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_until_set(PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_ssl_server_cert_info_t_valid_until_set", "valid_until");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->valid_until) free((char *)arg1->valid_until);
@@ -16070,7 +16581,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_until_get(PyObj
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_valid_until_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_valid_until_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16090,8 +16601,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_issuer_dname_set(PyOb
   struct svn_auth_ssl_server_cert_info_t *arg1 = (struct svn_auth_ssl_server_cert_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_issuer_dname_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_issuer_dname_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16099,6 +16611,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_issuer_dname_set(PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_ssl_server_cert_info_t_issuer_dname_set", "issuer_dname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->issuer_dname) free((char *)arg1->issuer_dname);
@@ -16119,7 +16635,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_issuer_dname_get(PyOb
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_issuer_dname_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_issuer_dname_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16139,8 +16655,9 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_ascii_cert_set(PyObje
   struct svn_auth_ssl_server_cert_info_t *arg1 = (struct svn_auth_ssl_server_cert_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_ascii_cert_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_ascii_cert_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16148,6 +16665,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_ascii_cert_set(PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_ssl_server_cert_info_t_ascii_cert_set", "ascii_cert");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->ascii_cert) free((char *)arg1->ascii_cert);
@@ -16168,7 +16689,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_ascii_cert_get(PyObje
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_ascii_cert_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_t_ascii_cert_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16187,7 +16708,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_ssl_server_cert_info_t(PyObject *SWIGUNU
   PyObject *resultobj = 0;
   struct svn_auth_ssl_server_cert_info_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_auth_ssl_server_cert_info_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_auth_ssl_server_cert_info_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -16209,7 +16730,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_ssl_server_cert_info_t(PyObject *SWIG
   struct svn_auth_ssl_server_cert_info_t *arg1 = (struct svn_auth_ssl_server_cert_info_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_ssl_server_cert_info_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_auth_ssl_server_cert_info_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16233,7 +16754,7 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_ssl_server_cert_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -16252,7 +16773,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_dup(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_ssl_server_cert_info_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_ssl_server_cert_info_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16296,7 +16817,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_server_trust_t_may_save_set(PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_ssl_server_trust_t_may_save_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_server_trust_t_may_save_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16323,7 +16844,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_server_trust_t_may_save_get(PyObjec
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_server_trust_t_may_save_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_server_trust_t_may_save_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16345,7 +16866,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_server_trust_t_accepted_failures_se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_ssl_server_trust_t_accepted_failures_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_server_trust_t_accepted_failures_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16372,7 +16893,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_server_trust_t_accepted_failures_ge
   PyObject * obj0 = 0 ;
   apr_uint32_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_server_trust_t_accepted_failures_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_cred_ssl_server_trust_t_accepted_failures_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16391,7 +16912,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_ssl_server_trust_t(PyObject *SWIGUN
   PyObject *resultobj = 0;
   struct svn_auth_cred_ssl_server_trust_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_auth_cred_ssl_server_trust_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_auth_cred_ssl_server_trust_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -16413,7 +16934,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_ssl_server_trust_t(PyObject *SWI
   struct svn_auth_cred_ssl_server_trust_t *arg1 = (struct svn_auth_cred_ssl_server_trust_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_ssl_server_trust_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_auth_cred_ssl_server_trust_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16437,7 +16958,7 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_cred_ssl_server_trust_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -16458,7 +16979,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_open(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_open",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_open",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const svn_auth_provider_object_t *),
@@ -16511,9 +17032,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_set_parameter(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OsO:svn_auth_set_parameter",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_set_parameter",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16521,6 +17043,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_set_parameter(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_set_parameter", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -16528,8 +17054,8 @@ SWIGINTERN PyObject *_wrap_svn_auth_set_parameter(PyObject *SWIGUNUSEDPARM(self)
       SWIG_fail;
     }
     
-    if (PyString_Check(obj2)) {
-      char *value = PyString_AS_STRING(obj2);
+    if (PyBytes_Check(obj2)) {
+      const char *value = PyBytes_AsString(obj2);
       arg3 = apr_pstrdup(_global_pool, value);
     }
     else if (PyLong_Check(obj2)) {
@@ -16579,6 +17105,8 @@ SWIGINTERN PyObject *_wrap_svn_auth_first_credentials(PyObject *SWIGUNUSEDPARM(s
   PyObject *_global_py_pool = NULL ;
   void *temp1 ;
   svn_auth_iterstate_t *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -16589,7 +17117,15 @@ SWIGINTERN PyObject *_wrap_svn_auth_first_credentials(PyObject *SWIGUNUSEDPARM(s
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_auth_first_credentials",&arg3,&arg4,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_first_credentials",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_auth_first_credentials", "cred_kind");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_first_credentials", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg5 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
@@ -16664,7 +17200,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_next_credentials(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_next_credentials",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_next_credentials",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_auth_iterstate_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_iterstate_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16730,7 +17266,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_save_credentials(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_save_credentials",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_save_credentials",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_auth_iterstate_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_iterstate_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16785,6 +17321,8 @@ SWIGINTERN PyObject *_wrap_svn_auth_forget_credentials(PyObject *SWIGUNUSEDPARM(
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -16792,13 +17330,21 @@ SWIGINTERN PyObject *_wrap_svn_auth_forget_credentials(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Oss|O:svn_auth_forget_credentials",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_forget_credentials",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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_string_to_cstring(obj1, FALSE, "svn_auth_forget_credentials", "cred_kind");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_auth_forget_credentials", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -16857,7 +17403,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_simple_prompt_provider(PyObject *SWIGUNU
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_simple_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_simple_prompt_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_auth_simple_prompt_func_t) svn_swig_py_auth_simple_prompt_func;
     arg3 = obj0;
@@ -16922,7 +17468,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_username_prompt_provider(PyObject *SWIGU
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_username_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_username_prompt_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_auth_username_prompt_func_t) svn_swig_py_auth_username_prompt_func;
     arg3 = obj0;
@@ -16986,7 +17532,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_simple_provider2(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_simple_provider2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_simple_provider2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_auth_plaintext_prompt_func_t * tmp =
     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);
@@ -17052,7 +17598,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_simple_provider(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_auth_get_simple_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_simple_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -17097,6 +17643,8 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_platform_specific_provider(PyObject *SWI
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_auth_provider_object_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -17105,7 +17653,15 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_platform_specific_provider(PyObject *SWI
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_auth_get_platform_specific_provider",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_platform_specific_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_auth_get_platform_specific_provider", "provider_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_get_platform_specific_provider", "provider_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -17168,7 +17724,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_platform_specific_client_providers(PyObj
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_get_platform_specific_client_providers",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_platform_specific_client_providers",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -17238,7 +17794,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_username_provider(PyObject *SWIGUNUSEDPA
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_auth_get_username_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_username_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -17288,7 +17844,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_server_trust_file_provider(PyObject
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_auth_get_ssl_server_trust_file_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_ssl_server_trust_file_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -17338,7 +17894,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_file_provider(PyObject *
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_auth_get_ssl_client_cert_file_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_ssl_client_cert_file_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -17392,7 +17948,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_pw_file_provider2(PyObje
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_ssl_client_cert_pw_file_provider2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_ssl_client_cert_pw_file_provider2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_auth_plaintext_passphrase_prompt_func_t * tmp =
     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);
@@ -17458,7 +18014,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_pw_file_provider(PyObjec
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_auth_get_ssl_client_cert_pw_file_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_ssl_client_cert_pw_file_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -17511,7 +18067,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_server_trust_prompt_provider(PyObjec
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_get_ssl_server_trust_prompt_provider",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_ssl_server_trust_prompt_provider",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_auth_ssl_server_trust_prompt_func_t) svn_swig_py_auth_ssl_server_trust_prompt_func;
     arg3 = obj0;
@@ -17570,7 +18126,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_prompt_provider(PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_ssl_client_cert_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_ssl_client_cert_prompt_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_auth_ssl_client_cert_prompt_func_t) svn_swig_py_auth_ssl_client_cert_prompt_func;
     arg3 = obj0;
@@ -17635,7 +18191,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_pw_prompt_provider(PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_ssl_client_cert_pw_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_get_ssl_client_cert_pw_prompt_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_auth_ssl_client_cert_pw_prompt_func_t) svn_swig_py_auth_ssl_client_cert_pw_prompt_func;
     arg3 = obj0;
@@ -17683,14 +18239,14 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_baton_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_baton_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_iterstate_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_iterstate_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -17711,6 +18267,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_first_credentials(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -17720,7 +18277,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_first_credentials(PyObject *
   arg7 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOOs|O:svn_auth_provider_invoke_first_credentials",&obj0,&obj1,&obj2,&arg6,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_invoke_first_credentials",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -17741,6 +18298,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_first_credentials(PyObject *
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_auth_provider_invoke_first_credentials", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -17808,6 +18369,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_next_credentials(PyObject *S
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -17816,7 +18378,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_next_credentials(PyObject *S
   SWIG_fail;
   arg7 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOs|O:svn_auth_provider_invoke_next_credentials",&obj0,&obj1,&obj2,&obj3,&arg6,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_invoke_next_credentials",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -17845,6 +18407,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_next_credentials(PyObject *S
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_auth_provider_invoke_next_credentials", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -17907,6 +18473,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_save_credentials(PyObject *S
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -17915,7 +18482,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_save_credentials(PyObject *S
   SWIG_fail;
   arg7 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOs|O:svn_auth_provider_invoke_save_credentials",&obj0,&obj1,&obj2,&obj3,&arg6,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_provider_invoke_save_credentials",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -17942,6 +18509,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_save_credentials(PyObject *S
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_auth_provider_invoke_save_credentials", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -18003,7 +18574,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_simple_provider_func(PyObject *SWIGUN
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_invoke_simple_provider_func",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_simple_provider_func",1,2,&obj0,&obj1)) SWIG_fail;
   {
     svn_auth_simple_provider_func_t * tmp =
     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);
@@ -18063,7 +18634,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_pw_provider_func(PyOb
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_invoke_ssl_client_cert_pw_provider_func",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_ssl_client_cert_pw_provider_func",1,2,&obj0,&obj1)) SWIG_fail;
   {
     svn_auth_ssl_client_cert_pw_provider_func_t * tmp =
     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);
@@ -18121,6 +18692,8 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_simple_prompt_func(PyObject *SWIGUNUS
   svn_auth_cred_simple_t *temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -18130,7 +18703,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_simple_prompt_func(PyObject *SWIGUNUS
   SWIG_fail;
   arg7 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOszO|O:svn_auth_invoke_simple_prompt_func",&obj0,&obj1,&arg4,&arg5,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_simple_prompt_func",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_auth_simple_prompt_func_t * tmp =
     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);
@@ -18148,6 +18721,14 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_simple_prompt_func(PyObject *SWIGUNUS
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_auth_invoke_simple_prompt_func", "realm");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_auth_invoke_simple_prompt_func", "username");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -18211,6 +18792,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_username_prompt_func(PyObject *SWIGUN
   svn_auth_cred_username_t *temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -18220,7 +18802,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_username_prompt_func(PyObject *SWIGUN
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_auth_invoke_username_prompt_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_username_prompt_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_auth_username_prompt_func_t * tmp =
     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);
@@ -18238,6 +18820,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_username_prompt_func(PyObject *SWIGUN
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_auth_invoke_username_prompt_func", "realm");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -18303,6 +18889,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_server_trust_prompt_func(PyObject
   svn_auth_cred_ssl_server_trust_t *temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -18314,7 +18901,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_server_trust_prompt_func(PyObject
   SWIG_fail;
   arg8 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_auth_invoke_ssl_server_trust_prompt_func",&obj0,&obj1,&arg4,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_ssl_server_trust_prompt_func",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_auth_ssl_server_trust_prompt_func_t * tmp =
     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);
@@ -18332,6 +18919,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_server_trust_prompt_func(PyObject
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_auth_invoke_ssl_server_trust_prompt_func", "realm");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (apr_uint32_t)SWIG_As_unsigned_SS_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -18407,6 +18998,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_prompt_func(PyObject
   svn_auth_cred_ssl_client_cert_t *temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -18416,7 +19008,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_prompt_func(PyObject
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_auth_invoke_ssl_client_cert_prompt_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_ssl_client_cert_prompt_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_auth_ssl_client_cert_prompt_func_t * tmp =
     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);
@@ -18434,6 +19026,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_prompt_func(PyObject
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_auth_invoke_ssl_client_cert_prompt_func", "realm");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -18497,6 +19093,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_pw_prompt_func(PyObje
   svn_auth_cred_ssl_client_cert_pw_t *temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -18506,7 +19103,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_pw_prompt_func(PyObje
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_auth_invoke_ssl_client_cert_pw_prompt_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_ssl_client_cert_pw_prompt_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_auth_ssl_client_cert_pw_prompt_func_t * tmp =
     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);
@@ -18524,6 +19121,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_pw_prompt_func(PyObje
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_auth_invoke_ssl_client_cert_pw_prompt_func", "realm");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -18586,6 +19187,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_plaintext_prompt_func(PyObject *SWIGU
   svn_boolean_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -18595,7 +19197,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_plaintext_prompt_func(PyObject *SWIGU
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_auth_invoke_plaintext_prompt_func",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_plaintext_prompt_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_auth_plaintext_prompt_func_t * tmp =
     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);
@@ -18605,6 +19207,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_plaintext_prompt_func(PyObject *SWIGU
     arg1 = *tmp;
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_invoke_plaintext_prompt_func", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg4 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg4, 0, 0) == -1) {
@@ -18669,6 +19275,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_plaintext_passphrase_prompt_func(PyOb
   svn_boolean_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -18678,7 +19285,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_plaintext_passphrase_prompt_func(PyOb
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_auth_invoke_plaintext_passphrase_prompt_func",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_invoke_plaintext_passphrase_prompt_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_auth_plaintext_passphrase_prompt_func_t * tmp =
     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);
@@ -18688,6 +19295,10 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_plaintext_passphrase_prompt_func(PyOb
     arg1 = *tmp;
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_auth_invoke_plaintext_passphrase_prompt_func", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg4 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg4, 0, 0) == -1) {
@@ -18742,70 +19353,70 @@ fail:
 
 SWIGINTERN PyObject *svn_auth_simple_provider_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_ssl_client_cert_pw_provider_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_simple_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_username_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_ssl_server_trust_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_ssl_client_cert_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_ssl_client_cert_pw_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_plaintext_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_plaintext_passphrase_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_auth_gnome_keyring_unlock_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -18818,6 +19429,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_config(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -18826,7 +19438,11 @@ SWIGINTERN PyObject *_wrap_svn_config_get_config(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"z|O:svn_config_get_config",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_config",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, TRUE, "svn_config_get_config", "config_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -18894,7 +19510,7 @@ SWIGINTERN PyObject *_wrap_svn_config_create2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_config_create2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_create2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -18969,7 +19585,7 @@ SWIGINTERN PyObject *_wrap_svn_config_create(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_config_create",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_create",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -19032,6 +19648,7 @@ SWIGINTERN PyObject *_wrap_svn_config_read3(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_config_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -19043,7 +19660,11 @@ SWIGINTERN PyObject *_wrap_svn_config_read3(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_config_read3",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_read3",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_config_read3", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -19117,6 +19738,7 @@ SWIGINTERN PyObject *_wrap_svn_config_read2(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_config_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -19127,7 +19749,11 @@ SWIGINTERN PyObject *_wrap_svn_config_read2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_config_read2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_read2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_config_read2", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -19194,6 +19820,7 @@ SWIGINTERN PyObject *_wrap_svn_config_read(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_config_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -19203,7 +19830,11 @@ SWIGINTERN PyObject *_wrap_svn_config_read(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_config_read",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_read",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_config_read", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -19276,7 +19907,7 @@ SWIGINTERN PyObject *_wrap_svn_config_parse(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_config_parse",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_parse",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19346,10 +19977,11 @@ SWIGINTERN PyObject *_wrap_svn_config_merge(PyObject *SWIGUNUSEDPARM(self), PyOb
   char *arg2 = (char *) 0 ;
   svn_boolean_t arg3 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OsO:svn_config_merge",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_merge",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19357,6 +19989,10 @@ SWIGINTERN PyObject *_wrap_svn_config_merge(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_merge", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -19396,9 +20032,12 @@ SWIGINTERN PyObject *_wrap_svn_config_get(PyObject *SWIGUNUSEDPARM(self), PyObje
   char *arg5 = (char *) 0 ;
   char *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Ossz:svn_config_get",&obj0,&arg3,&arg4,&arg5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19406,6 +20045,18 @@ SWIGINTERN PyObject *_wrap_svn_config_get(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_get", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_get", "option");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_config_get", "default_value");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     svn_config_get(arg1,(char const **)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
@@ -19421,7 +20072,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get(PyObject *SWIGUNUSEDPARM(self), PyObje
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -19440,8 +20091,11 @@ SWIGINTERN PyObject *_wrap_svn_config_set(PyObject *SWIGUNUSEDPARM(self), PyObje
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Osss:svn_config_set",&obj0,&arg2,&arg3,&arg4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_set",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19449,6 +20103,18 @@ SWIGINTERN PyObject *_wrap_svn_config_set(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_set", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_set", "option");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_config_set", "value");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     svn_config_set(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
@@ -19473,11 +20139,13 @@ SWIGINTERN PyObject *_wrap_svn_config_get_bool(PyObject *SWIGUNUSEDPARM(self), P
   svn_boolean_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_get_bool",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_bool",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19485,6 +20153,14 @@ SWIGINTERN PyObject *_wrap_svn_config_get_bool(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_get_bool", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_get_bool", "option");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -19528,9 +20204,11 @@ SWIGINTERN PyObject *_wrap_svn_config_set_bool(PyObject *SWIGUNUSEDPARM(self), P
   char *arg3 = (char *) 0 ;
   svn_boolean_t arg4 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_set_bool",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_set_bool",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19538,6 +20216,14 @@ SWIGINTERN PyObject *_wrap_svn_config_set_bool(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_set_bool", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_set_bool", "option");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -19567,17 +20253,27 @@ SWIGINTERN PyObject *_wrap_svn_config_get_int64(PyObject *SWIGUNUSEDPARM(self),
   apr_int64_t arg5 ;
   apr_int64_t temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_get_int64",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_int64",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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_string_to_cstring(obj1, FALSE, "svn_config_get_int64", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_get_int64", "option");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   arg5 = (apr_int64_t) PyLong_AsLongLong(obj3); 
   {
     svn_swig_py_release_py_lock();
@@ -19614,15 +20310,25 @@ SWIGINTERN PyObject *_wrap_svn_config_set_int64(PyObject *SWIGUNUSEDPARM(self),
   char *arg3 = (char *) 0 ;
   apr_int64_t arg4 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_set_int64",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_set_int64",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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_string_to_cstring(obj1, FALSE, "svn_config_set_int64", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_set_int64", "option");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   arg4 = (apr_int64_t) PyLong_AsLongLong(obj3); 
   {
     svn_swig_py_release_py_lock();
@@ -19648,10 +20354,13 @@ SWIGINTERN PyObject *_wrap_svn_config_get_yes_no_ask(PyObject *SWIGUNUSEDPARM(se
   char *arg5 = (char *) 0 ;
   char *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Ossz:svn_config_get_yes_no_ask",&obj0,&arg3,&arg4,&arg5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_yes_no_ask",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19659,6 +20368,18 @@ SWIGINTERN PyObject *_wrap_svn_config_get_yes_no_ask(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_get_yes_no_ask", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_get_yes_no_ask", "option");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_config_get_yes_no_ask", "default_value");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_config_get_yes_no_ask(arg1,(char const **)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
@@ -19684,7 +20405,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_yes_no_ask(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -19706,10 +20427,13 @@ SWIGINTERN PyObject *_wrap_svn_config_get_tristate(PyObject *SWIGUNUSEDPARM(self
   svn_tristate_t arg6 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOsssO:svn_config_get_tristate",&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_tristate",6,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19723,6 +20447,18 @@ SWIGINTERN PyObject *_wrap_svn_config_get_tristate(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_get_tristate", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_config_get_tristate", "option");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_config_get_tristate", "unknown_value");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_tristate_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -19763,7 +20499,7 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate_sections(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_config_enumerate_sections",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_enumerate_sections",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19818,7 +20554,7 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate_sections2(PyObject *SWIGUNUSEDPA
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_config_enumerate_sections2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_enumerate_sections2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19865,11 +20601,12 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate(PyObject *SWIGUNUSEDPARM(self),
   svn_config_enumerator_t arg3 = (svn_config_enumerator_t) 0 ;
   void *arg4 = (void *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OsOO:svn_config_enumerate",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_enumerate",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19877,6 +20614,10 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_enumerate", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_config_enumerator_t * tmp =
     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()) {
@@ -19917,6 +20658,7 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate2(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   int result;
@@ -19925,7 +20667,7 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_config_enumerate2",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_enumerate2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19933,6 +20675,10 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_enumerate2", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_config_enumerator2_t) svn_swig_py_config_enumerator2;
     arg4 = obj2;
   }
@@ -19970,9 +20716,10 @@ SWIGINTERN PyObject *_wrap_svn_config_has_section(PyObject *SWIGUNUSEDPARM(self)
   svn_config_t *arg1 = (svn_config_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_config_has_section",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_has_section",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19980,6 +20727,10 @@ SWIGINTERN PyObject *_wrap_svn_config_has_section(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_has_section", "section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_boolean_t)svn_config_has_section(arg1,(char const *)arg2);
@@ -20003,6 +20754,8 @@ SWIGINTERN PyObject *_wrap_svn_config_find_group(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   char *result = 0 ;
   
@@ -20010,13 +20763,21 @@ SWIGINTERN PyObject *_wrap_svn_config_find_group(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Oss|O:svn_config_find_group",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_find_group",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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_string_to_cstring(obj1, FALSE, "svn_config_find_group", "key");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_find_group", "master_section");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -20053,9 +20814,12 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting(PyObject *SWIGUNUSEDPAR
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Ossz:svn_config_get_server_setting",&obj0,&arg2,&arg3,&arg4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_server_setting",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -20063,6 +20827,18 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_get_server_setting", "server_group");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_get_server_setting", "option_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_config_get_server_setting", "default_value");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (char *)svn_config_get_server_setting(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
@@ -20089,6 +20865,8 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting_int(PyObject *SWIGUNUSE
   PyObject *_global_py_pool = NULL ;
   apr_int64_t temp5 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -20098,13 +20876,21 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting_int(PyObject *SWIGUNUSE
   SWIG_fail;
   arg6 = _global_pool;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OssO|O:svn_config_get_server_setting_int",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_server_setting_int",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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_string_to_cstring(obj1, FALSE, "svn_config_get_server_setting_int", "server_group");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_get_server_setting_int", "option_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   arg4 = (apr_int64_t) PyLong_AsLongLong(obj3); 
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -20158,11 +20944,13 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting_bool(PyObject *SWIGUNUS
   svn_boolean_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_get_server_setting_bool",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_server_setting_bool",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -20170,6 +20958,14 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting_bool(PyObject *SWIGUNUS
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_get_server_setting_bool", "server_group");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_get_server_setting_bool", "option_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -20212,6 +21008,7 @@ SWIGINTERN PyObject *_wrap_svn_config_ensure(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
   
@@ -20219,7 +21016,11 @@ SWIGINTERN PyObject *_wrap_svn_config_ensure(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"z|O:svn_config_ensure",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_ensure",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, TRUE, "svn_config_ensure", "config_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -20269,6 +21070,9 @@ SWIGINTERN PyObject *_wrap_svn_config_read_auth_data(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -20277,7 +21081,19 @@ SWIGINTERN PyObject *_wrap_svn_config_read_auth_data(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssz|O:svn_config_read_auth_data",&arg2,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_read_auth_data",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_config_read_auth_data", "cred_kind");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_read_auth_data", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_config_read_auth_data", "config_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -20330,6 +21146,9 @@ SWIGINTERN PyObject *_wrap_svn_config_write_auth_data(PyObject *SWIGUNUSEDPARM(s
   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 ;
   
@@ -20337,7 +21156,7 @@ SWIGINTERN PyObject *_wrap_svn_config_write_auth_data(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Ossz|O:svn_config_write_auth_data",&obj0,&arg2,&arg3,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_write_auth_data",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -20351,6 +21170,18 @@ SWIGINTERN PyObject *_wrap_svn_config_write_auth_data(PyObject *SWIGUNUSEDPARM(s
       SWIG_fail;
     }
   }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_write_auth_data", "cred_kind");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_write_auth_data", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_config_write_auth_data", "config_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -20398,6 +21229,7 @@ SWIGINTERN PyObject *_wrap_svn_config_walk_auth_data(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *arg4 = (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 ;
@@ -20406,7 +21238,11 @@ SWIGINTERN PyObject *_wrap_svn_config_walk_auth_data(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"zO|O:svn_config_walk_auth_data",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_walk_auth_data",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, TRUE, "svn_config_walk_auth_data", "config_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     /* FIXME: Handle the NULL case. */
     arg2 = (svn_config_auth_walk_func_t) svn_swig_py_config_auth_walk_func;
@@ -20460,6 +21296,8 @@ SWIGINTERN PyObject *_wrap_svn_config_get_user_config_path(PyObject *SWIGUNUSEDP
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -20468,7 +21306,15 @@ SWIGINTERN PyObject *_wrap_svn_config_get_user_config_path(PyObject *SWIGUNUSEDP
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"zs|O:svn_config_get_user_config_path",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_get_user_config_path",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, TRUE, "svn_config_get_user_config_path", "config_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_config_get_user_config_path", "fname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -20503,7 +21349,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_user_config_path(PyObject *SWIGUNUSEDP
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -20538,7 +21384,7 @@ SWIGINTERN PyObject *_wrap_svn_config_dup(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_config_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -20607,7 +21453,7 @@ SWIGINTERN PyObject *_wrap_svn_config_copy_config(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_config_copy_config",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_copy_config",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -20664,7 +21510,7 @@ fail:
 
 SWIGINTERN PyObject *svn_config_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_config_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -20675,10 +21521,11 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_section_enumerator(PyObject *SWIGUN
   char *arg2 = (char *) 0 ;
   void *arg3 = (void *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OsO:svn_config_invoke_section_enumerator",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_invoke_section_enumerator",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_config_section_enumerator_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_void__int, svn_argnum_obj0);
@@ -20688,6 +21535,10 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_section_enumerator(PyObject *SWIGUN
     arg1 = *tmp;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_invoke_section_enumerator", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -20719,6 +21570,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_section_enumerator2(PyObject *SWIGU
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_boolean_t result;
@@ -20727,7 +21579,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_section_enumerator2(PyObject *SWIGU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_config_invoke_section_enumerator2",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_invoke_section_enumerator2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_config_section_enumerator2_t * tmp =
     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);
@@ -20737,6 +21589,10 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_section_enumerator2(PyObject *SWIGU
     arg1 = *tmp;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_invoke_section_enumerator2", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -20780,10 +21636,12 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_enumerator(PyObject *SWIGUNUSEDPARM
   char *arg3 = (char *) 0 ;
   void *arg4 = (void *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_invoke_enumerator",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_invoke_enumerator",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_config_enumerator_t * tmp =
     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);
@@ -20793,6 +21651,14 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_enumerator(PyObject *SWIGUNUSEDPARM
     arg1 = *tmp;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_invoke_enumerator", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_invoke_enumerator", "value");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None) {
       arg4 = NULL;
     } else if (SWIG_ConvertPtr(obj3, (void **) &arg4, 0, 0) == -1) {
@@ -20825,6 +21691,8 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_enumerator2(PyObject *SWIGUNUSEDPAR
   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_boolean_t result;
@@ -20833,7 +21701,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_enumerator2(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssO|O:svn_config_invoke_enumerator2",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_invoke_enumerator2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_config_enumerator2_t * tmp =
     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);
@@ -20843,6 +21711,14 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_enumerator2(PyObject *SWIGUNUSEDPAR
     arg1 = *tmp;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_config_invoke_enumerator2", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_invoke_enumerator2", "value");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None) {
       arg4 = NULL;
     } else if (SWIG_ConvertPtr(obj3, (void **) &arg4, 0, 0) == -1) {
@@ -20894,6 +21770,8 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_auth_walk_func(PyObject *SWIGUNUSED
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -20903,7 +21781,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_auth_walk_func(PyObject *SWIGUNUSED
   SWIG_fail;
   arg7 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOssO|O:svn_config_invoke_auth_walk_func",&obj0,&obj1,&arg4,&arg5,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_config_invoke_auth_walk_func",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_config_auth_walk_func_t * tmp =
     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);
@@ -20921,6 +21799,14 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_auth_walk_func(PyObject *SWIGUNUSED
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_config_invoke_auth_walk_func", "cred_kind");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_config_invoke_auth_walk_func", "realmstring");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -20980,35 +21866,35 @@ fail:
 
 SWIGINTERN PyObject *svn_config_section_enumerator_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_q_const__char_p_void__int, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_config_section_enumerator2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_config_enumerator_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_config_enumerator2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_config_auth_walk_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -21026,7 +21912,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_initialize2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_utf_initialize2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_initialize2",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -21073,7 +21959,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_initialize(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_utf_initialize",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_initialize",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -21120,16 +22006,22 @@ SWIGINTERN PyObject *_wrap_svn_utf_stringbuf_to_utf8(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_utf_stringbuf_to_utf8",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_stringbuf_to_utf8",1,2,&obj0,&obj1)) SWIG_fail;
   {
-    if (!PyString_Check(obj0)) {
-      PyErr_SetString(PyExc_TypeError, "not a string");
+    if (!PyBytes_Check(obj0)) {
+      PyErr_SetString(PyExc_TypeError, "not a bytes object");
       SWIG_fail;
     }
-    arg2 = svn_stringbuf_ncreate(PyString_AS_STRING(obj0),
-      PyString_GET_SIZE(obj0),
-      /* ### gah... what pool to use? */
-      _global_pool);
+    {
+      Py_ssize_t strBufLen;
+      char *strBufChar;
+      if (-1 == PyBytes_AsStringAndSize(obj0, &strBufChar, &strBufLen)) {
+        SWIG_fail;
+      }
+      arg2 = svn_stringbuf_ncreate(strBufChar, strBufLen,
+        /* ### gah... what pool to use? */
+        _global_pool);
+    }
   }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -21163,9 +22055,8 @@ SWIGINTERN PyObject *_wrap_svn_utf_stringbuf_to_utf8(PyObject *SWIGUNUSEDPARM(se
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21201,17 +22092,21 @@ SWIGINTERN PyObject *_wrap_svn_utf_string_to_utf8(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_utf_string_to_utf8",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_string_to_utf8",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (obj0 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj0)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj0)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj0, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj0);
-      value2.len = PyString_GET_SIZE(obj0);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -21247,9 +22142,8 @@ SWIGINTERN PyObject *_wrap_svn_utf_string_to_utf8(PyObject *SWIGUNUSEDPARM(self)
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21275,6 +22169,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -21283,7 +22178,11 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_utf_cstring_to_utf8",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_to_utf8",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_utf_cstring_to_utf8", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -21318,7 +22217,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8(PyObject *SWIGUNUSEDPARM(self
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21345,6 +22244,8 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8_ex2(PyObject *SWIGUNUSEDPARM(
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -21353,7 +22254,15 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8_ex2(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_utf_cstring_to_utf8_ex2",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_to_utf8_ex2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_utf_cstring_to_utf8_ex2", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_utf_cstring_to_utf8_ex2", "frompage");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -21388,7 +22297,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8_ex2(PyObject *SWIGUNUSEDPARM(
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21416,6 +22325,9 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8_ex(PyObject *SWIGUNUSEDPARM(s
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -21424,7 +22336,19 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8_ex(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sss|O:svn_utf_cstring_to_utf8_ex",&arg2,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_to_utf8_ex",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_utf_cstring_to_utf8_ex", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_utf_cstring_to_utf8_ex", "frompage");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_utf_cstring_to_utf8_ex", "convset_key");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -21459,7 +22383,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_to_utf8_ex(PyObject *SWIGUNUSEDPARM(s
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21494,16 +22418,22 @@ SWIGINTERN PyObject *_wrap_svn_utf_stringbuf_from_utf8(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_utf_stringbuf_from_utf8",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_stringbuf_from_utf8",1,2,&obj0,&obj1)) SWIG_fail;
   {
-    if (!PyString_Check(obj0)) {
-      PyErr_SetString(PyExc_TypeError, "not a string");
+    if (!PyBytes_Check(obj0)) {
+      PyErr_SetString(PyExc_TypeError, "not a bytes object");
       SWIG_fail;
     }
-    arg2 = svn_stringbuf_ncreate(PyString_AS_STRING(obj0),
-      PyString_GET_SIZE(obj0),
-      /* ### gah... what pool to use? */
-      _global_pool);
+    {
+      Py_ssize_t strBufLen;
+      char *strBufChar;
+      if (-1 == PyBytes_AsStringAndSize(obj0, &strBufChar, &strBufLen)) {
+        SWIG_fail;
+      }
+      arg2 = svn_stringbuf_ncreate(strBufChar, strBufLen,
+        /* ### gah... what pool to use? */
+        _global_pool);
+    }
   }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -21537,9 +22467,8 @@ SWIGINTERN PyObject *_wrap_svn_utf_stringbuf_from_utf8(PyObject *SWIGUNUSEDPARM(
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21575,17 +22504,21 @@ SWIGINTERN PyObject *_wrap_svn_utf_string_from_utf8(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_utf_string_from_utf8",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_string_from_utf8",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (obj0 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj0)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj0)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj0, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj0);
-      value2.len = PyString_GET_SIZE(obj0);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -21621,9 +22554,8 @@ SWIGINTERN PyObject *_wrap_svn_utf_string_from_utf8(PyObject *SWIGUNUSEDPARM(sel
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21649,6 +22581,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -21657,7 +22590,11 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_utf_cstring_from_utf8",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_from_utf8",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_utf_cstring_from_utf8", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -21692,7 +22629,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21719,6 +22656,8 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_ex2(PyObject *SWIGUNUSEDPAR
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -21727,7 +22666,15 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_ex2(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_utf_cstring_from_utf8_ex2",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_from_utf8_ex2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_utf_cstring_from_utf8_ex2", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_utf_cstring_from_utf8_ex2", "topage");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -21762,7 +22709,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_ex2(PyObject *SWIGUNUSEDPAR
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21790,6 +22737,9 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_ex(PyObject *SWIGUNUSEDPARM
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -21798,7 +22748,19 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_ex(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sss|O:svn_utf_cstring_from_utf8_ex",&arg2,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_from_utf8_ex",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_utf_cstring_from_utf8_ex", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_utf_cstring_from_utf8_ex", "topage");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_utf_cstring_from_utf8_ex", "convset_key");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -21833,7 +22795,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_ex(PyObject *SWIGUNUSEDPARM
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21857,6 +22819,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_fuzzy(PyObject *SWIGUNUSEDP
   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 ;
   
@@ -21864,7 +22827,11 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_fuzzy(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_utf_cstring_from_utf8_fuzzy",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_from_utf8_fuzzy",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_utf_cstring_from_utf8_fuzzy", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -21911,16 +22878,22 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_stringbuf(PyObject *SWIGUNU
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_utf_cstring_from_utf8_stringbuf",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_from_utf8_stringbuf",1,2,&obj0,&obj1)) SWIG_fail;
   {
-    if (!PyString_Check(obj0)) {
-      PyErr_SetString(PyExc_TypeError, "not a string");
+    if (!PyBytes_Check(obj0)) {
+      PyErr_SetString(PyExc_TypeError, "not a bytes object");
       SWIG_fail;
     }
-    arg2 = svn_stringbuf_ncreate(PyString_AS_STRING(obj0),
-      PyString_GET_SIZE(obj0),
-      /* ### gah... what pool to use? */
-      _global_pool);
+    {
+      Py_ssize_t strBufLen;
+      char *strBufChar;
+      if (-1 == PyBytes_AsStringAndSize(obj0, &strBufChar, &strBufLen)) {
+        SWIG_fail;
+      }
+      arg2 = svn_stringbuf_ncreate(strBufChar, strBufLen,
+        /* ### gah... what pool to use? */
+        _global_pool);
+    }
   }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -21956,7 +22929,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_stringbuf(PyObject *SWIGUNU
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -21992,17 +22965,21 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_string(PyObject *SWIGUNUSED
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_utf_cstring_from_utf8_string",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_from_utf8_string",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (obj0 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj0)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj0)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj0);
-      value2.len = PyString_GET_SIZE(obj0);
+      if (PyBytes_AsStringAndSize(obj0, (char **)&(value2.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -22040,7 +23017,7 @@ SWIGINTERN PyObject *_wrap_svn_utf_cstring_from_utf8_string(PyObject *SWIGUNUSED
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -22061,9 +23038,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_utf_cstring_utf8_width(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_utf_cstring_utf8_width",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_utf_cstring_utf8_width",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_utf_cstring_utf8_width", "cstr");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -22083,7 +23065,7 @@ SWIGINTERN PyObject *_wrap_svn_nls_init(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_nls_init")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_nls_init",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -22115,6 +23097,7 @@ SWIGINTERN PyObject *_wrap_svn_path_internal_style(PyObject *SWIGUNUSEDPARM(self
   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 ;
   
@@ -22122,7 +23105,11 @@ SWIGINTERN PyObject *_wrap_svn_path_internal_style(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_path_internal_style",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_internal_style",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_internal_style", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22158,6 +23145,7 @@ SWIGINTERN PyObject *_wrap_svn_path_local_style(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   
@@ -22165,7 +23153,11 @@ SWIGINTERN PyObject *_wrap_svn_path_local_style(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_path_local_style",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_local_style",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_local_style", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22205,6 +23197,7 @@ SWIGINTERN PyObject *_wrap_svn_path_splitext(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
@@ -22213,7 +23206,11 @@ SWIGINTERN PyObject *_wrap_svn_path_splitext(PyObject *SWIGUNUSEDPARM(self), PyO
   arg4 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_path_splitext",&arg3,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_splitext",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_splitext", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22238,7 +23235,7 @@ SWIGINTERN PyObject *_wrap_svn_path_splitext(PyObject *SWIGUNUSEDPARM(self), PyO
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -22251,7 +23248,7 @@ SWIGINTERN PyObject *_wrap_svn_path_splitext(PyObject *SWIGUNUSEDPARM(self), PyO
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -22272,9 +23269,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_path_is_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_path_is_empty",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_is_empty",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_is_empty", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -22294,10 +23296,15 @@ SWIGINTERN PyObject *_wrap_svn_dirent_is_root(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   apr_size_t arg2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"sO:svn_dirent_is_root",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_is_root",2,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_is_root", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (apr_size_t)SWIG_As_unsigned_SS_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -22325,6 +23332,7 @@ SWIGINTERN PyObject *_wrap_svn_path_canonicalize(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   
@@ -22332,7 +23340,11 @@ SWIGINTERN PyObject *_wrap_svn_path_canonicalize(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_path_canonicalize",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_canonicalize",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_canonicalize", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22368,6 +23380,7 @@ SWIGINTERN PyObject *_wrap_svn_path_is_canonical(PyObject *SWIGUNUSEDPARM(self),
   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_boolean_t result;
   
@@ -22375,7 +23388,11 @@ SWIGINTERN PyObject *_wrap_svn_path_is_canonical(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_path_is_canonical",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_is_canonical",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_is_canonical", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22409,9 +23426,19 @@ SWIGINTERN PyObject *_wrap_svn_path_compare_paths(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"ss:svn_path_compare_paths",&arg1,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_compare_paths",2,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_compare_paths", "path1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_path_compare_paths", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -22434,6 +23461,8 @@ SWIGINTERN PyObject *_wrap_svn_path_get_longest_ancestor(PyObject *SWIGUNUSEDPAR
   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 ;
   char *result = 0 ;
   
@@ -22441,7 +23470,15 @@ SWIGINTERN PyObject *_wrap_svn_path_get_longest_ancestor(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_path_get_longest_ancestor",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_get_longest_ancestor",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_get_longest_ancestor", "path1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_path_get_longest_ancestor", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -22474,9 +23511,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_path_is_dotpath_present(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_path_is_dotpath_present",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_is_dotpath_present",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_is_dotpath_present", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -22495,9 +23537,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_path_is_url(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_path_is_url",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_is_url",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_is_url", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -22516,9 +23563,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_path_is_uri_safe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_path_is_uri_safe",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_is_uri_safe",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_is_uri_safe", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -22541,6 +23593,8 @@ SWIGINTERN PyObject *_wrap_svn_path_url_add_component2(PyObject *SWIGUNUSEDPARM(
   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 ;
   char *result = 0 ;
   
@@ -22548,7 +23602,15 @@ SWIGINTERN PyObject *_wrap_svn_path_url_add_component2(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_path_url_add_component2",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_url_add_component2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_url_add_component2", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_path_url_add_component2", "component");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -22581,9 +23643,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_path_is_repos_relative_url(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_path_is_repos_relative_url",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_is_repos_relative_url",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_is_repos_relative_url", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -22608,6 +23675,8 @@ SWIGINTERN PyObject *_wrap_svn_path_resolve_repos_relative_url(PyObject *SWIGUNU
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -22616,7 +23685,15 @@ SWIGINTERN PyObject *_wrap_svn_path_resolve_repos_relative_url(PyObject *SWIGUNU
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_path_resolve_repos_relative_url",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_resolve_repos_relative_url",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_resolve_repos_relative_url", "relative_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_path_resolve_repos_relative_url", "repos_root_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -22651,7 +23728,7 @@ SWIGINTERN PyObject *_wrap_svn_path_resolve_repos_relative_url(PyObject *SWIGUNU
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -22675,6 +23752,7 @@ SWIGINTERN PyObject *_wrap_svn_path_illegal_path_escape(PyObject *SWIGUNUSEDPARM
   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 ;
   
@@ -22682,7 +23760,11 @@ SWIGINTERN PyObject *_wrap_svn_path_illegal_path_escape(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_path_illegal_path_escape",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_path_illegal_path_escape",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_path_illegal_path_escape", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22718,6 +23800,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_internal_style(PyObject *SWIGUNUSEDPARM(se
   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 ;
   
@@ -22725,7 +23808,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_internal_style(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_internal_style",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_internal_style",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_internal_style", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22766,6 +23853,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_internal_style_safe(PyObject *SWIGUNUSEDPA
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -22780,7 +23868,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_internal_style_safe(PyObject *SWIGUNUSEDPA
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_dirent_internal_style_safe",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_internal_style_safe",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_internal_style_safe", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22823,7 +23915,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_internal_style_safe(PyObject *SWIGUNUSEDPA
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -22836,7 +23928,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_internal_style_safe(PyObject *SWIGUNUSEDPA
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -22866,6 +23958,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_local_style(PyObject *SWIGUNUSEDPARM(self)
   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 ;
   
@@ -22873,7 +23966,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_local_style(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_local_style",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_local_style",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_local_style", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -22910,6 +24007,8 @@ SWIGINTERN PyObject *_wrap_svn_dirent_join(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
   char *result = 0 ;
   
@@ -22917,7 +24016,15 @@ SWIGINTERN PyObject *_wrap_svn_dirent_join(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_dirent_join",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_join",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_join", "base");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_dirent_join", "component");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -22954,6 +24061,8 @@ SWIGINTERN PyObject *_wrap_svn_relpath_join(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
   char *result = 0 ;
   
@@ -22961,7 +24070,15 @@ SWIGINTERN PyObject *_wrap_svn_relpath_join(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_relpath_join",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_join",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_join", "base");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_relpath_join", "component");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -22997,6 +24114,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_basename(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   
@@ -23004,7 +24122,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_basename(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_basename",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_basename",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_basename", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23040,6 +24162,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_dirname(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
   
@@ -23047,7 +24170,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_dirname(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_dirname",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_dirname",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_dirname", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23087,6 +24214,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_split(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
@@ -23095,7 +24223,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_split(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg4 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_split",&arg3,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_split",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_split", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23120,7 +24252,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_split(PyObject *SWIGUNUSEDPARM(self), PyOb
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23133,7 +24265,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_split(PyObject *SWIGUNUSEDPARM(self), PyOb
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23161,6 +24293,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_split(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
@@ -23169,7 +24302,11 @@ SWIGINTERN PyObject *_wrap_svn_relpath_split(PyObject *SWIGUNUSEDPARM(self), PyO
   arg4 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_relpath_split",&arg3,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_split",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_split", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23194,7 +24331,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_split(PyObject *SWIGUNUSEDPARM(self), PyO
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23207,7 +24344,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_split(PyObject *SWIGUNUSEDPARM(self), PyO
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23231,6 +24368,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_basename(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   
@@ -23238,7 +24376,11 @@ SWIGINTERN PyObject *_wrap_svn_relpath_basename(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_relpath_basename",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_basename",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_basename", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23274,6 +24416,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_dirname(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   
@@ -23281,7 +24424,11 @@ SWIGINTERN PyObject *_wrap_svn_relpath_dirname(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_relpath_dirname",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_dirname",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_dirname", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23318,6 +24465,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_prefix(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
   char *result = 0 ;
@@ -23326,7 +24474,11 @@ SWIGINTERN PyObject *_wrap_svn_relpath_prefix(PyObject *SWIGUNUSEDPARM(self), Py
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_prefix",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_prefix", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (int)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -23372,6 +24524,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_split(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
@@ -23380,7 +24533,11 @@ SWIGINTERN PyObject *_wrap_svn_uri_split(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg4 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_split",&arg3,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_split",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_split", "uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23405,7 +24562,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_split(PyObject *SWIGUNUSEDPARM(self), PyObjec
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23418,7 +24575,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_split(PyObject *SWIGUNUSEDPARM(self), PyObjec
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23442,6 +24599,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_basename(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
   
@@ -23449,7 +24607,11 @@ SWIGINTERN PyObject *_wrap_svn_uri_basename(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_basename",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_basename",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_basename", "uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23485,6 +24647,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_dirname(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
   
@@ -23492,7 +24655,11 @@ SWIGINTERN PyObject *_wrap_svn_uri_dirname(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_dirname",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_dirname",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_dirname", "uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23525,9 +24692,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_dirent_is_absolute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_dirent_is_absolute",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_is_absolute",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_is_absolute", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -23547,10 +24719,15 @@ SWIGINTERN PyObject *_wrap_svn_uri_is_root(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   apr_size_t arg2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"sO:svn_uri_is_root",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_is_root",2,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_is_root", "uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (apr_size_t)SWIG_As_unsigned_SS_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -23578,6 +24755,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize(PyObject *SWIGUNUSEDPARM(self
   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 ;
   
@@ -23585,7 +24763,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_canonicalize",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_canonicalize",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_canonicalize", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23626,6 +24808,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize_safe(PyObject *SWIGUNUSEDPARM
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -23640,7 +24823,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize_safe(PyObject *SWIGUNUSEDPARM
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_dirent_canonicalize_safe",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_canonicalize_safe",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_canonicalize_safe", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23683,7 +24870,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize_safe(PyObject *SWIGUNUSEDPARM
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23696,7 +24883,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize_safe(PyObject *SWIGUNUSEDPARM
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23726,6 +24913,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize(PyObject *SWIGUNUSEDPARM(sel
   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 ;
   
@@ -23733,7 +24921,11 @@ SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_relpath_canonicalize",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_canonicalize",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_canonicalize", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23774,6 +24966,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize_safe(PyObject *SWIGUNUSEDPAR
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -23788,7 +24981,11 @@ SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize_safe(PyObject *SWIGUNUSEDPAR
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_relpath_canonicalize_safe",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_canonicalize_safe",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_canonicalize_safe", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23831,7 +25028,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize_safe(PyObject *SWIGUNUSEDPAR
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23844,7 +25041,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize_safe(PyObject *SWIGUNUSEDPAR
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23874,6 +25071,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_canonicalize(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   
@@ -23881,7 +25079,11 @@ SWIGINTERN PyObject *_wrap_svn_uri_canonicalize(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_canonicalize",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_canonicalize",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_canonicalize", "uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23922,6 +25124,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_canonicalize_safe(PyObject *SWIGUNUSEDPARM(se
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -23936,7 +25139,11 @@ SWIGINTERN PyObject *_wrap_svn_uri_canonicalize_safe(PyObject *SWIGUNUSEDPARM(se
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_uri_canonicalize_safe",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_canonicalize_safe",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_canonicalize_safe", "uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -23979,7 +25186,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_canonicalize_safe(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23992,7 +25199,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_canonicalize_safe(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24022,6 +25229,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_is_canonical(PyObject *SWIGUNUSEDPARM(self
   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_boolean_t result;
   
@@ -24029,7 +25237,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_is_canonical(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_is_canonical",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_is_canonical",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_is_canonical", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -24062,9 +25274,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_relpath_is_canonical(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_relpath_is_canonical",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_is_canonical",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_is_canonical", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -24086,6 +25303,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_is_canonical(PyObject *SWIGUNUSEDPARM(self),
   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_boolean_t result;
   
@@ -24093,7 +25311,11 @@ SWIGINTERN PyObject *_wrap_svn_uri_is_canonical(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_is_canonical",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_is_canonical",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_is_canonical", "uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -24130,6 +25352,8 @@ SWIGINTERN PyObject *_wrap_svn_dirent_get_longest_ancestor(PyObject *SWIGUNUSEDP
   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 ;
   char *result = 0 ;
   
@@ -24137,7 +25361,15 @@ SWIGINTERN PyObject *_wrap_svn_dirent_get_longest_ancestor(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_dirent_get_longest_ancestor",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_get_longest_ancestor",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_get_longest_ancestor", "dirent1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_dirent_get_longest_ancestor", "dirent2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24174,6 +25406,8 @@ SWIGINTERN PyObject *_wrap_svn_relpath_get_longest_ancestor(PyObject *SWIGUNUSED
   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 ;
   char *result = 0 ;
   
@@ -24181,7 +25415,15 @@ SWIGINTERN PyObject *_wrap_svn_relpath_get_longest_ancestor(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_relpath_get_longest_ancestor",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_get_longest_ancestor",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_get_longest_ancestor", "relpath1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_relpath_get_longest_ancestor", "relpath2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24218,6 +25460,8 @@ SWIGINTERN PyObject *_wrap_svn_uri_get_longest_ancestor(PyObject *SWIGUNUSEDPARM
   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 ;
   char *result = 0 ;
   
@@ -24225,7 +25469,15 @@ SWIGINTERN PyObject *_wrap_svn_uri_get_longest_ancestor(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_uri_get_longest_ancestor",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_get_longest_ancestor",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_get_longest_ancestor", "uri1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_uri_get_longest_ancestor", "uri2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24263,6 +25515,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_get_absolute(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -24271,7 +25524,11 @@ SWIGINTERN PyObject *_wrap_svn_dirent_get_absolute(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_get_absolute",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_get_absolute",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_get_absolute", "relative");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -24306,7 +25563,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_get_absolute(PyObject *SWIGUNUSEDPARM(self
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24331,6 +25588,8 @@ SWIGINTERN PyObject *_wrap_svn_dirent_is_child(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   char *result = 0 ;
   
@@ -24338,7 +25597,15 @@ SWIGINTERN PyObject *_wrap_svn_dirent_is_child(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_dirent_is_child",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_is_child",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_is_child", "parent_dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_dirent_is_child", "child_dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24372,9 +25639,19 @@ SWIGINTERN PyObject *_wrap_svn_dirent_is_ancestor(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"ss:svn_dirent_is_ancestor",&arg1,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_is_ancestor",2,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_is_ancestor", "parent_dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_dirent_is_ancestor", "child_dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -24394,9 +25671,19 @@ SWIGINTERN PyObject *_wrap_svn_uri__is_ancestor(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"ss:svn_uri__is_ancestor",&arg1,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri__is_ancestor",2,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri__is_ancestor", "parent_uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_uri__is_ancestor", "child_uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -24416,9 +25703,19 @@ SWIGINTERN PyObject *_wrap_svn_dirent_skip_ancestor(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"ss:svn_dirent_skip_ancestor",&arg1,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_dirent_skip_ancestor",2,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_dirent_skip_ancestor", "parent_dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_dirent_skip_ancestor", "child_dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -24438,9 +25735,19 @@ SWIGINTERN PyObject *_wrap_svn_relpath_skip_ancestor(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"ss:svn_relpath_skip_ancestor",&arg1,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_relpath_skip_ancestor",2,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_relpath_skip_ancestor", "parent_relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_relpath_skip_ancestor", "child_relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -24463,6 +25770,8 @@ SWIGINTERN PyObject *_wrap_svn_uri_skip_ancestor(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   char *result = 0 ;
   
@@ -24470,7 +25779,15 @@ SWIGINTERN PyObject *_wrap_svn_uri_skip_ancestor(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_uri_skip_ancestor",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_skip_ancestor",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_skip_ancestor", "parent_uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_uri_skip_ancestor", "child_uri");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24508,6 +25825,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_get_dirent_from_file_url(PyObject *SWIGUNUSED
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -24516,7 +25834,11 @@ SWIGINTERN PyObject *_wrap_svn_uri_get_dirent_from_file_url(PyObject *SWIGUNUSED
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_get_dirent_from_file_url",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_get_dirent_from_file_url",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_get_dirent_from_file_url", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -24551,7 +25873,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_get_dirent_from_file_url(PyObject *SWIGUNUSED
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24577,6 +25899,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_get_file_url_from_dirent(PyObject *SWIGUNUSED
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -24585,7 +25908,11 @@ SWIGINTERN PyObject *_wrap_svn_uri_get_file_url_from_dirent(PyObject *SWIGUNUSED
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_get_file_url_from_dirent",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_uri_get_file_url_from_dirent",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_uri_get_file_url_from_dirent", "dirent");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -24620,7 +25947,7 @@ SWIGINTERN PyObject *_wrap_svn_uri_get_file_url_from_dirent(PyObject *SWIGUNUSED
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24646,6 +25973,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_parse(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_mergeinfo_t temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -24654,7 +25982,11 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_parse(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_mergeinfo_parse",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_parse",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_mergeinfo_parse", "input");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -24735,7 +26067,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_diff2(PyObject *SWIGUNUSEDPARM(self), P
   arg7 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_mergeinfo_diff2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_diff2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -24867,7 +26199,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_diff(PyObject *SWIGUNUSEDPARM(self), Py
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_mergeinfo_diff",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_diff",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -24983,7 +26315,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_merge2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_mergeinfo_merge2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_merge2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -25085,7 +26417,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_catalog_merge(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_mergeinfo_catalog_merge",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_catalog_merge",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_mergeinfo_catalog_t)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25170,7 +26502,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_remove(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_mergeinfo_remove",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_remove",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -25274,7 +26606,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_remove2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_mergeinfo_remove2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_remove2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -25395,7 +26727,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_diff(PyObject *SWIGUNUSEDPARM(self), Py
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_rangelist_diff",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_rangelist_diff",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg3 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const svn_merge_range_t *),
@@ -25503,7 +26835,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_merge2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_rangelist_merge2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_rangelist_merge2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_rangelist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25594,7 +26926,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_remove(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_rangelist_remove",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_rangelist_remove",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const svn_merge_range_t *),
@@ -25697,7 +27029,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_intersect2(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_mergeinfo_intersect2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_intersect2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_mergeinfo_t)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25799,7 +27131,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_intersect(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_mergeinfo_intersect",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_intersect",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_mergeinfo_t)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25883,7 +27215,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_intersect(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_rangelist_intersect",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_rangelist_intersect",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const svn_merge_range_t *),
@@ -25976,7 +27308,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_to_string(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_rangelist_to_string",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_rangelist_to_string",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const svn_merge_range_t *),
@@ -26019,9 +27351,8 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_to_string(PyObject *SWIGUNUSEDPARM(self
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -26068,7 +27399,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_inheritable2(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:svn_rangelist_inheritable2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_rangelist_inheritable2",4,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg2 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const svn_merge_range_t *),
@@ -26181,7 +27512,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_inheritable(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_rangelist_inheritable",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_rangelist_inheritable",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const svn_merge_range_t *),
@@ -26267,6 +27598,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_inheritable2(PyObject *SWIGUNUSEDPARM(s
   PyObject *_global_py_pool = NULL ;
   svn_mergeinfo_t temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -26283,7 +27615,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_inheritable2(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|OO:svn_mergeinfo_inheritable2",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_inheritable2",5,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -26298,6 +27630,10 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_inheritable2(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_mergeinfo_inheritable2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -26391,6 +27727,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_inheritable(PyObject *SWIGUNUSEDPARM(se
   PyObject *_global_py_pool = NULL ;
   svn_mergeinfo_t temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -26401,7 +27738,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_inheritable(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_mergeinfo_inheritable",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_inheritable",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -26416,6 +27753,10 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_inheritable(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_mergeinfo_inheritable", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -26494,7 +27835,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_to_string(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_mergeinfo_to_string",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_to_string",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -26540,9 +27881,8 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_to_string(PyObject *SWIGUNUSEDPARM(self
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -26574,7 +27914,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_catalog_dup(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_mergeinfo_catalog_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_catalog_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_mergeinfo_catalog_t)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -26625,7 +27965,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_dup(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_mergeinfo_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_mergeinfo_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -26683,7 +28023,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_dup(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_rangelist_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_rangelist_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const svn_merge_range_t *),
@@ -26730,7 +28070,7 @@ SWIGINTERN PyObject *_wrap_svn_inheritance_to_word(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_inheritance_to_word",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_inheritance_to_word",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_mergeinfo_inheritance_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -26755,9 +28095,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_inheritance_from_word(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_mergeinfo_inheritance_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_inheritance_from_word",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_inheritance_from_word",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_inheritance_from_word", "word");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -26780,7 +28125,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_kind_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent2_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -26807,7 +28152,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_kind_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent2_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -26829,7 +28174,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_special_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent2_t_special_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_t_special_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -26856,7 +28201,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_special_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent2_t_special_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_t_special_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -26878,7 +28223,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_filesize_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent2_t_filesize_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_t_filesize_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -26900,7 +28245,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_filesize_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent2_t_filesize_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_t_filesize_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -26922,7 +28267,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_mtime_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent2_t_mtime_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_t_mtime_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -26944,7 +28289,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_mtime_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent2_t_mtime_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_t_mtime_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -26963,7 +28308,7 @@ SWIGINTERN PyObject *_wrap_new_svn_io_dirent2_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_io_dirent2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_io_dirent2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_io_dirent2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -26985,7 +28330,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_io_dirent2_t(PyObject *SWIGUNUSEDPARM(self
   struct svn_io_dirent2_t *arg1 = (struct svn_io_dirent2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_io_dirent2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_io_dirent2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -27009,7 +28354,7 @@ fail:
 
 SWIGINTERN PyObject *svn_io_dirent2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_io_dirent2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -27026,7 +28371,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_create(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_io_dirent2_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -27071,7 +28416,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_dup(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_io_dirent2_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent2_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -27115,7 +28460,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent_t_kind_set(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -27142,7 +28487,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent_t_kind_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -27164,7 +28509,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent_t_special_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent_t_special_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent_t_special_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -27191,7 +28536,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent_t_special_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent_t_special_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dirent_t_special_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -27210,7 +28555,7 @@ SWIGINTERN PyObject *_wrap_new_svn_io_dirent_t(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   struct svn_io_dirent_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_io_dirent_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_io_dirent_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -27232,7 +28577,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_io_dirent_t(PyObject *SWIGUNUSEDPARM(self)
   struct svn_io_dirent_t *arg1 = (struct svn_io_dirent_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_io_dirent_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_io_dirent_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -27256,7 +28601,7 @@ fail:
 
 SWIGINTERN PyObject *svn_io_dirent_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_io_dirent_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -27275,6 +28620,9 @@ SWIGINTERN PyObject *_wrap_svn_io_open_uniquely_named(PyObject *SWIGUNUSEDPARM(s
   PyObject *_global_py_pool = NULL ;
   apr_file_t *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27290,7 +28638,19 @@ SWIGINTERN PyObject *_wrap_svn_io_open_uniquely_named(PyObject *SWIGUNUSEDPARM(s
   arg8 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sssO|OO:svn_io_open_uniquely_named",&arg3,&arg4,&arg5,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_open_uniquely_named",4,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_open_uniquely_named", "dirpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_open_uniquely_named", "filename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_io_open_uniquely_named", "suffix");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg6 = (svn_io_file_del_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
@@ -27345,7 +28705,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_uniquely_named(PyObject *SWIGUNUSEDPARM(s
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -27381,6 +28741,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file3(PyObject *SWIGUNUSEDPARM(sel
   PyObject *_global_py_pool = NULL ;
   apr_file_t *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -27396,7 +28757,11 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file3(PyObject *SWIGUNUSEDPARM(sel
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_io_open_unique_file3",&arg3,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_open_unique_file3",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_open_unique_file3", "dirpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_io_file_del_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -27451,7 +28816,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file3(PyObject *SWIGUNUSEDPARM(sel
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -27487,6 +28852,8 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file2(PyObject *SWIGUNUSEDPARM(sel
   PyObject *_global_py_pool = NULL ;
   apr_file_t *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -27497,7 +28864,15 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file2(PyObject *SWIGUNUSEDPARM(sel
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_io_open_unique_file2",&arg3,&arg4,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_open_unique_file2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_open_unique_file2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_open_unique_file2", "suffix");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg5 = (svn_io_file_del_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -27544,7 +28919,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file2(PyObject *SWIGUNUSEDPARM(sel
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -27574,6 +28949,8 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file(PyObject *SWIGUNUSEDPARM(self
   PyObject *_global_py_pool = NULL ;
   apr_file_t *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -27584,7 +28961,15 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file(PyObject *SWIGUNUSEDPARM(self
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_io_open_unique_file",&arg3,&arg4,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_open_unique_file",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_open_unique_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_open_unique_file", "suffix");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg5 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -27631,7 +29016,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file(PyObject *SWIGUNUSEDPARM(self
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -27656,6 +29041,8 @@ SWIGINTERN PyObject *_wrap_svn_io_copy_perms(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
   
@@ -27663,7 +29050,15 @@ SWIGINTERN PyObject *_wrap_svn_io_copy_perms(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_io_copy_perms",&arg1,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_copy_perms",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_copy_perms", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_copy_perms", "dst");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -27709,13 +29104,18 @@ SWIGINTERN PyObject *_wrap_svn_io_sleep_for_timestamps(PyObject *SWIGUNUSEDPARM(
   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 ;
   
   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_sleep_for_timestamps",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_sleep_for_timestamps",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_sleep_for_timestamps", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -27762,6 +29162,9 @@ SWIGINTERN PyObject *_wrap_svn_io_filesizes_three_different_p(PyObject *SWIGUNUS
   int res2 = SWIG_TMPOBJ ;
   svn_boolean_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -27772,7 +29175,19 @@ SWIGINTERN PyObject *_wrap_svn_io_filesizes_three_different_p(PyObject *SWIGUNUS
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"sss|O:svn_io_filesizes_three_different_p",&arg4,&arg5,&arg6,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_filesizes_three_different_p",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_filesizes_three_different_p", "file1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_filesizes_three_different_p", "file2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_io_filesizes_three_different_p", "file3");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -27839,6 +29254,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_checksum2(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_checksum_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -27848,7 +29264,11 @@ SWIGINTERN PyObject *_wrap_svn_io_file_checksum2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_io_file_checksum2",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_checksum2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_file_checksum2", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_checksum_kind_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -27883,13 +29303,10 @@ SWIGINTERN PyObject *_wrap_svn_io_file_checksum2(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_io_file_checksum2 arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_io_file_checksum2 is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -27911,6 +29328,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_checksum(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   unsigned char temp1[APR_MD5_DIGESTSIZE] ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -27919,7 +29337,11 @@ SWIGINTERN PyObject *_wrap_svn_io_file_checksum(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_io_file_checksum",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_checksum",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_file_checksum", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -27948,7 +29370,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_checksum(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize((char *)arg1, APR_MD5_DIGESTSIZE));
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyBytes_FromStringAndSize((const char *)arg1, APR_MD5_DIGESTSIZE));
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -27972,6 +29394,8 @@ SWIGINTERN PyObject *_wrap_svn_io_files_contents_same_p(PyObject *SWIGUNUSEDPARM
   PyObject *_global_py_pool = NULL ;
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -27980,7 +29404,15 @@ SWIGINTERN PyObject *_wrap_svn_io_files_contents_same_p(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_io_files_contents_same_p",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_files_contents_same_p",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_files_contents_same_p", "file1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_files_contents_same_p", "file2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -28043,6 +29475,9 @@ SWIGINTERN PyObject *_wrap_svn_io_files_contents_three_same_p(PyObject *SWIGUNUS
   int res2 = SWIG_TMPOBJ ;
   svn_boolean_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -28053,7 +29488,19 @@ SWIGINTERN PyObject *_wrap_svn_io_files_contents_three_same_p(PyObject *SWIGUNUS
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"sss|O:svn_io_files_contents_three_same_p",&arg4,&arg5,&arg6,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_files_contents_three_same_p",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_files_contents_three_same_p", "file1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_files_contents_three_same_p", "file2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_io_files_contents_three_same_p", "file3");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -28119,6 +29566,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_create_bytes(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *arg4 = (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 ;
@@ -28128,7 +29576,11 @@ SWIGINTERN PyObject *_wrap_svn_io_file_create_bytes(PyObject *SWIGUNUSEDPARM(sel
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_create_bytes",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_file_create_bytes", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -28186,6 +29638,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_create_empty(PyObject *SWIGUNUSEDPARM(sel
   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 ;
   
@@ -28193,7 +29646,11 @@ SWIGINTERN PyObject *_wrap_svn_io_file_create_empty(PyObject *SWIGUNUSEDPARM(sel
       &_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(!PyArg_UnpackTuple(args,(char *)"svn_io_file_create_empty",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_file_create_empty", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -28251,7 +29708,7 @@ SWIGINTERN PyObject *_wrap_svn_io_lock_open_file(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_io_lock_open_file",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_lock_open_file",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -28321,7 +29778,7 @@ SWIGINTERN PyObject *_wrap_svn_io_unlock_open_file(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_io_unlock_open_file",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_unlock_open_file",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -28374,7 +29831,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_read2(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_stream_set_read2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_set_read2",3,3,&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()) {
@@ -28419,7 +29876,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_skip(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_skip",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_set_skip",2,2,&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()) {
@@ -28456,7 +29913,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_mark(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_mark",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_set_mark",2,2,&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()) {
@@ -28493,7 +29950,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_seek(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_seek",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_set_seek",2,2,&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()) {
@@ -28530,7 +29987,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_data_available(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_data_available",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_set_data_available",2,2,&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()) {
@@ -28567,7 +30024,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_readline(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_readline",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_set_readline",2,2,&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()) {
@@ -28609,7 +30066,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_empty(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_stream_empty",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_empty",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -28654,7 +30111,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_disown(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_disown",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_disown",1,2,&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()) {
@@ -28700,6 +30157,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_readonly(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_stream_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -28713,7 +30171,11 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_readonly(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_stream_open_readonly",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_open_readonly",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_stream_open_readonly", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -28782,6 +30244,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_writable(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_stream_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -28795,7 +30258,11 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_writable(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_stream_open_writable",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_open_writable",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_stream_open_writable", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -28867,6 +30334,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_unique(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   svn_stream_t *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -28882,7 +30350,11 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_unique(PyObject *SWIGUNUSEDPARM(self)
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_stream_open_unique",&arg3,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_open_unique",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_stream_open_unique", "dirpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_io_file_del_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -28937,7 +30409,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_unique(PyObject *SWIGUNUSEDPARM(self)
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -28977,7 +30449,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_from_aprfile2(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_from_aprfile2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_from_aprfile2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -29032,7 +30504,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_from_aprfile(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_from_aprfile",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_from_aprfile",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -29084,7 +30556,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_for_stdin2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_for_stdin2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_for_stdin2",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -29151,7 +30623,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_for_stdin(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_stream_for_stdin",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_for_stdin",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -29212,7 +30684,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_for_stderr(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_stream_for_stderr",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_for_stderr",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -29273,7 +30745,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_for_stdout(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_stream_for_stdout",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_for_stdout",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -29338,7 +30810,7 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_stream(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stringbuf_from_stream",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stringbuf_from_stream",2,3,&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()) {
@@ -29383,9 +30855,8 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_stream(PyObject *SWIGUNUSEDPARM(se
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -29417,16 +30888,22 @@ SWIGINTERN PyObject *_wrap_svn_stream_from_stringbuf(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_from_stringbuf",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_from_stringbuf",1,2,&obj0,&obj1)) SWIG_fail;
   {
-    if (!PyString_Check(obj0)) {
-      PyErr_SetString(PyExc_TypeError, "not a string");
+    if (!PyBytes_Check(obj0)) {
+      PyErr_SetString(PyExc_TypeError, "not a bytes object");
       SWIG_fail;
     }
-    arg1 = svn_stringbuf_ncreate(PyString_AS_STRING(obj0),
-      PyString_GET_SIZE(obj0),
-      /* ### gah... what pool to use? */
-      _global_pool);
+    {
+      Py_ssize_t strBufLen;
+      char *strBufChar;
+      if (-1 == PyBytes_AsStringAndSize(obj0, &strBufChar, &strBufLen)) {
+        SWIG_fail;
+      }
+      arg1 = svn_stringbuf_ncreate(strBufChar, strBufLen,
+        /* ### gah... what pool to use? */
+        _global_pool);
+    }
   }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -29473,17 +30950,21 @@ SWIGINTERN PyObject *_wrap_svn_stream_from_string(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_from_string",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_from_string",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (obj0 == Py_None)
     arg1 = NULL;
     else {
-      if (!PyString_Check(obj0)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj0)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj0, (char **)&(value1.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value1.data = PyString_AS_STRING(obj0);
-      value1.len = PyString_GET_SIZE(obj0);
+      value1.len = pyStrLen;
       arg1 = &value1;
     }
   }
@@ -29529,7 +31010,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_buffered(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_stream_buffered",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_buffered",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -29574,7 +31055,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_compressed(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_compressed",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_compressed",1,2,&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()) {
@@ -29635,7 +31116,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_checksummed2(PyObject *SWIGUNUSEDPARM(self
   arg6 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_stream_checksummed2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_checksummed2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -29673,22 +31154,16 @@ SWIGINTERN PyObject *_wrap_svn_stream_checksummed2(PyObject *SWIGUNUSEDPARM(self
   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 **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_checksummed2 is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
-    /* FIXME: Missing argout typemap: svn_stream_checksummed2 arg 3 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_checksummed2 is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -29727,7 +31202,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_contents_checksum(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_stream_contents_checksum",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_contents_checksum",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -29776,13 +31251,10 @@ SWIGINTERN PyObject *_wrap_svn_stream_contents_checksum(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_stream_contents_checksum arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_contents_checksum is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -29812,7 +31284,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read_full(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_read_full",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_read_full",2,2,&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()) {
@@ -29823,6 +31295,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read_full(PyObject *SWIGUNUSEDPARM(self),
     if (PyLong_Check(obj1)) {
       temp2 = PyLong_AsUnsignedLong(obj1);
     }
+#if IS_PY3 != 1
     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.
@@ -29831,6 +31304,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read_full(PyObject *SWIGUNUSEDPARM(self),
                  problem goes away because PyInt is gone anyway. */
       temp2 = PyInt_AsUnsignedLongMask(obj1);
     }
+#endif
     else {
       PyErr_SetString(PyExc_TypeError,
         "expecting an integer for the buffer size");
@@ -29859,7 +31333,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read_full(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize(arg2, *arg3));
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyBytes_FromStringAndSize(arg2, *arg3));
     free(arg2);
   }
   return resultobj;
@@ -29874,7 +31348,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_supports_partial_read(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_supports_partial_read",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_supports_partial_read",1,1,&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()) {
@@ -29906,7 +31380,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read2(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_read2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_read2",2,2,&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()) {
@@ -29917,6 +31391,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read2(PyObject *SWIGUNUSEDPARM(self), PyOb
     if (PyLong_Check(obj1)) {
       temp2 = PyLong_AsUnsignedLong(obj1);
     }
+#if IS_PY3 != 1
     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.
@@ -29925,6 +31400,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read2(PyObject *SWIGUNUSEDPARM(self), PyOb
                  problem goes away because PyInt is gone anyway. */
       temp2 = PyInt_AsUnsignedLongMask(obj1);
     }
+#endif
     else {
       PyErr_SetString(PyExc_TypeError,
         "expecting an integer for the buffer size");
@@ -29953,7 +31429,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read2(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize(arg2, *arg3));
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyBytes_FromStringAndSize(arg2, *arg3));
     free(arg2);
   }
   return resultobj;
@@ -29972,7 +31448,7 @@ 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_UnpackTuple(args,(char *)"svn_stream_read",2,2,&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()) {
@@ -29983,6 +31459,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read(PyObject *SWIGUNUSEDPARM(self), PyObj
     if (PyLong_Check(obj1)) {
       temp2 = PyLong_AsUnsignedLong(obj1);
     }
+#if IS_PY3 != 1
     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.
@@ -29991,6 +31468,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read(PyObject *SWIGUNUSEDPARM(self), PyObj
                  problem goes away because PyInt is gone anyway. */
       temp2 = PyInt_AsUnsignedLongMask(obj1);
     }
+#endif
     else {
       PyErr_SetString(PyExc_TypeError,
         "expecting an integer for the buffer size");
@@ -30019,7 +31497,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_read(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize(arg2, *arg3));
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyBytes_FromStringAndSize(arg2, *arg3));
     free(arg2);
   }
   return resultobj;
@@ -30036,7 +31514,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_skip(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_skip",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_skip",2,2,&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()) {
@@ -30084,7 +31562,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_write(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_write",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_write",2,2,&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()) {
@@ -30092,13 +31570,24 @@ SWIGINTERN PyObject *_wrap_svn_stream_write(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    if (!PyString_Check(obj1)) {
+    Py_ssize_t length;
+    if (PyBytes_Check(obj1)) {
+      if (PyBytes_AsStringAndSize(obj1, (char **)&arg2, &length) == -1) {
+        SWIG_fail;
+      }
+    }
+    else if (PyUnicode_Check(obj1)) {
+      arg2 = (char *)PyStr_AsUTF8AndSize(obj1, &length);
+      if (PyErr_Occurred()) {
+        SWIG_fail;
+      }
+    }
+    else {
       PyErr_SetString(PyExc_TypeError,
-        "expecting a string for the buffer");
+        "expecting a bytes or str object for the buffer");
       SWIG_fail;
     }
-    arg2 = PyString_AS_STRING(obj1);
-    temp2 = PyString_GET_SIZE(obj1);
+    temp2 = (apr_size_t)length;
     arg3 = (apr_size_t *)&temp2;
   }
   {
@@ -30135,7 +31624,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_close(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_close",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_close",1,1,&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()) {
@@ -30173,7 +31662,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_reset(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_reset",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_reset",1,1,&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()) {
@@ -30211,7 +31700,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_supports_mark(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_supports_mark",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_supports_mark",1,1,&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()) {
@@ -30239,7 +31728,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_supports_reset(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_supports_reset",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_supports_reset",1,1,&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()) {
@@ -30278,7 +31767,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_mark(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_mark",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_mark",1,2,&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()) {
@@ -30313,13 +31802,10 @@ SWIGINTERN PyObject *_wrap_svn_stream_mark(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_stream_mark arg 2 (svn_stream_mark_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_mark is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_stream_mark_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -30341,7 +31827,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_seek(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_seek",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_seek",2,2,&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()) {
@@ -30389,7 +31875,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_data_available(PyObject *SWIGUNUSEDPARM(se
   svn_error_t *result = 0 ;
   
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_data_available",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_data_available",1,1,&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()) {
@@ -30443,7 +31929,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_tee(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_tee",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_tee",2,3,&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()) {
@@ -30491,9 +31977,10 @@ SWIGINTERN PyObject *_wrap_svn_stream_puts(PyObject *SWIGUNUSEDPARM(self), PyObj
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_stream_puts",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_puts",2,2,&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()) {
@@ -30501,6 +31988,10 @@ SWIGINTERN PyObject *_wrap_svn_stream_puts(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_stream_puts", "str");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_stream_puts(arg1,(char const *)arg2);
@@ -30538,6 +32029,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_readline(PyObject *SWIGUNUSEDPARM(self), P
   svn_boolean_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -30547,13 +32039,17 @@ SWIGINTERN PyObject *_wrap_svn_stream_readline(PyObject *SWIGUNUSEDPARM(self), P
   arg5 = _global_pool;
   arg2 = &temp2;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_stream_readline",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_readline",2,3,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_stream_readline", "eol");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -30586,9 +32082,8 @@ SWIGINTERN PyObject *_wrap_svn_stream_readline(PyObject *SWIGUNUSEDPARM(self), P
     if (*arg2 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg2)->data, (*arg2)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg2)->data, (*arg2)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -30631,7 +32126,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_copy3(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_stream_copy3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_copy3",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -30706,7 +32201,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_copy2(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_stream_copy2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_copy2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -30778,7 +32273,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_copy(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_copy",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_copy",2,3,&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()) {
@@ -30850,7 +32345,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_contents_same2(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_contents_same2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_contents_same2",2,3,&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()) {
@@ -30928,7 +32423,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_contents_same(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_contents_same",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_contents_same",2,3,&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()) {
@@ -31005,7 +32500,7 @@ SWIGINTERN PyObject *_wrap_svn_string_from_stream2(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_string_from_stream2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_string_from_stream2",2,3,&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()) {
@@ -31050,9 +32545,8 @@ SWIGINTERN PyObject *_wrap_svn_string_from_stream2(PyObject *SWIGUNUSEDPARM(self
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -31093,7 +32587,7 @@ SWIGINTERN PyObject *_wrap_svn_string_from_stream(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_string_from_stream",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_string_from_stream",1,3,&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()) {
@@ -31140,9 +32634,8 @@ SWIGINTERN PyObject *_wrap_svn_string_from_stream(PyObject *SWIGUNUSEDPARM(self)
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -31184,7 +32677,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_lazyopen_create(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_stream_lazyopen_create",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_lazyopen_create",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_stream_lazyopen_func_t * tmp =
     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);
@@ -31245,6 +32738,7 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_file2(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_stringbuf_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -31253,7 +32747,11 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_file2(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_stringbuf_from_file2",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stringbuf_from_file2",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_stringbuf_from_file2", "filename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -31286,9 +32784,8 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_file2(PyObject *SWIGUNUSEDPARM(sel
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -31314,6 +32811,7 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_file(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_stringbuf_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -31322,7 +32820,11 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_file(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_stringbuf_from_file",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stringbuf_from_file",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_stringbuf_from_file", "filename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -31355,9 +32857,8 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_file(PyObject *SWIGUNUSEDPARM(self
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -31392,7 +32893,7 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_aprfile(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stringbuf_from_aprfile",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stringbuf_from_aprfile",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg2) SWIG_fail;
@@ -31429,9 +32930,8 @@ SWIGINTERN PyObject *_wrap_svn_stringbuf_from_aprfile(PyObject *SWIGUNUSEDPARM(s
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -31456,6 +32956,7 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_file2(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
@@ -31464,7 +32965,11 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_file2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_io_remove_file2",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_remove_file2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_remove_file2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -31516,6 +33021,7 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_file(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
   
@@ -31523,7 +33029,11 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_file(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_io_remove_file",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_remove_file",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_remove_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -31572,6 +33082,7 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_dir2(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -31581,7 +33092,11 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_dir2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_io_remove_dir2",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_remove_dir2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_remove_dir2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -31637,6 +33152,7 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_dir(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
   
@@ -31644,7 +33160,11 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_dir(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_io_remove_dir",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_remove_dir",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_remove_dir", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -31694,6 +33214,7 @@ SWIGINTERN PyObject *_wrap_svn_io_get_dirents3(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -31708,7 +33229,11 @@ SWIGINTERN PyObject *_wrap_svn_io_get_dirents3(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_io_get_dirents3",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_get_dirents3",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_get_dirents3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -31788,6 +33313,7 @@ SWIGINTERN PyObject *_wrap_svn_io_stat_dirent2(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_io_dirent2_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -31803,7 +33329,11 @@ SWIGINTERN PyObject *_wrap_svn_io_stat_dirent2(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|OO:svn_io_stat_dirent2",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_stat_dirent2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_stat_dirent2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -31852,13 +33382,10 @@ SWIGINTERN PyObject *_wrap_svn_io_stat_dirent2(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_io_stat_dirent2 arg 1 (svn_io_dirent2_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_io_stat_dirent2 is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_io_dirent2_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -31888,6 +33415,7 @@ SWIGINTERN PyObject *_wrap_svn_io_stat_dirent(PyObject *SWIGUNUSEDPARM(self), Py
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_io_dirent2_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -31902,7 +33430,11 @@ SWIGINTERN PyObject *_wrap_svn_io_stat_dirent(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_io_stat_dirent",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_stat_dirent",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_stat_dirent", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -31945,13 +33477,10 @@ SWIGINTERN PyObject *_wrap_svn_io_stat_dirent(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_io_stat_dirent arg 1 (svn_io_dirent2_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_io_stat_dirent is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_io_dirent2_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -31980,6 +33509,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dir_walk2(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -31990,7 +33520,11 @@ SWIGINTERN PyObject *_wrap_svn_io_dir_walk2(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_io_dir_walk2",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dir_walk2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_dir_walk2", "dirname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (apr_int32_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -32070,6 +33604,8 @@ SWIGINTERN PyObject *_wrap_svn_io_start_cmd3(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -32086,7 +33622,7 @@ SWIGINTERN PyObject *_wrap_svn_io_start_cmd3(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_start_cmd3",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg1 = (apr_proc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_proc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -32094,6 +33630,14 @@ SWIGINTERN PyObject *_wrap_svn_io_start_cmd3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_start_cmd3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_io_start_cmd3", "cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (char **)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_p_char, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -32197,6 +33741,8 @@ SWIGINTERN PyObject *_wrap_svn_io_start_cmd2(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -32212,7 +33758,7 @@ SWIGINTERN PyObject *_wrap_svn_io_start_cmd2(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_start_cmd2",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     arg1 = (apr_proc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_proc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -32220,6 +33766,14 @@ SWIGINTERN PyObject *_wrap_svn_io_start_cmd2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_start_cmd2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_io_start_cmd2", "cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (char **)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_p_char, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -32318,10 +33872,16 @@ SWIGINTERN PyObject *_wrap_svn_io_run_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   int temp8 ;
   int res8 = SWIG_TMPOBJ ;
+  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 ;
   svn_error_t *result = 0 ;
   
@@ -32330,7 +33890,11 @@ SWIGINTERN PyObject *_wrap_svn_io_run_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg12 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_run_diff2",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_run_diff2", "dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (char **)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -32344,6 +33908,22 @@ SWIGINTERN PyObject *_wrap_svn_io_run_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_io_run_diff2", "label1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_io_run_diff2", "label2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_io_run_diff2", "from");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_io_run_diff2", "to");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = svn_swig_py_make_file(obj7, _global_pool);
     if (!arg9) SWIG_fail;
   }
@@ -32351,6 +33931,10 @@ SWIGINTERN PyObject *_wrap_svn_io_run_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg10 = svn_swig_py_make_file(obj8, _global_pool);
     if (!arg10) SWIG_fail;
   }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_io_run_diff2", "diff_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj10) {
     /* Verify that the user supplied a valid pool */
     if (obj10 != Py_None && obj10 != _global_py_pool) {
@@ -32414,7 +33998,15 @@ SWIGINTERN PyObject *_wrap_svn_io_run_diff3_3(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   int temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  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 ;
   svn_error_t *result = 0 ;
@@ -32424,12 +34016,44 @@ SWIGINTERN PyObject *_wrap_svn_io_run_diff3_3(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg12 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sssssssOsO|O:svn_io_run_diff3_3",&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj7,&arg10,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_run_diff3_3",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_run_diff3_3", "dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_run_diff3_3", "mine");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_io_run_diff3_3", "older");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_io_run_diff3_3", "yours");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_io_run_diff3_3", "mine_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_io_run_diff3_3", "older_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_io_run_diff3_3", "yours_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg9 = svn_swig_py_make_file(obj7, _global_pool);
     if (!arg9) SWIG_fail;
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_io_run_diff3_3", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -32488,6 +34112,7 @@ SWIGINTERN PyObject *_wrap_svn_io_parse_mimetypes_file(PyObject *SWIGUNUSEDPARM(
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -32496,7 +34121,11 @@ SWIGINTERN PyObject *_wrap_svn_io_parse_mimetypes_file(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_io_parse_mimetypes_file",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_parse_mimetypes_file",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_parse_mimetypes_file", "mimetypes_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -32548,6 +34177,7 @@ SWIGINTERN PyObject *_wrap_svn_io_detect_mimetype2(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -32557,7 +34187,11 @@ SWIGINTERN PyObject *_wrap_svn_io_detect_mimetype2(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_io_detect_mimetype2",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_detect_mimetype2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_detect_mimetype2", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
   }
@@ -32595,7 +34229,7 @@ SWIGINTERN PyObject *_wrap_svn_io_detect_mimetype2(PyObject *SWIGUNUSEDPARM(self
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -32621,6 +34255,7 @@ SWIGINTERN PyObject *_wrap_svn_io_detect_mimetype(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -32629,7 +34264,11 @@ SWIGINTERN PyObject *_wrap_svn_io_detect_mimetype(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_io_detect_mimetype",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_detect_mimetype",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_detect_mimetype", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -32664,7 +34303,7 @@ SWIGINTERN PyObject *_wrap_svn_io_detect_mimetype(PyObject *SWIGUNUSEDPARM(self)
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -32690,7 +34329,7 @@ SWIGINTERN PyObject *_wrap_svn_io_is_binary_data(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_is_binary_data",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_is_binary_data",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (void *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_void, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -32794,7 +34433,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_size_get(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_io_file_size_get",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_size_get",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg2) SWIG_fail;
@@ -32857,7 +34496,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_get_offset(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_io_file_get_offset",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_get_offset",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (apr_off_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_off_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -32933,7 +34572,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_read_full2(PyObject *SWIGUNUSEDPARM(self)
   arg6 = _global_pool;
   arg4 = &temp4;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_io_file_read_full2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_read_full2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -33021,7 +34660,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_aligned_seek(PyObject *SWIGUNUSEDPARM(sel
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_aligned_seek",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -33087,7 +34726,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_flush(PyObject *SWIGUNUSEDPARM(self), PyO
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_flush",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -33141,8 +34780,10 @@ SWIGINTERN PyObject *_wrap_svn_io_write_atomic2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -33151,7 +34792,11 @@ SWIGINTERN PyObject *_wrap_svn_io_write_atomic2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOsO|O:svn_io_write_atomic2",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_write_atomic2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_write_atomic2", "final_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -33165,6 +34810,10 @@ SWIGINTERN PyObject *_wrap_svn_io_write_atomic2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_io_write_atomic2", "copy_perms_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -33218,8 +34867,10 @@ SWIGINTERN PyObject *_wrap_svn_io_write_atomic(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   
@@ -33227,7 +34878,11 @@ SWIGINTERN PyObject *_wrap_svn_io_write_atomic(PyObject *SWIGUNUSEDPARM(self), P
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_write_atomic",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_write_atomic", "final_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -33240,6 +34895,10 @@ SWIGINTERN PyObject *_wrap_svn_io_write_atomic(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_io_write_atomic", "copy_perms_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -33290,6 +34949,7 @@ SWIGINTERN PyObject *_wrap_svn_io_write_unique(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -33301,7 +34961,11 @@ SWIGINTERN PyObject *_wrap_svn_io_write_unique(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_io_write_unique",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_write_unique",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_write_unique", "dirpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -33354,7 +35018,7 @@ SWIGINTERN PyObject *_wrap_svn_io_write_unique(PyObject *SWIGUNUSEDPARM(self), P
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -33388,7 +35052,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_trunc(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_io_file_trunc",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_trunc",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -33441,6 +35105,8 @@ SWIGINTERN PyObject *_wrap_svn_io_file_rename2(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *arg4 = (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 ;
   svn_error_t *result = 0 ;
@@ -33449,7 +35115,15 @@ SWIGINTERN PyObject *_wrap_svn_io_file_rename2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_io_file_rename2",&arg1,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_rename2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_io_file_rename2", "from_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_io_file_rename2", "to_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -33501,7 +35175,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dir_close(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dir_close",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_dir_close",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (apr_dir_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_dir_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -33550,7 +35224,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_name_get(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_io_file_name_get",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_name_get",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg2) SWIG_fail;
@@ -33589,7 +35263,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_name_get(PyObject *SWIGUNUSEDPARM(self),
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -33639,7 +35313,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_readline(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_io_file_readline",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_file_readline",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -33690,9 +35364,8 @@ SWIGINTERN PyObject *_wrap_svn_io_file_readline(PyObject *SWIGUNUSEDPARM(self),
     if (*arg2 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg2)->data, (*arg2)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg2)->data, (*arg2)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -33705,7 +35378,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_readline(PyObject *SWIGUNUSEDPARM(self),
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -33737,14 +35410,14 @@ fail:
 
 SWIGINTERN PyObject *svn_stream_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_stream_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_stream_mark_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_stream_mark_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33761,7 +35434,7 @@ SWIGINTERN PyObject *_wrap_svn_read_invoke_fn(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_read_invoke_fn",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_read_invoke_fn",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_read_fn_t * tmp =
     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);
@@ -33782,6 +35455,7 @@ SWIGINTERN PyObject *_wrap_svn_read_invoke_fn(PyObject *SWIGUNUSEDPARM(self), Py
     if (PyLong_Check(obj2)) {
       temp3 = PyLong_AsUnsignedLong(obj2);
     }
+#if IS_PY3 != 1
     else if (PyInt_Check(obj2)) {
       /* wish there was a PyInt_AsUnsignedLong but there isn't
                  the mask version doesn't do bounds checking for us.
@@ -33790,6 +35464,7 @@ SWIGINTERN PyObject *_wrap_svn_read_invoke_fn(PyObject *SWIGUNUSEDPARM(self), Py
                  problem goes away because PyInt is gone anyway. */
       temp3 = PyInt_AsUnsignedLongMask(obj2);
     }
+#endif
     else {
       PyErr_SetString(PyExc_TypeError,
         "expecting an integer for the buffer size");
@@ -33818,7 +35493,7 @@ SWIGINTERN PyObject *_wrap_svn_read_invoke_fn(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize(arg3, *arg4));
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyBytes_FromStringAndSize(arg3, *arg4));
     free(arg3);
   }
   return resultobj;
@@ -33837,7 +35512,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_skip_fn(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_stream_invoke_skip_fn",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_invoke_skip_fn",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_stream_skip_fn_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t, svn_argnum_obj0);
@@ -33897,7 +35572,7 @@ SWIGINTERN PyObject *_wrap_svn_write_invoke_fn(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_write_invoke_fn",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_write_invoke_fn",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_write_fn_t * tmp =
     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);
@@ -33915,13 +35590,24 @@ SWIGINTERN PyObject *_wrap_svn_write_invoke_fn(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    if (!PyString_Check(obj2)) {
+    Py_ssize_t length;
+    if (PyBytes_Check(obj2)) {
+      if (PyBytes_AsStringAndSize(obj2, (char **)&arg3, &length) == -1) {
+        SWIG_fail;
+      }
+    }
+    else if (PyUnicode_Check(obj2)) {
+      arg3 = (char *)PyStr_AsUTF8AndSize(obj2, &length);
+      if (PyErr_Occurred()) {
+        SWIG_fail;
+      }
+    }
+    else {
       PyErr_SetString(PyExc_TypeError,
-        "expecting a string for the buffer");
+        "expecting a bytes or str object for the buffer");
       SWIG_fail;
     }
-    arg3 = PyString_AS_STRING(obj2);
-    temp3 = PyString_GET_SIZE(obj2);
+    temp3 = (apr_size_t)length;
     arg4 = (apr_size_t *)&temp3;
   }
   {
@@ -33960,7 +35646,7 @@ SWIGINTERN PyObject *_wrap_svn_close_invoke_fn(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_close_invoke_fn",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_close_invoke_fn",2,2,&obj0,&obj1)) SWIG_fail;
   {
     svn_close_fn_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj0);
@@ -34021,7 +35707,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_mark_fn(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg4 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_invoke_mark_fn",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_invoke_mark_fn",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_stream_mark_fn_t * tmp =
     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);
@@ -34066,13 +35752,10 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_mark_fn(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_stream_invoke_mark_fn arg 3 (svn_stream_mark_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_invoke_mark_fn is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_stream_mark_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -34096,7 +35779,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_seek_fn(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_stream_invoke_seek_fn",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_invoke_seek_fn",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_stream_seek_fn_t * tmp =
     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);
@@ -34156,7 +35839,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_data_available_fn(PyObject *SWIGUNU
   svn_error_t *result = 0 ;
   
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_invoke_data_available_fn",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_invoke_data_available_fn",2,2,&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);
@@ -34219,6 +35902,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_readline_fn(PyObject *SWIGUNUSEDPAR
   int res5 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -34228,7 +35912,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_readline_fn(PyObject *SWIGUNUSEDPAR
   arg6 = _global_pool;
   arg3 = &temp3;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_stream_invoke_readline_fn",&obj0,&obj1,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_invoke_readline_fn",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_stream_readline_fn_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -34245,6 +35929,10 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_readline_fn(PyObject *SWIGUNUSEDPAR
       PyErr_Clear();
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_stream_invoke_readline_fn", "eol");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -34277,9 +35965,8 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_readline_fn(PyObject *SWIGUNUSEDPAR
     if (*arg3 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg3)->data, (*arg3)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg3)->data, (*arg3)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -34328,7 +36015,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_lazyopen_func(PyObject *SWIGUNUSEDP
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_stream_invoke_lazyopen_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_stream_invoke_lazyopen_func",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_stream_lazyopen_func_t * tmp =
     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);
@@ -34415,6 +36102,7 @@ SWIGINTERN PyObject *_wrap_svn_io_invoke_walk_func(PyObject *SWIGUNUSEDPARM(self
   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 ;
@@ -34423,7 +36111,7 @@ SWIGINTERN PyObject *_wrap_svn_io_invoke_walk_func(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_io_invoke_walk_func",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_io_invoke_walk_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_io_walk_func_t * tmp =
     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);
@@ -34441,6 +36129,10 @@ SWIGINTERN PyObject *_wrap_svn_io_invoke_walk_func(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_io_invoke_walk_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (apr_finfo_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_finfo_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -34487,70 +36179,70 @@ fail:
 
 SWIGINTERN PyObject *svn_read_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_stream_skip_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_write_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_close_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_stream_mark_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_stream_seek_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, SWIG_NewClientData(obj));
   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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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_readline_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_io_walk_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -34562,7 +36254,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_digest_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_checksum_t_digest_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_t_digest_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34573,7 +36265,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_digest_set(PyObject *SWIGUNUSEDPARM(se
     if (obj1 == Py_None) {
       arg2 = NULL;
     } else {
-      arg2 = (unsigned char *) PyString_AsString(obj1);
+      arg2 = (unsigned char *) PyBytes_AsString(obj1);
       if (arg2 == NULL) SWIG_fail;
     }
   }
@@ -34592,7 +36284,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_digest_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   unsigned char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_t_digest_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_t_digest_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34615,7 +36307,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_kind_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_checksum_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34642,7 +36334,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_kind_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_checksum_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34661,7 +36353,7 @@ SWIGINTERN PyObject *_wrap_new_svn_checksum_t(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   struct svn_checksum_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_checksum_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_checksum_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -34683,7 +36375,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_checksum_t(PyObject *SWIGUNUSEDPARM(self),
   struct svn_checksum_t *arg1 = (struct svn_checksum_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_checksum_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_checksum_t",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34707,7 +36399,7 @@ fail:
 
 SWIGINTERN PyObject *svn_checksum_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_checksum_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -34726,7 +36418,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_create(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_create",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_create",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_checksum_kind_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -34769,7 +36461,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_clear(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_clear",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_clear",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34809,7 +36501,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_match(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_checksum_match",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_match",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34851,7 +36543,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_dup(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34902,7 +36594,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_to_cstring_display(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_to_cstring_display",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_to_cstring_display",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34952,7 +36644,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_to_cstring(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_to_cstring",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_to_cstring",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35008,7 +36700,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_serialize(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_checksum_serialize",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_serialize",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35067,6 +36759,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_deserialize(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_checksum_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -35080,7 +36773,11 @@ SWIGINTERN PyObject *_wrap_svn_checksum_deserialize(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_checksum_deserialize",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_deserialize",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_checksum_deserialize", "data");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -35117,13 +36814,10 @@ SWIGINTERN PyObject *_wrap_svn_checksum_deserialize(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_checksum_deserialize arg 1 (svn_checksum_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_checksum_deserialize is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -35153,6 +36847,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_parse_hex(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   svn_checksum_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -35161,13 +36856,17 @@ SWIGINTERN PyObject *_wrap_svn_checksum_parse_hex(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_checksum_parse_hex",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_parse_hex",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_checksum_kind_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
       SWIG_fail;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_checksum_parse_hex", "hex");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -35196,13 +36895,10 @@ SWIGINTERN PyObject *_wrap_svn_checksum_parse_hex(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_checksum_parse_hex arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_checksum_parse_hex is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -35237,7 +36933,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_checksum",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_checksum_kind_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -35284,13 +36980,10 @@ SWIGINTERN PyObject *_wrap_svn_checksum(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_checksum arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_checksum is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -35318,7 +37011,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_empty_checksum(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_empty_checksum",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_empty_checksum",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_checksum_kind_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -35369,7 +37062,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_ctx_create(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_ctx_create",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_ctx_create",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_checksum_kind_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -35412,7 +37105,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_ctx_reset(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_ctx_reset",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_ctx_reset",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_checksum_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35454,7 +37147,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_update(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_checksum_update",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_update",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_checksum_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35515,7 +37208,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_final(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_final",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_final",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_checksum_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35550,13 +37243,10 @@ SWIGINTERN PyObject *_wrap_svn_checksum_final(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_checksum_final arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_checksum_final is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -35576,7 +37266,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_size(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   apr_size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_size",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_size",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35604,7 +37294,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_is_empty_checksum(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_is_empty_checksum",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_is_empty_checksum",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35638,13 +37328,14 @@ SWIGINTERN PyObject *_wrap_svn_checksum_mismatch_err__varargs__(PyObject *SWIGUN
   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;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|Os:svn_checksum_mismatch_err",&obj0,&obj1,&obj2,&arg4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_checksum_mismatch_err",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35665,6 +37356,12 @@ SWIGINTERN PyObject *_wrap_svn_checksum_mismatch_err__varargs__(PyObject *SWIGUN
       SWIG_fail;
     }
   }
+  if (obj3) {
+    {
+      arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_checksum_mismatch_err", "fmt");
+      if (PyErr_Occurred()) SWIG_fail;
+    }
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -35712,7 +37409,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_mismatch_err(PyObject *SWIGUNUSEDPARM(se
 
 SWIGINTERN PyObject *svn_checksum_ctx_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_checksum_ctx_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -35724,7 +37421,7 @@ SWIGINTERN PyObject *_wrap_svn_cache_config_t_cache_size_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_cache_config_t_cache_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cache_config_t_cache_size_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_cache_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_cache_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35746,7 +37443,7 @@ SWIGINTERN PyObject *_wrap_svn_cache_config_t_cache_size_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   apr_uint64_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_cache_config_t_cache_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cache_config_t_cache_size_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_cache_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_cache_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35768,7 +37465,7 @@ SWIGINTERN PyObject *_wrap_svn_cache_config_t_file_handle_count_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_cache_config_t_file_handle_count_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cache_config_t_file_handle_count_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_cache_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_cache_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35795,7 +37492,7 @@ SWIGINTERN PyObject *_wrap_svn_cache_config_t_file_handle_count_get(PyObject *SW
   PyObject * obj0 = 0 ;
   apr_size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_cache_config_t_file_handle_count_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cache_config_t_file_handle_count_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_cache_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_cache_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35817,7 +37514,7 @@ SWIGINTERN PyObject *_wrap_svn_cache_config_t_single_threaded_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_cache_config_t_single_threaded_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cache_config_t_single_threaded_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_cache_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_cache_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35844,7 +37541,7 @@ SWIGINTERN PyObject *_wrap_svn_cache_config_t_single_threaded_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_cache_config_t_single_threaded_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cache_config_t_single_threaded_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_cache_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_cache_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35863,7 +37560,7 @@ SWIGINTERN PyObject *_wrap_new_svn_cache_config_t(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   struct svn_cache_config_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_cache_config_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_cache_config_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -35885,7 +37582,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_cache_config_t(PyObject *SWIGUNUSEDPARM(se
   struct svn_cache_config_t *arg1 = (struct svn_cache_config_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_cache_config_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_cache_config_t",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_cache_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_cache_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35909,7 +37606,7 @@ fail:
 
 SWIGINTERN PyObject *svn_cache_config_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_cache_config_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -35918,7 +37615,7 @@ SWIGINTERN PyObject *_wrap_svn_cache_config_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   svn_cache_config_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_cache_config_get")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cache_config_get",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -35940,7 +37637,7 @@ SWIGINTERN PyObject *_wrap_svn_cache_config_set(PyObject *SWIGUNUSEDPARM(self),
   svn_cache_config_t *arg1 = (svn_cache_config_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_cache_config_set",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_cache_config_set",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_cache_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_cache_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35970,7 +37667,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_set_gnome_keyring_unlock_prompt_func(PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_set_gnome_keyring_unlock_prompt_func",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_auth_set_gnome_keyring_unlock_prompt_func",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -36009,7 +37706,7 @@ SWIGINTERN PyObject *_wrap_svn_swig_py_set_application_pool(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_swig_py_set_application_pool",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_swig_py_set_application_pool",1,2,&obj0,&obj1)) SWIG_fail;
   arg1 = obj0;
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -36043,7 +37740,7 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_swig_py_clear_application_pool(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_swig_py_clear_application_pool")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_swig_py_clear_application_pool",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -36061,28 +37758,28 @@ fail:
 
 SWIGINTERN PyObject *apr_array_header_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_apr_array_header_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *apr_file_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_apr_file_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *apr_hash_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_apr_hash_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *apr_pool_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_apr_pool_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36104,7 +37801,7 @@ SWIGINTERN PyObject *_wrap_svn_swig_mergeinfo_merge(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_swig_mergeinfo_merge",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_swig_mergeinfo_merge",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = &temp1;
     *arg1 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
@@ -36190,7 +37887,7 @@ SWIGINTERN PyObject *_wrap_svn_swig_mergeinfo_sort(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_swig_mergeinfo_sort",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_swig_mergeinfo_sort",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = &temp1;
     *arg1 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
@@ -36265,7 +37962,7 @@ SWIGINTERN PyObject *_wrap_svn_swig_rangelist_merge(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_swig_rangelist_merge",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_swig_rangelist_merge",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = &temp1;
     *arg1 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
@@ -36352,7 +38049,7 @@ SWIGINTERN PyObject *_wrap_svn_swig_rangelist_reverse(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_swig_rangelist_reverse",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_swig_rangelist_reverse",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = &temp1;
     *arg1 = (svn_rangelist_t *) svn_swig_py_seq_to_array(obj0,
@@ -37321,6 +39018,8 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client_conflict_option_t = {"_p_svn_client_conflict_option_t", "svn_client_conflict_option_t *", 0, 0, (void*)0, 0};
 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};
@@ -37483,6 +39182,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
+  &_swigt__p_svn_client__shelf_version_t,
+  &_swigt__p_svn_client_conflict_option_t,
   &_swigt__p_svn_commit_info_t,
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_depth_t,
@@ -37645,6 +39346,8 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client_conflict_option_t[] = {  {&_swigt__p_svn_client_conflict_option_t, 0, 0, 0},{0, 0, 0, 0}};
 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}};
@@ -37807,6 +39510,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
+  _swigc__p_svn_client__shelf_version_t,
+  _swigc__p_svn_client_conflict_option_t,
   _swigc__p_svn_commit_info_t,
   _swigc__p_svn_config_t,
   _swigc__p_svn_depth_t,
@@ -38701,6 +40406,8 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_FS_CORRUPT_PROPLIST",SWIG_From_long((long)(SVN_ERR_FS_CORRUPT_PROPLIST)));
   SWIG_Python_SetConstant(d, "SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP",SWIG_From_long((long)(SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP)));
   SWIG_Python_SetConstant(d, "SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE",SWIG_From_long((long)(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_REP_SHARING_NOT_ALLOWED",SWIG_From_long((long)(SVN_ERR_FS_REP_SHARING_NOT_ALLOWED)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED",SWIG_From_long((long)(SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED)));
   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)));
@@ -38934,16 +40641,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)(13)));
+  SWIG_Python_SetConstant(d, "SVN_VER_MINOR",SWIG_From_long((long)(14)));
   SWIG_Python_SetConstant(d, "SVN_VER_PATCH",SWIG_From_long((long)(0)));
   SWIG_Python_SetConstant(d, "SVN_VER_MICRO",SWIG_From_long((long)(0)));
   SWIG_Python_SetConstant(d, "SVN_VER_LIBRARY",SWIG_From_long((long)(1)));
-  SWIG_Python_SetConstant(d, "SVN_VER_TAG",SWIG_FromCharPtr(" (r1867053)"));
+  SWIG_Python_SetConstant(d, "SVN_VER_TAG",SWIG_FromCharPtr(" (r1876290)"));
   SWIG_Python_SetConstant(d, "SVN_VER_NUMTAG",SWIG_FromCharPtr(""));
-  SWIG_Python_SetConstant(d, "SVN_VER_REVISION",SWIG_From_long((long)(1867053)));
-  SWIG_Python_SetConstant(d, "SVN_VER_NUM",SWIG_FromCharPtr("1.13.0"));
-  SWIG_Python_SetConstant(d, "SVN_VER_NUMBER",SWIG_FromCharPtr("1.13.0"));
-  SWIG_Python_SetConstant(d, "SVN_VERSION",SWIG_FromCharPtr("1.13.0 (r1867053)"));
+  SWIG_Python_SetConstant(d, "SVN_VER_REVISION",SWIG_From_long((long)(1876290)));
+  SWIG_Python_SetConstant(d, "SVN_VER_NUM",SWIG_FromCharPtr("1.14.0"));
+  SWIG_Python_SetConstant(d, "SVN_VER_NUMBER",SWIG_FromCharPtr("1.14.0"));
+  SWIG_Python_SetConstant(d, "SVN_VERSION",SWIG_FromCharPtr("1.14.0 (r1876290)"));
   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)));
diff --git a/subversion/bindings/swig/python/core.py b/subversion/bindings/swig/python/core.py
index 8c3e52a..d57bc46 100644
--- a/subversion/bindings/swig/python/core.py
+++ b/subversion/bindings/swig/python/core.py
@@ -39,6 +39,11 @@ else:
 del _swig_python_version_info
 
 try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
@@ -54,7 +59,7 @@ def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
     if method:
         return method(self, value)
     if (not static):
-        self.__dict__[name] = value
+        object.__setattr__(self, name, value)
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
 
@@ -80,14 +85,26 @@ def _swig_repr(self):
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self, name, value):
+        if (name == "thisown"):
+            return self.this.own(value)
+        if hasattr(self, name) or (name == "this"):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
+
 def _copy_metadata_deep(value, old_value):
   """Copy all attributes of old_value into value, recursively traversing
   lists and dicts if needed."""
   if value is None or old_value is None or value is old_value: return
 
   if isinstance(value, dict):
-    for k, v in value.iteritems():
-      _copy_metadata_deep(v, old_value[k])
+    for k in value:
+      _copy_metadata_deep(value[k], old_value[k])
   elif isinstance(value, list):
     for v, old_v in zip(value, old_value):
       _copy_metadata_deep(v, old_v)
@@ -100,43 +117,63 @@ def _copy_metadata_deep(value, old_value):
 def _assert_valid_deep(value):
   """Assert value's validity, recursively traversing lists and dicts."""
   if isinstance(value, dict):
-    for v in value.itervalues():
-      _assert_valid_deep(v)
+    for k in value:
+      _assert_valid_deep(value[k])
   elif isinstance(value, list):
     for v in value:
       _assert_valid_deep(v)
-  else:
-    if hasattr(value, "assert_valid"):
-      value.assert_valid()
+# Ensure that the passed in value isn't a type, which could have an
+# assert_valid attribute, but it can not be called without an instance.
+  elif type(value) != type:
+    try:
+      fn = value.assert_valid
+    except AttributeError:
+      pass
+    else:
+      fn()
+
+
+
+  # SWIG classes generated with -modern do not define this variable
+try:
+  _newclass
+except NameError:
+  _newclass = 1
+else:
+  raise RuntimeError("Require -modern option, but _newclass is defined")
+
+_get_instance_attr = object.__getattribute__
+_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 
 SWIG_SVN_INVALID_REVNUM = _core.SWIG_SVN_INVALID_REVNUM
 SWIG_SVN_IGNORED_REVNUM = _core.SWIG_SVN_IGNORED_REVNUM
 
-def apr_initialize():
+def apr_initialize() -> "apr_status_t":
     """apr_initialize() -> apr_status_t"""
     return _core.apr_initialize()
 
-def apr_terminate():
+def apr_terminate() -> "void":
     """apr_terminate()"""
     return _core.apr_terminate()
 
-def apr_time_ansi_put(input):
+def apr_time_ansi_put(input: 'time_t') -> "apr_int64_t *":
     """apr_time_ansi_put(time_t input) -> apr_status_t"""
     return _core.apr_time_ansi_put(input)
 
-def apr_pool_destroy(*args):
+def apr_pool_destroy(*args) -> "void":
     """apr_pool_destroy(apr_pool_t p)"""
     return _core.apr_pool_destroy(*args)
 
-def apr_pool_clear(*args):
+def apr_pool_clear(*args) -> "void":
     """apr_pool_clear(apr_pool_t p)"""
     return _core.apr_pool_clear(*args)
 
-def apr_file_open_stdout(*args):
+def apr_file_open_stdout(*args) -> "apr_file_t **":
     """apr_file_open_stdout(apr_pool_t pool) -> apr_status_t"""
     return _core.apr_file_open_stdout(*args)
 
-def apr_file_open_stderr(*args):
+def apr_file_open_stderr(*args) -> "apr_file_t **":
     """apr_file_open_stderr(apr_pool_t pool) -> apr_status_t"""
     return _core.apr_file_open_stderr(*args)
 SVN_ERR_CATEGORY_SIZE = _core.SVN_ERR_CATEGORY_SIZE
@@ -297,6 +334,8 @@ SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST = _core.SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST
 SVN_ERR_FS_CORRUPT_PROPLIST = _core.SVN_ERR_FS_CORRUPT_PROPLIST
 SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP = _core.SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP
 SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE = _core.SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE
+SVN_ERR_FS_REP_SHARING_NOT_ALLOWED = _core.SVN_ERR_FS_REP_SHARING_NOT_ALLOWED
+SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED = _core.SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED
 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
@@ -489,23 +528,23 @@ 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):
+def svn_time_to_cstring(*args) -> "char const *":
     """svn_time_to_cstring(apr_time_t when, apr_pool_t pool) -> char const *"""
     return _core.svn_time_to_cstring(*args)
 
-def svn_time_from_cstring(*args):
+def svn_time_from_cstring(*args) -> "apr_int64_t *":
     """svn_time_from_cstring(char const * data, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_time_from_cstring(*args)
 
-def svn_time_to_human_cstring(*args):
+def svn_time_to_human_cstring(*args) -> "char const *":
     """svn_time_to_human_cstring(apr_time_t when, apr_pool_t pool) -> char const *"""
     return _core.svn_time_to_human_cstring(*args)
 
-def svn_parse_date(*args):
+def svn_parse_date(*args) -> "svn_boolean_t *, apr_int64_t *":
     """svn_parse_date(char const * text, apr_time_t now, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_parse_date(*args)
 
-def svn_sleep_for_timestamps():
+def svn_sleep_for_timestamps() -> "void":
     """svn_sleep_for_timestamps()"""
     return _core.svn_sleep_for_timestamps()
 svn_node_none = _core.svn_node_none
@@ -525,24 +564,17 @@ svn_depth_infinity = _core.svn_depth_infinity
 SVN_UNALIGNED_ACCESS_IS_OK = _core.SVN_UNALIGNED_ACCESS_IS_OK
 TRUE = _core.TRUE
 FALSE = _core.FALSE
-class svn_error_t:
+class svn_error_t(object):
     """Proxy of C svn_error_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_error_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_error_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["apr_err"] = _core.svn_error_t_apr_err_set
-    __swig_getmethods__["apr_err"] = _core.svn_error_t_apr_err_get
-    __swig_getmethods__["message"] = _core.svn_error_t_message_get
-    __swig_setmethods__["child"] = _core.svn_error_t_child_set
-    __swig_getmethods__["child"] = _core.svn_error_t_child_get
-    __swig_setmethods__["pool"] = _core.svn_error_t_pool_set
-    __swig_getmethods__["pool"] = _core.svn_error_t_pool_get
-    __swig_getmethods__["file"] = _core.svn_error_t_file_get
-    __swig_setmethods__["line"] = _core.svn_error_t_line_set
-    __swig_getmethods__["line"] = _core.svn_error_t_line_get
+    apr_err = _swig_property(_core.svn_error_t_apr_err_get, _core.svn_error_t_apr_err_set)
+    message = _swig_property(_core.svn_error_t_message_get)
+    child = _swig_property(_core.svn_error_t_child_get, _core.svn_error_t_child_set)
+    pool = _swig_property(_core.svn_error_t_pool_get, _core.svn_error_t_pool_set)
+    file = _swig_property(_core.svn_error_t_file_get)
+    line = _swig_property(_core.svn_error_t_line_get, _core.svn_error_t_line_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -557,23 +589,57 @@ class svn_error_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -583,7 +649,7 @@ class svn_error_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -599,34 +665,34 @@ svn_error_t_swigregister = _core.svn_error_t_swigregister
 svn_error_t_swigregister(svn_error_t)
 
 
-def svn_node_kind_to_word(kind):
+def svn_node_kind_to_word(kind: 'svn_node_kind_t') -> "char const *":
     """svn_node_kind_to_word(svn_node_kind_t kind) -> char const *"""
     return _core.svn_node_kind_to_word(kind)
 
-def svn_node_kind_from_word(word):
+def svn_node_kind_from_word(word: 'char const *') -> "svn_node_kind_t":
     """svn_node_kind_from_word(char const * word) -> svn_node_kind_t"""
     return _core.svn_node_kind_from_word(word)
 
-def svn_tristate__to_word(tristate):
+def svn_tristate__to_word(tristate: 'svn_tristate_t') -> "char const *":
     """svn_tristate__to_word(svn_tristate_t tristate) -> char const *"""
     return _core.svn_tristate__to_word(tristate)
 
-def svn_tristate__from_word(word):
+def svn_tristate__from_word(word: 'char const *') -> "svn_tristate_t":
     """svn_tristate__from_word(char const * word) -> svn_tristate_t"""
     return _core.svn_tristate__from_word(word)
 
-def svn_revnum_parse(str):
+def svn_revnum_parse(str: 'char const *') -> "svn_revnum_t *, char const **":
     """svn_revnum_parse(char const * str) -> svn_error_t"""
     return _core.svn_revnum_parse(str)
 SVN_REVNUM_T_FMT = _core.SVN_REVNUM_T_FMT
 svn_nonrecursive = _core.svn_nonrecursive
 svn_recursive = _core.svn_recursive
 
-def svn_depth_to_word(depth):
+def svn_depth_to_word(depth: 'svn_depth_t') -> "char const *":
     """svn_depth_to_word(svn_depth_t depth) -> char const *"""
     return _core.svn_depth_to_word(depth)
 
-def svn_depth_from_word(word):
+def svn_depth_from_word(word: 'char const *') -> "svn_depth_t":
     """svn_depth_from_word(char const * word) -> svn_depth_t"""
     return _core.svn_depth_from_word(word)
 SVN_DIRENT_KIND = _core.SVN_DIRENT_KIND
@@ -635,25 +701,17 @@ SVN_DIRENT_HAS_PROPS = _core.SVN_DIRENT_HAS_PROPS
 SVN_DIRENT_CREATED_REV = _core.SVN_DIRENT_CREATED_REV
 SVN_DIRENT_TIME = _core.SVN_DIRENT_TIME
 SVN_DIRENT_LAST_AUTHOR = _core.SVN_DIRENT_LAST_AUTHOR
-class svn_dirent_t:
+class svn_dirent_t(object):
     """Proxy of C svn_dirent_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_dirent_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_dirent_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["kind"] = _core.svn_dirent_t_kind_set
-    __swig_getmethods__["kind"] = _core.svn_dirent_t_kind_get
-    __swig_setmethods__["size"] = _core.svn_dirent_t_size_set
-    __swig_getmethods__["size"] = _core.svn_dirent_t_size_get
-    __swig_setmethods__["has_props"] = _core.svn_dirent_t_has_props_set
-    __swig_getmethods__["has_props"] = _core.svn_dirent_t_has_props_get
-    __swig_setmethods__["created_rev"] = _core.svn_dirent_t_created_rev_set
-    __swig_getmethods__["created_rev"] = _core.svn_dirent_t_created_rev_get
-    __swig_setmethods__["time"] = _core.svn_dirent_t_time_set
-    __swig_getmethods__["time"] = _core.svn_dirent_t_time_get
-    __swig_getmethods__["last_author"] = _core.svn_dirent_t_last_author_get
+    kind = _swig_property(_core.svn_dirent_t_kind_get, _core.svn_dirent_t_kind_set)
+    size = _swig_property(_core.svn_dirent_t_size_get, _core.svn_dirent_t_size_set)
+    has_props = _swig_property(_core.svn_dirent_t_has_props_get, _core.svn_dirent_t_has_props_set)
+    created_rev = _swig_property(_core.svn_dirent_t_created_rev_get, _core.svn_dirent_t_created_rev_set)
+    time = _swig_property(_core.svn_dirent_t_time_get, _core.svn_dirent_t_time_set)
+    last_author = _swig_property(_core.svn_dirent_t_last_author_get)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -668,23 +726,57 @@ class svn_dirent_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -694,7 +786,7 @@ class svn_dirent_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -710,11 +802,11 @@ svn_dirent_t_swigregister = _core.svn_dirent_t_swigregister
 svn_dirent_t_swigregister(svn_dirent_t)
 
 
-def svn_dirent_dup(*args):
+def svn_dirent_dup(*args) -> "svn_dirent_t *":
     """svn_dirent_dup(svn_dirent_t dirent, apr_pool_t pool) -> svn_dirent_t"""
     return _core.svn_dirent_dup(*args)
 
-def svn_dirent_create(*args):
+def svn_dirent_create(*args) -> "svn_dirent_t *":
     """svn_dirent_create(apr_pool_t result_pool) -> svn_dirent_t"""
     return _core.svn_dirent_create(*args)
 SVN_KEYWORD_MAX_LEN = _core.SVN_KEYWORD_MAX_LEN
@@ -729,24 +821,16 @@ SVN_KEYWORD_URL_LONG = _core.SVN_KEYWORD_URL_LONG
 SVN_KEYWORD_URL_SHORT = _core.SVN_KEYWORD_URL_SHORT
 SVN_KEYWORD_ID = _core.SVN_KEYWORD_ID
 SVN_KEYWORD_HEADER = _core.SVN_KEYWORD_HEADER
-class svn_commit_info_t:
+class svn_commit_info_t(object):
     """Proxy of C svn_commit_info_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_commit_info_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_commit_info_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["revision"] = _core.svn_commit_info_t_revision_set
-    __swig_getmethods__["revision"] = _core.svn_commit_info_t_revision_get
-    __swig_setmethods__["date"] = _core.svn_commit_info_t_date_set
-    __swig_getmethods__["date"] = _core.svn_commit_info_t_date_get
-    __swig_setmethods__["author"] = _core.svn_commit_info_t_author_set
-    __swig_getmethods__["author"] = _core.svn_commit_info_t_author_get
-    __swig_setmethods__["post_commit_err"] = _core.svn_commit_info_t_post_commit_err_set
-    __swig_getmethods__["post_commit_err"] = _core.svn_commit_info_t_post_commit_err_get
-    __swig_setmethods__["repos_root"] = _core.svn_commit_info_t_repos_root_set
-    __swig_getmethods__["repos_root"] = _core.svn_commit_info_t_repos_root_get
+    revision = _swig_property(_core.svn_commit_info_t_revision_get, _core.svn_commit_info_t_revision_set)
+    date = _swig_property(_core.svn_commit_info_t_date_get, _core.svn_commit_info_t_date_set)
+    author = _swig_property(_core.svn_commit_info_t_author_get, _core.svn_commit_info_t_author_set)
+    post_commit_err = _swig_property(_core.svn_commit_info_t_post_commit_err_get, _core.svn_commit_info_t_post_commit_err_set)
+    repos_root = _swig_property(_core.svn_commit_info_t_repos_root_get, _core.svn_commit_info_t_repos_root_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -761,23 +845,57 @@ class svn_commit_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -787,7 +905,7 @@ class svn_commit_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -803,33 +921,24 @@ svn_commit_info_t_swigregister = _core.svn_commit_info_t_swigregister
 svn_commit_info_t_swigregister(svn_commit_info_t)
 
 
-def svn_create_commit_info(*args):
+def svn_create_commit_info(*args) -> "svn_commit_info_t *":
     """svn_create_commit_info(apr_pool_t pool) -> svn_commit_info_t"""
     return _core.svn_create_commit_info(*args)
 
-def svn_commit_info_dup(*args):
+def svn_commit_info_dup(*args) -> "svn_commit_info_t *":
     """svn_commit_info_dup(svn_commit_info_t src_commit_info, apr_pool_t pool) -> svn_commit_info_t"""
     return _core.svn_commit_info_dup(*args)
-class svn_log_changed_path2_t:
+class svn_log_changed_path2_t(object):
     """Proxy of C svn_log_changed_path2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_log_changed_path2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_log_changed_path2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["action"] = _core.svn_log_changed_path2_t_action_set
-    __swig_getmethods__["action"] = _core.svn_log_changed_path2_t_action_get
-    __swig_setmethods__["copyfrom_path"] = _core.svn_log_changed_path2_t_copyfrom_path_set
-    __swig_getmethods__["copyfrom_path"] = _core.svn_log_changed_path2_t_copyfrom_path_get
-    __swig_setmethods__["copyfrom_rev"] = _core.svn_log_changed_path2_t_copyfrom_rev_set
-    __swig_getmethods__["copyfrom_rev"] = _core.svn_log_changed_path2_t_copyfrom_rev_get
-    __swig_setmethods__["node_kind"] = _core.svn_log_changed_path2_t_node_kind_set
-    __swig_getmethods__["node_kind"] = _core.svn_log_changed_path2_t_node_kind_get
-    __swig_setmethods__["text_modified"] = _core.svn_log_changed_path2_t_text_modified_set
-    __swig_getmethods__["text_modified"] = _core.svn_log_changed_path2_t_text_modified_get
-    __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
+    action = _swig_property(_core.svn_log_changed_path2_t_action_get, _core.svn_log_changed_path2_t_action_set)
+    copyfrom_path = _swig_property(_core.svn_log_changed_path2_t_copyfrom_path_get, _core.svn_log_changed_path2_t_copyfrom_path_set)
+    copyfrom_rev = _swig_property(_core.svn_log_changed_path2_t_copyfrom_rev_get, _core.svn_log_changed_path2_t_copyfrom_rev_set)
+    node_kind = _swig_property(_core.svn_log_changed_path2_t_node_kind_get, _core.svn_log_changed_path2_t_node_kind_set)
+    text_modified = _swig_property(_core.svn_log_changed_path2_t_text_modified_get, _core.svn_log_changed_path2_t_text_modified_set)
+    props_modified = _swig_property(_core.svn_log_changed_path2_t_props_modified_get, _core.svn_log_changed_path2_t_props_modified_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -844,23 +953,57 @@ class svn_log_changed_path2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -870,7 +1013,7 @@ class svn_log_changed_path2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -886,26 +1029,21 @@ svn_log_changed_path2_t_swigregister = _core.svn_log_changed_path2_t_swigregiste
 svn_log_changed_path2_t_swigregister(svn_log_changed_path2_t)
 
 
-def svn_log_changed_path2_create(*args):
+def svn_log_changed_path2_create(*args) -> "svn_log_changed_path2_t *":
     """svn_log_changed_path2_create(apr_pool_t pool) -> svn_log_changed_path2_t"""
     return _core.svn_log_changed_path2_create(*args)
 
-def svn_log_changed_path2_dup(*args):
+def svn_log_changed_path2_dup(*args) -> "svn_log_changed_path2_t *":
     """svn_log_changed_path2_dup(svn_log_changed_path2_t changed_path, apr_pool_t pool) -> svn_log_changed_path2_t"""
     return _core.svn_log_changed_path2_dup(*args)
-class svn_log_changed_path_t:
+class svn_log_changed_path_t(object):
     """Proxy of C svn_log_changed_path_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_log_changed_path_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_log_changed_path_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["action"] = _core.svn_log_changed_path_t_action_set
-    __swig_getmethods__["action"] = _core.svn_log_changed_path_t_action_get
-    __swig_getmethods__["copyfrom_path"] = _core.svn_log_changed_path_t_copyfrom_path_get
-    __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
+    action = _swig_property(_core.svn_log_changed_path_t_action_get, _core.svn_log_changed_path_t_action_set)
+    copyfrom_path = _swig_property(_core.svn_log_changed_path_t_copyfrom_path_get)
+    copyfrom_rev = _swig_property(_core.svn_log_changed_path_t_copyfrom_rev_get, _core.svn_log_changed_path_t_copyfrom_rev_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -920,23 +1058,57 @@ class svn_log_changed_path_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -946,7 +1118,7 @@ class svn_log_changed_path_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -962,31 +1134,21 @@ svn_log_changed_path_t_swigregister = _core.svn_log_changed_path_t_swigregister
 svn_log_changed_path_t_swigregister(svn_log_changed_path_t)
 
 
-def svn_log_changed_path_dup(*args):
+def svn_log_changed_path_dup(*args) -> "svn_log_changed_path_t *":
     """svn_log_changed_path_dup(svn_log_changed_path_t changed_path, apr_pool_t pool) -> svn_log_changed_path_t"""
     return _core.svn_log_changed_path_dup(*args)
-class svn_log_entry_t:
+class svn_log_entry_t(object):
     """Proxy of C svn_log_entry_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_log_entry_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_log_entry_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["changed_paths"] = _core.svn_log_entry_t_changed_paths_set
-    __swig_getmethods__["changed_paths"] = _core.svn_log_entry_t_changed_paths_get
-    __swig_setmethods__["revision"] = _core.svn_log_entry_t_revision_set
-    __swig_getmethods__["revision"] = _core.svn_log_entry_t_revision_get
-    __swig_setmethods__["revprops"] = _core.svn_log_entry_t_revprops_set
-    __swig_getmethods__["revprops"] = _core.svn_log_entry_t_revprops_get
-    __swig_setmethods__["has_children"] = _core.svn_log_entry_t_has_children_set
-    __swig_getmethods__["has_children"] = _core.svn_log_entry_t_has_children_get
-    __swig_setmethods__["changed_paths2"] = _core.svn_log_entry_t_changed_paths2_set
-    __swig_getmethods__["changed_paths2"] = _core.svn_log_entry_t_changed_paths2_get
-    __swig_setmethods__["non_inheritable"] = _core.svn_log_entry_t_non_inheritable_set
-    __swig_getmethods__["non_inheritable"] = _core.svn_log_entry_t_non_inheritable_get
-    __swig_setmethods__["subtractive_merge"] = _core.svn_log_entry_t_subtractive_merge_set
-    __swig_getmethods__["subtractive_merge"] = _core.svn_log_entry_t_subtractive_merge_get
+    changed_paths = _swig_property(_core.svn_log_entry_t_changed_paths_get, _core.svn_log_entry_t_changed_paths_set)
+    revision = _swig_property(_core.svn_log_entry_t_revision_get, _core.svn_log_entry_t_revision_set)
+    revprops = _swig_property(_core.svn_log_entry_t_revprops_get, _core.svn_log_entry_t_revprops_set)
+    has_children = _swig_property(_core.svn_log_entry_t_has_children_get, _core.svn_log_entry_t_has_children_set)
+    changed_paths2 = _swig_property(_core.svn_log_entry_t_changed_paths2_get, _core.svn_log_entry_t_changed_paths2_set)
+    non_inheritable = _swig_property(_core.svn_log_entry_t_non_inheritable_get, _core.svn_log_entry_t_non_inheritable_set)
+    subtractive_merge = _swig_property(_core.svn_log_entry_t_subtractive_merge_get, _core.svn_log_entry_t_subtractive_merge_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1001,23 +1163,57 @@ class svn_log_entry_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1027,7 +1223,7 @@ class svn_log_entry_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1043,45 +1239,35 @@ svn_log_entry_t_swigregister = _core.svn_log_entry_t_swigregister
 svn_log_entry_t_swigregister(svn_log_entry_t)
 
 
-def svn_log_entry_create(*args):
+def svn_log_entry_create(*args) -> "svn_log_entry_t *":
     """svn_log_entry_create(apr_pool_t pool) -> svn_log_entry_t"""
     return _core.svn_log_entry_create(*args)
 
-def svn_log_entry_dup(*args):
+def svn_log_entry_dup(*args) -> "svn_log_entry_t *":
     """svn_log_entry_dup(svn_log_entry_t log_entry, apr_pool_t pool) -> svn_log_entry_t"""
     return _core.svn_log_entry_dup(*args)
 SVN_STREAM_CHUNK_SIZE = _core.SVN_STREAM_CHUNK_SIZE
 SVN__STREAM_CHUNK_SIZE = _core.SVN__STREAM_CHUNK_SIZE
 
-def svn_mime_type_validate(*args):
+def svn_mime_type_validate(*args) -> "svn_error_t *":
     """svn_mime_type_validate(char const * mime_type, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_mime_type_validate(*args)
 
-def svn_mime_type_is_binary(mime_type):
+def svn_mime_type_is_binary(mime_type: 'char const *') -> "svn_boolean_t":
     """svn_mime_type_is_binary(char const * mime_type) -> svn_boolean_t"""
     return _core.svn_mime_type_is_binary(mime_type)
-class svn_lock_t:
+class svn_lock_t(object):
     """Proxy of C svn_lock_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_lock_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_lock_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _core.svn_lock_t_path_set
-    __swig_getmethods__["path"] = _core.svn_lock_t_path_get
-    __swig_setmethods__["token"] = _core.svn_lock_t_token_set
-    __swig_getmethods__["token"] = _core.svn_lock_t_token_get
-    __swig_setmethods__["owner"] = _core.svn_lock_t_owner_set
-    __swig_getmethods__["owner"] = _core.svn_lock_t_owner_get
-    __swig_setmethods__["comment"] = _core.svn_lock_t_comment_set
-    __swig_getmethods__["comment"] = _core.svn_lock_t_comment_get
-    __swig_setmethods__["is_dav_comment"] = _core.svn_lock_t_is_dav_comment_set
-    __swig_getmethods__["is_dav_comment"] = _core.svn_lock_t_is_dav_comment_get
-    __swig_setmethods__["creation_date"] = _core.svn_lock_t_creation_date_set
-    __swig_getmethods__["creation_date"] = _core.svn_lock_t_creation_date_get
-    __swig_setmethods__["expiration_date"] = _core.svn_lock_t_expiration_date_set
-    __swig_getmethods__["expiration_date"] = _core.svn_lock_t_expiration_date_get
+    path = _swig_property(_core.svn_lock_t_path_get, _core.svn_lock_t_path_set)
+    token = _swig_property(_core.svn_lock_t_token_get, _core.svn_lock_t_token_set)
+    owner = _swig_property(_core.svn_lock_t_owner_get, _core.svn_lock_t_owner_set)
+    comment = _swig_property(_core.svn_lock_t_comment_get, _core.svn_lock_t_comment_set)
+    is_dav_comment = _swig_property(_core.svn_lock_t_is_dav_comment_get, _core.svn_lock_t_is_dav_comment_set)
+    creation_date = _swig_property(_core.svn_lock_t_creation_date_get, _core.svn_lock_t_creation_date_set)
+    expiration_date = _swig_property(_core.svn_lock_t_expiration_date_get, _core.svn_lock_t_expiration_date_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1096,23 +1282,57 @@ class svn_lock_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1122,7 +1342,7 @@ class svn_lock_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1138,31 +1358,25 @@ svn_lock_t_swigregister = _core.svn_lock_t_swigregister
 svn_lock_t_swigregister(svn_lock_t)
 
 
-def svn_lock_create(*args):
+def svn_lock_create(*args) -> "svn_lock_t *":
     """svn_lock_create(apr_pool_t pool) -> svn_lock_t"""
     return _core.svn_lock_create(*args)
 
-def svn_lock_dup(*args):
+def svn_lock_dup(*args) -> "svn_lock_t *":
     """svn_lock_dup(svn_lock_t lock, apr_pool_t pool) -> svn_lock_t"""
     return _core.svn_lock_dup(*args)
 
-def svn_uuid_generate(*args):
+def svn_uuid_generate(*args) -> "char const *":
     """svn_uuid_generate(apr_pool_t pool) -> char const *"""
     return _core.svn_uuid_generate(*args)
-class svn_merge_range_t:
+class svn_merge_range_t(object):
     """Proxy of C svn_merge_range_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_merge_range_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_merge_range_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["start"] = _core.svn_merge_range_t_start_set
-    __swig_getmethods__["start"] = _core.svn_merge_range_t_start_get
-    __swig_setmethods__["end"] = _core.svn_merge_range_t_end_set
-    __swig_getmethods__["end"] = _core.svn_merge_range_t_end_get
-    __swig_setmethods__["inheritable"] = _core.svn_merge_range_t_inheritable_set
-    __swig_getmethods__["inheritable"] = _core.svn_merge_range_t_inheritable_get
+    start = _swig_property(_core.svn_merge_range_t_start_get, _core.svn_merge_range_t_start_set)
+    end = _swig_property(_core.svn_merge_range_t_end_get, _core.svn_merge_range_t_end_set)
+    inheritable = _swig_property(_core.svn_merge_range_t_inheritable_get, _core.svn_merge_range_t_inheritable_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1177,23 +1391,57 @@ class svn_merge_range_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1203,7 +1451,7 @@ class svn_merge_range_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1219,27 +1467,21 @@ svn_merge_range_t_swigregister = _core.svn_merge_range_t_swigregister
 svn_merge_range_t_swigregister(svn_merge_range_t)
 
 
-def svn_merge_range_dup(*args):
+def svn_merge_range_dup(*args) -> "svn_merge_range_t *":
     """svn_merge_range_dup(svn_merge_range_t range, apr_pool_t pool) -> svn_merge_range_t"""
     return _core.svn_merge_range_dup(*args)
 
-def svn_merge_range_contains_rev(range, rev):
+def svn_merge_range_contains_rev(range: 'svn_merge_range_t', rev: 'svn_revnum_t') -> "svn_boolean_t":
     """svn_merge_range_contains_rev(svn_merge_range_t range, svn_revnum_t rev) -> svn_boolean_t"""
     return _core.svn_merge_range_contains_rev(range, rev)
-class svn_location_segment_t:
+class svn_location_segment_t(object):
     """Proxy of C svn_location_segment_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_location_segment_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_location_segment_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["range_start"] = _core.svn_location_segment_t_range_start_set
-    __swig_getmethods__["range_start"] = _core.svn_location_segment_t_range_start_get
-    __swig_setmethods__["range_end"] = _core.svn_location_segment_t_range_end_set
-    __swig_getmethods__["range_end"] = _core.svn_location_segment_t_range_end_get
-    __swig_setmethods__["path"] = _core.svn_location_segment_t_path_set
-    __swig_getmethods__["path"] = _core.svn_location_segment_t_path_get
+    range_start = _swig_property(_core.svn_location_segment_t_range_start_get, _core.svn_location_segment_t_range_start_set)
+    range_end = _swig_property(_core.svn_location_segment_t_range_end_get, _core.svn_location_segment_t_range_end_set)
+    path = _swig_property(_core.svn_location_segment_t_path_get, _core.svn_location_segment_t_path_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1254,23 +1496,57 @@ class svn_location_segment_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1280,7 +1556,7 @@ class svn_location_segment_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1296,16 +1572,13 @@ svn_location_segment_t_swigregister = _core.svn_location_segment_t_swigregister
 svn_location_segment_t_swigregister(svn_location_segment_t)
 
 
-def svn_location_segment_dup(*args):
+def svn_location_segment_dup(*args) -> "svn_location_segment_t *":
     """svn_location_segment_dup(svn_location_segment_t segment, apr_pool_t pool) -> svn_location_segment_t"""
     return _core.svn_location_segment_dup(*args)
-class svn_version_t:
+class svn_version_t(object):
     """Proxy of C svn_version_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_version_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_version_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1324,23 +1597,57 @@ class svn_version_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1350,42 +1657,39 @@ class svn_version_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_version_t_swigregister = _core.svn_version_t_swigregister
 svn_version_t_swigregister(svn_version_t)
 
 
-def svn_log_invoke_entry_receiver(*args):
+def svn_log_invoke_entry_receiver(*args) -> "svn_error_t *":
     """svn_log_invoke_entry_receiver(svn_log_entry_receiver_t _obj, void * baton, svn_log_entry_t log_entry, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_log_invoke_entry_receiver(*args)
 
-def svn_log_invoke_message_receiver(*args):
+def svn_log_invoke_message_receiver(*args) -> "svn_error_t *":
     """svn_log_invoke_message_receiver(svn_log_message_receiver_t _obj, void * baton, apr_hash_t changed_paths, svn_revnum_t revision, char const * author, char const * date, char const * message, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_log_invoke_message_receiver(*args)
 
-def svn_commit_invoke_callback2(*args):
+def svn_commit_invoke_callback2(*args) -> "svn_error_t *":
     """svn_commit_invoke_callback2(svn_commit_callback2_t _obj, svn_commit_info_t commit_info, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_commit_invoke_callback2(*args)
 
-def svn_commit_invoke_callback(_obj, new_revision, date, author, baton):
+def svn_commit_invoke_callback(_obj: 'svn_commit_callback_t', new_revision: 'svn_revnum_t', date: 'char const *', author: 'char const *', baton: 'void *') -> "svn_error_t *":
     """svn_commit_invoke_callback(svn_commit_callback_t _obj, svn_revnum_t new_revision, char const * date, char const * author, void * baton) -> svn_error_t"""
     return _core.svn_commit_invoke_callback(_obj, new_revision, date, author, baton)
 
-def svn_cancel_invoke_func(_obj, cancel_baton):
+def svn_cancel_invoke_func(_obj: 'svn_cancel_func_t', cancel_baton: 'void *') -> "svn_error_t *":
     """svn_cancel_invoke_func(svn_cancel_func_t _obj, void * cancel_baton) -> svn_error_t"""
     return _core.svn_cancel_invoke_func(_obj, cancel_baton)
 
-def svn_location_invoke_segment_receiver(*args):
+def svn_location_invoke_segment_receiver(*args) -> "svn_error_t *":
     """svn_location_invoke_segment_receiver(svn_location_segment_receiver_t _obj, svn_location_segment_t segment, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_location_invoke_segment_receiver(*args)
-class svn_log_entry_receiver_t:
+class svn_log_entry_receiver_t(object):
     """Proxy of C svn_log_entry_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_log_entry_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_log_entry_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1404,23 +1708,57 @@ class svn_log_entry_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1430,7 +1768,7 @@ class svn_log_entry_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1439,13 +1777,10 @@ class svn_log_entry_receiver_t:
 svn_log_entry_receiver_t_swigregister = _core.svn_log_entry_receiver_t_swigregister
 svn_log_entry_receiver_t_swigregister(svn_log_entry_receiver_t)
 
-class svn_log_message_receiver_t:
+class svn_log_message_receiver_t(object):
     """Proxy of C svn_log_message_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_log_message_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_log_message_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1464,23 +1799,57 @@ class svn_log_message_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1490,7 +1859,7 @@ class svn_log_message_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1499,13 +1868,10 @@ class svn_log_message_receiver_t:
 svn_log_message_receiver_t_swigregister = _core.svn_log_message_receiver_t_swigregister
 svn_log_message_receiver_t_swigregister(svn_log_message_receiver_t)
 
-class svn_commit_callback2_t:
+class svn_commit_callback2_t(object):
     """Proxy of C svn_commit_callback2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_commit_callback2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_commit_callback2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1524,23 +1890,57 @@ class svn_commit_callback2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1550,7 +1950,7 @@ class svn_commit_callback2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1559,13 +1959,10 @@ class svn_commit_callback2_t:
 svn_commit_callback2_t_swigregister = _core.svn_commit_callback2_t_swigregister
 svn_commit_callback2_t_swigregister(svn_commit_callback2_t)
 
-class svn_commit_callback_t:
+class svn_commit_callback_t(object):
     """Proxy of C svn_commit_callback_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_commit_callback_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_commit_callback_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1584,23 +1981,57 @@ class svn_commit_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1610,7 +2041,7 @@ class svn_commit_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1619,13 +2050,10 @@ class svn_commit_callback_t:
 svn_commit_callback_t_swigregister = _core.svn_commit_callback_t_swigregister
 svn_commit_callback_t_swigregister(svn_commit_callback_t)
 
-class svn_cancel_func_t:
+class svn_cancel_func_t(object):
     """Proxy of C svn_cancel_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_cancel_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_cancel_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1644,23 +2072,57 @@ class svn_cancel_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1670,7 +2132,7 @@ class svn_cancel_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1679,13 +2141,10 @@ class svn_cancel_func_t:
 svn_cancel_func_t_swigregister = _core.svn_cancel_func_t_swigregister
 svn_cancel_func_t_swigregister(svn_cancel_func_t)
 
-class svn_location_segment_receiver_t:
+class svn_location_segment_receiver_t(object):
     """Proxy of C svn_location_segment_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_location_segment_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_location_segment_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1704,23 +2163,57 @@ class svn_location_segment_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1730,7 +2223,7 @@ class svn_location_segment_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1741,11 +2234,11 @@ svn_location_segment_receiver_t_swigregister(svn_location_segment_receiver_t)
 
 SVN_ALLOCATOR_RECOMMENDED_MAX_FREE = _core.SVN_ALLOCATOR_RECOMMENDED_MAX_FREE
 
-def svn_pool_create(*args):
+def svn_pool_create(*args) -> "apr_pool_t *":
     """svn_pool_create(apr_pool_t parent_pool, apr_allocator_t * allocator) -> apr_pool_t"""
     return _core.svn_pool_create(*args)
 
-def svn_pool_create_allocator(thread_safe):
+def svn_pool_create_allocator(thread_safe: 'svn_boolean_t') -> "apr_allocator_t *":
     """svn_pool_create_allocator(svn_boolean_t thread_safe) -> apr_allocator_t *"""
     return _core.svn_pool_create_allocator(thread_safe)
 SVN_VER_MAJOR = _core.SVN_VER_MAJOR
@@ -1760,25 +2253,20 @@ SVN_VER_NUM = _core.SVN_VER_NUM
 SVN_VER_NUMBER = _core.SVN_VER_NUMBER
 SVN_VERSION = _core.SVN_VERSION
 
-def svn_ver_compatible(my_version, lib_version):
+def svn_ver_compatible(my_version: 'svn_version_t const *', lib_version: 'svn_version_t const *') -> "svn_boolean_t":
     """svn_ver_compatible(svn_version_t const * my_version, svn_version_t const * lib_version) -> svn_boolean_t"""
     return _core.svn_ver_compatible(my_version, lib_version)
 
-def svn_ver_equal(my_version, lib_version):
+def svn_ver_equal(my_version: 'svn_version_t const *', lib_version: 'svn_version_t const *') -> "svn_boolean_t":
     """svn_ver_equal(svn_version_t const * my_version, svn_version_t const * lib_version) -> svn_boolean_t"""
     return _core.svn_ver_equal(my_version, lib_version)
-class svn_version_checklist_t:
+class svn_version_checklist_t(object):
     """Proxy of C svn_version_checklist_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_version_checklist_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_version_checklist_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["label"] = _core.svn_version_checklist_t_label_set
-    __swig_getmethods__["label"] = _core.svn_version_checklist_t_label_get
-    __swig_setmethods__["version_query"] = _core.svn_version_checklist_t_version_query_set
-    __swig_getmethods__["version_query"] = _core.svn_version_checklist_t_version_query_get
+    label = _swig_property(_core.svn_version_checklist_t_label_get, _core.svn_version_checklist_t_label_set)
+    version_query = _swig_property(_core.svn_version_checklist_t_version_query_get, _core.svn_version_checklist_t_version_query_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1793,23 +2281,57 @@ class svn_version_checklist_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1819,7 +2341,7 @@ class svn_version_checklist_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def version_query(self, *args):
@@ -1839,59 +2361,53 @@ 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(my_version, checklist, comparator):
+def svn_ver_check_list2(my_version: 'svn_version_t const *', checklist: 'svn_version_checklist_t', comparator: 'svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)') -> "svn_error_t *":
     """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(my_version, checklist, comparator)
 
-def svn_ver_check_list(my_version, checklist):
+def svn_ver_check_list(my_version: 'svn_version_t const *', checklist: 'svn_version_checklist_t') -> "svn_error_t *":
     """svn_ver_check_list(svn_version_t const * my_version, svn_version_checklist_t checklist) -> svn_error_t"""
     return _core.svn_ver_check_list(my_version, checklist)
 
-def svn_subr_version():
+def svn_subr_version() -> "svn_version_t const *":
     """svn_subr_version() -> svn_version_t const *"""
     return _core.svn_subr_version()
 
-def svn_version_extended(*args):
+def svn_version_extended(*args) -> "svn_version_extended_t const *":
     """svn_version_extended(svn_boolean_t verbose, apr_pool_t pool) -> svn_version_extended_t const *"""
     return _core.svn_version_extended(*args)
 
-def svn_version_ext_build_date(ext_info):
+def svn_version_ext_build_date(ext_info: 'svn_version_extended_t const *') -> "char const *":
     """svn_version_ext_build_date(svn_version_extended_t const * ext_info) -> char const *"""
     return _core.svn_version_ext_build_date(ext_info)
 
-def svn_version_ext_build_time(ext_info):
+def svn_version_ext_build_time(ext_info: 'svn_version_extended_t const *') -> "char const *":
     """svn_version_ext_build_time(svn_version_extended_t const * ext_info) -> char const *"""
     return _core.svn_version_ext_build_time(ext_info)
 
-def svn_version_ext_build_host(ext_info):
+def svn_version_ext_build_host(ext_info: 'svn_version_extended_t const *') -> "char const *":
     """svn_version_ext_build_host(svn_version_extended_t const * ext_info) -> char const *"""
     return _core.svn_version_ext_build_host(ext_info)
 
-def svn_version_ext_copyright(ext_info):
+def svn_version_ext_copyright(ext_info: 'svn_version_extended_t const *') -> "char const *":
     """svn_version_ext_copyright(svn_version_extended_t const * ext_info) -> char const *"""
     return _core.svn_version_ext_copyright(ext_info)
 
-def svn_version_ext_runtime_host(ext_info):
+def svn_version_ext_runtime_host(ext_info: 'svn_version_extended_t const *') -> "char const *":
     """svn_version_ext_runtime_host(svn_version_extended_t const * ext_info) -> char const *"""
     return _core.svn_version_ext_runtime_host(ext_info)
 
-def svn_version_ext_runtime_osname(ext_info):
+def svn_version_ext_runtime_osname(ext_info: 'svn_version_extended_t const *') -> "char const *":
     """svn_version_ext_runtime_osname(svn_version_extended_t const * ext_info) -> char const *"""
     return _core.svn_version_ext_runtime_osname(ext_info)
-class svn_version_ext_linked_lib_t:
+class svn_version_ext_linked_lib_t(object):
     """Proxy of C svn_version_ext_linked_lib_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_version_ext_linked_lib_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_version_ext_linked_lib_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _core.svn_version_ext_linked_lib_t_name_set
-    __swig_getmethods__["name"] = _core.svn_version_ext_linked_lib_t_name_get
-    __swig_setmethods__["compiled_version"] = _core.svn_version_ext_linked_lib_t_compiled_version_set
-    __swig_getmethods__["compiled_version"] = _core.svn_version_ext_linked_lib_t_compiled_version_get
-    __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
+    name = _swig_property(_core.svn_version_ext_linked_lib_t_name_get, _core.svn_version_ext_linked_lib_t_name_set)
+    compiled_version = _swig_property(_core.svn_version_ext_linked_lib_t_compiled_version_get, _core.svn_version_ext_linked_lib_t_compiled_version_set)
+    runtime_version = _swig_property(_core.svn_version_ext_linked_lib_t_runtime_version_get, _core.svn_version_ext_linked_lib_t_runtime_version_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1906,23 +2422,57 @@ class svn_version_ext_linked_lib_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1932,7 +2482,7 @@ class svn_version_ext_linked_lib_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1948,21 +2498,16 @@ svn_version_ext_linked_lib_t_swigregister = _core.svn_version_ext_linked_lib_t_s
 svn_version_ext_linked_lib_t_swigregister(svn_version_ext_linked_lib_t)
 
 
-def svn_version_ext_linked_libs(ext_info):
+def svn_version_ext_linked_libs(ext_info: 'svn_version_extended_t const *') -> "apr_array_header_t const *":
     """svn_version_ext_linked_libs(svn_version_extended_t const * ext_info) -> apr_array_header_t"""
     return _core.svn_version_ext_linked_libs(ext_info)
-class svn_version_ext_loaded_lib_t:
+class svn_version_ext_loaded_lib_t(object):
     """Proxy of C svn_version_ext_loaded_lib_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_version_ext_loaded_lib_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_version_ext_loaded_lib_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _core.svn_version_ext_loaded_lib_t_name_set
-    __swig_getmethods__["name"] = _core.svn_version_ext_loaded_lib_t_name_get
-    __swig_setmethods__["version"] = _core.svn_version_ext_loaded_lib_t_version_set
-    __swig_getmethods__["version"] = _core.svn_version_ext_loaded_lib_t_version_get
+    name = _swig_property(_core.svn_version_ext_loaded_lib_t_name_get, _core.svn_version_ext_loaded_lib_t_name_set)
+    version = _swig_property(_core.svn_version_ext_loaded_lib_t_version_get, _core.svn_version_ext_loaded_lib_t_version_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1977,23 +2522,57 @@ class svn_version_ext_loaded_lib_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2003,7 +2582,7 @@ class svn_version_ext_loaded_lib_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2019,16 +2598,13 @@ svn_version_ext_loaded_lib_t_swigregister = _core.svn_version_ext_loaded_lib_t_s
 svn_version_ext_loaded_lib_t_swigregister(svn_version_ext_loaded_lib_t)
 
 
-def svn_version_ext_loaded_libs(ext_info):
+def svn_version_ext_loaded_libs(ext_info: 'svn_version_extended_t const *') -> "apr_array_header_t const *":
     """svn_version_ext_loaded_libs(svn_version_extended_t const * ext_info) -> apr_array_header_t"""
     return _core.svn_version_ext_loaded_libs(ext_info)
-class svn_version_extended_t:
+class svn_version_extended_t(object):
     """Proxy of C svn_version_extended_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_version_extended_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_version_extended_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2047,23 +2623,57 @@ class svn_version_extended_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2073,26 +2683,23 @@ class svn_version_extended_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_version_extended_t_swigregister = _core.svn_version_extended_t_swigregister
 svn_version_extended_t_swigregister(svn_version_extended_t)
 
 
-def svn_version_checklist_invoke_version_query(_obj):
+def svn_version_checklist_invoke_version_query(_obj: 'svn_version_checklist_t') -> "svn_version_t const *":
     """svn_version_checklist_invoke_version_query(svn_version_checklist_t _obj) -> svn_version_t const *"""
     return _core.svn_version_checklist_invoke_version_query(_obj)
 
-def svn_version_invoke_func(_obj):
+def svn_version_invoke_func(_obj: 'svn_version_func_t') -> "svn_version_t const *":
     """svn_version_invoke_func(svn_version_func_t _obj) -> svn_version_t const *"""
     return _core.svn_version_invoke_func(_obj)
-class svn_version_func_t:
+class svn_version_func_t(object):
     """Proxy of C svn_version_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_version_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_version_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2111,23 +2718,57 @@ class svn_version_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2137,7 +2778,7 @@ class svn_version_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2147,25 +2788,20 @@ svn_version_func_t_swigregister = _core.svn_version_func_t_swigregister
 svn_version_func_t_swigregister(svn_version_func_t)
 
 
-def svn_prop_dup(*args):
+def svn_prop_dup(*args) -> "svn_prop_t *":
     """svn_prop_dup(svn_prop_t const * prop, apr_pool_t pool) -> svn_prop_t *"""
     return _core.svn_prop_dup(*args)
 
-def svn_prop_array_dup(*args):
+def svn_prop_array_dup(*args) -> "apr_array_header_t *":
     """svn_prop_array_dup(apr_array_header_t array, apr_pool_t pool) -> apr_array_header_t"""
     return _core.svn_prop_array_dup(*args)
-class svn_prop_inherited_item_t:
+class svn_prop_inherited_item_t(object):
     """Proxy of C svn_prop_inherited_item_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_prop_inherited_item_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_prop_inherited_item_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path_or_url"] = _core.svn_prop_inherited_item_t_path_or_url_set
-    __swig_getmethods__["path_or_url"] = _core.svn_prop_inherited_item_t_path_or_url_get
-    __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
+    path_or_url = _swig_property(_core.svn_prop_inherited_item_t_path_or_url_get, _core.svn_prop_inherited_item_t_path_or_url_set)
+    prop_hash = _swig_property(_core.svn_prop_inherited_item_t_prop_hash_get, _core.svn_prop_inherited_item_t_prop_hash_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2180,23 +2816,57 @@ class svn_prop_inherited_item_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2206,7 +2876,7 @@ class svn_prop_inherited_item_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2222,74 +2892,74 @@ svn_prop_inherited_item_t_swigregister = _core.svn_prop_inherited_item_t_swigreg
 svn_prop_inherited_item_t_swigregister(svn_prop_inherited_item_t)
 
 
-def svn_prop_hash_to_array(*args):
+def svn_prop_hash_to_array(*args) -> "apr_array_header_t *":
     """svn_prop_hash_to_array(apr_hash_t hash, apr_pool_t pool) -> apr_array_header_t"""
     return _core.svn_prop_hash_to_array(*args)
 
-def svn_prop_array_to_hash(*args):
+def svn_prop_array_to_hash(*args) -> "apr_hash_t *":
     """svn_prop_array_to_hash(apr_array_header_t properties, apr_pool_t result) -> apr_hash_t"""
     return _core.svn_prop_array_to_hash(*args)
 
-def svn_prop_hash_dup(*args):
+def svn_prop_hash_dup(*args) -> "apr_hash_t *":
     """svn_prop_hash_dup(apr_hash_t hash, apr_pool_t pool) -> apr_hash_t"""
     return _core.svn_prop_hash_dup(*args)
 
-def svn_prop_get_value(properties, prop_name):
+def svn_prop_get_value(properties: 'apr_hash_t', prop_name: 'char const *') -> "char const *":
     """svn_prop_get_value(apr_hash_t properties, char const * prop_name) -> char const *"""
     return _core.svn_prop_get_value(properties, prop_name)
 svn_prop_entry_kind = _core.svn_prop_entry_kind
 svn_prop_wc_kind = _core.svn_prop_wc_kind
 svn_prop_regular_kind = _core.svn_prop_regular_kind
 
-def svn_property_kind2(prop_name):
+def svn_property_kind2(prop_name: 'char const *') -> "svn_prop_kind_t":
     """svn_property_kind2(char const * prop_name) -> svn_prop_kind_t"""
     return _core.svn_property_kind2(prop_name)
 
-def svn_property_kind(prop_name):
+def svn_property_kind(prop_name: 'char const *') -> "int *":
     """svn_property_kind(char const * prop_name) -> svn_prop_kind_t"""
     return _core.svn_property_kind(prop_name)
 
-def svn_prop_is_svn_prop(prop_name):
+def svn_prop_is_svn_prop(prop_name: 'char const *') -> "svn_boolean_t":
     """svn_prop_is_svn_prop(char const * prop_name) -> svn_boolean_t"""
     return _core.svn_prop_is_svn_prop(prop_name)
 
-def svn_prop_has_svn_prop(*args):
+def svn_prop_has_svn_prop(*args) -> "svn_boolean_t":
     """svn_prop_has_svn_prop(apr_hash_t props, apr_pool_t pool) -> svn_boolean_t"""
     return _core.svn_prop_has_svn_prop(*args)
 
-def svn_prop_is_boolean(prop_name):
+def svn_prop_is_boolean(prop_name: 'char const *') -> "svn_boolean_t":
     """svn_prop_is_boolean(char const * prop_name) -> svn_boolean_t"""
     return _core.svn_prop_is_boolean(prop_name)
 
-def svn_prop_is_known_svn_rev_prop(prop_name):
+def svn_prop_is_known_svn_rev_prop(prop_name: 'char const *') -> "svn_boolean_t":
     """svn_prop_is_known_svn_rev_prop(char const * prop_name) -> svn_boolean_t"""
     return _core.svn_prop_is_known_svn_rev_prop(prop_name)
 
-def svn_prop_is_known_svn_node_prop(prop_name):
+def svn_prop_is_known_svn_node_prop(prop_name: 'char const *') -> "svn_boolean_t":
     """svn_prop_is_known_svn_node_prop(char const * prop_name) -> svn_boolean_t"""
     return _core.svn_prop_is_known_svn_node_prop(prop_name)
 
-def svn_prop_is_known_svn_file_prop(prop_name):
+def svn_prop_is_known_svn_file_prop(prop_name: 'char const *') -> "svn_boolean_t":
     """svn_prop_is_known_svn_file_prop(char const * prop_name) -> svn_boolean_t"""
     return _core.svn_prop_is_known_svn_file_prop(prop_name)
 
-def svn_prop_is_known_svn_dir_prop(prop_name):
+def svn_prop_is_known_svn_dir_prop(prop_name: 'char const *') -> "svn_boolean_t":
     """svn_prop_is_known_svn_dir_prop(char const * prop_name) -> svn_boolean_t"""
     return _core.svn_prop_is_known_svn_dir_prop(prop_name)
 
-def svn_prop_needs_translation(prop_name):
+def svn_prop_needs_translation(prop_name: 'char const *') -> "svn_boolean_t":
     """svn_prop_needs_translation(char const * prop_name) -> svn_boolean_t"""
     return _core.svn_prop_needs_translation(prop_name)
 
-def svn_categorize_props(*args):
+def svn_categorize_props(*args) -> "apr_array_header_t **, apr_array_header_t **, apr_array_header_t **":
     """svn_categorize_props(apr_array_header_t proplist, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_categorize_props(*args)
 
-def svn_prop_diffs(*args):
+def svn_prop_diffs(*args) -> "apr_array_header_t **":
     """svn_prop_diffs(apr_hash_t target_props, apr_hash_t source_props, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_prop_diffs(*args)
 
-def svn_prop_name_is_valid(prop_name):
+def svn_prop_name_is_valid(prop_name: 'char const *') -> "svn_boolean_t":
     """svn_prop_name_is_valid(char const * prop_name) -> svn_boolean_t"""
     return _core.svn_prop_name_is_valid(prop_name)
 SVN_PROP_PREFIX = _core.SVN_PROP_PREFIX
@@ -2347,25 +3017,17 @@ SVN_OPT_MAX_ALIASES = _core.SVN_OPT_MAX_ALIASES
 SVN_OPT_MAX_OPTIONS = _core.SVN_OPT_MAX_OPTIONS
 SVN_OPT_MAX_PARAGRAPHS = _core.SVN_OPT_MAX_PARAGRAPHS
 SVN_OPT_FIRST_LONGOPT_ID = _core.SVN_OPT_FIRST_LONGOPT_ID
-class svn_opt_subcommand_desc3_t:
+class svn_opt_subcommand_desc3_t(object):
     """Proxy of C svn_opt_subcommand_desc3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_subcommand_desc3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_subcommand_desc3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _core.svn_opt_subcommand_desc3_t_name_set
-    __swig_getmethods__["name"] = _core.svn_opt_subcommand_desc3_t_name_get
-    __swig_setmethods__["cmd_func"] = _core.svn_opt_subcommand_desc3_t_cmd_func_set
-    __swig_getmethods__["cmd_func"] = _core.svn_opt_subcommand_desc3_t_cmd_func_get
-    __swig_setmethods__["aliases"] = _core.svn_opt_subcommand_desc3_t_aliases_set
-    __swig_getmethods__["aliases"] = _core.svn_opt_subcommand_desc3_t_aliases_get
-    __swig_setmethods__["help"] = _core.svn_opt_subcommand_desc3_t_help_set
-    __swig_getmethods__["help"] = _core.svn_opt_subcommand_desc3_t_help_get
-    __swig_setmethods__["valid_options"] = _core.svn_opt_subcommand_desc3_t_valid_options_set
-    __swig_getmethods__["valid_options"] = _core.svn_opt_subcommand_desc3_t_valid_options_get
-    __swig_getmethods__["desc_overrides"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_get
+    name = _swig_property(_core.svn_opt_subcommand_desc3_t_name_get, _core.svn_opt_subcommand_desc3_t_name_set)
+    cmd_func = _swig_property(_core.svn_opt_subcommand_desc3_t_cmd_func_get, _core.svn_opt_subcommand_desc3_t_cmd_func_set)
+    aliases = _swig_property(_core.svn_opt_subcommand_desc3_t_aliases_get, _core.svn_opt_subcommand_desc3_t_aliases_set)
+    help = _swig_property(_core.svn_opt_subcommand_desc3_t_help_get, _core.svn_opt_subcommand_desc3_t_help_set)
+    valid_options = _swig_property(_core.svn_opt_subcommand_desc3_t_valid_options_get, _core.svn_opt_subcommand_desc3_t_valid_options_set)
+    desc_overrides = _swig_property(_core.svn_opt_subcommand_desc3_t_desc_overrides_get)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2380,23 +3042,57 @@ class svn_opt_subcommand_desc3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2406,7 +3102,7 @@ class svn_opt_subcommand_desc3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2421,18 +3117,13 @@ class svn_opt_subcommand_desc3_t:
 svn_opt_subcommand_desc3_t_swigregister = _core.svn_opt_subcommand_desc3_t_swigregister
 svn_opt_subcommand_desc3_t_swigregister(svn_opt_subcommand_desc3_t)
 
-class svn_opt_subcommand_desc3_t_desc_overrides:
+class svn_opt_subcommand_desc3_t_desc_overrides(object):
     """Proxy of C svn_opt_subcommand_desc3_t_desc_overrides struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_subcommand_desc3_t_desc_overrides, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_subcommand_desc3_t_desc_overrides, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["optch"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_optch_set
-    __swig_getmethods__["optch"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_optch_get
-    __swig_setmethods__["desc"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_desc_set
-    __swig_getmethods__["desc"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_desc_get
+    optch = _swig_property(_core.svn_opt_subcommand_desc3_t_desc_overrides_optch_get, _core.svn_opt_subcommand_desc3_t_desc_overrides_optch_set)
+    desc = _swig_property(_core.svn_opt_subcommand_desc3_t_desc_overrides_desc_get, _core.svn_opt_subcommand_desc3_t_desc_overrides_desc_set)
 
     def __init__(self):
         """__init__(svn_opt_subcommand_desc3_t_desc_overrides self) -> svn_opt_subcommand_desc3_t_desc_overrides"""
@@ -2446,25 +3137,17 @@ class svn_opt_subcommand_desc3_t_desc_overrides:
 svn_opt_subcommand_desc3_t_desc_overrides_swigregister = _core.svn_opt_subcommand_desc3_t_desc_overrides_swigregister
 svn_opt_subcommand_desc3_t_desc_overrides_swigregister(svn_opt_subcommand_desc3_t_desc_overrides)
 
-class svn_opt_subcommand_desc2_t:
+class svn_opt_subcommand_desc2_t(object):
     """Proxy of C svn_opt_subcommand_desc2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_subcommand_desc2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_subcommand_desc2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _core.svn_opt_subcommand_desc2_t_name_set
-    __swig_getmethods__["name"] = _core.svn_opt_subcommand_desc2_t_name_get
-    __swig_setmethods__["cmd_func"] = _core.svn_opt_subcommand_desc2_t_cmd_func_set
-    __swig_getmethods__["cmd_func"] = _core.svn_opt_subcommand_desc2_t_cmd_func_get
-    __swig_setmethods__["aliases"] = _core.svn_opt_subcommand_desc2_t_aliases_set
-    __swig_getmethods__["aliases"] = _core.svn_opt_subcommand_desc2_t_aliases_get
-    __swig_setmethods__["help"] = _core.svn_opt_subcommand_desc2_t_help_set
-    __swig_getmethods__["help"] = _core.svn_opt_subcommand_desc2_t_help_get
-    __swig_setmethods__["valid_options"] = _core.svn_opt_subcommand_desc2_t_valid_options_set
-    __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
+    name = _swig_property(_core.svn_opt_subcommand_desc2_t_name_get, _core.svn_opt_subcommand_desc2_t_name_set)
+    cmd_func = _swig_property(_core.svn_opt_subcommand_desc2_t_cmd_func_get, _core.svn_opt_subcommand_desc2_t_cmd_func_set)
+    aliases = _swig_property(_core.svn_opt_subcommand_desc2_t_aliases_get, _core.svn_opt_subcommand_desc2_t_aliases_set)
+    help = _swig_property(_core.svn_opt_subcommand_desc2_t_help_get, _core.svn_opt_subcommand_desc2_t_help_set)
+    valid_options = _swig_property(_core.svn_opt_subcommand_desc2_t_valid_options_get, _core.svn_opt_subcommand_desc2_t_valid_options_set)
+    desc_overrides = _swig_property(_core.svn_opt_subcommand_desc2_t_desc_overrides_get)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2479,23 +3162,57 @@ class svn_opt_subcommand_desc2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2505,7 +3222,7 @@ class svn_opt_subcommand_desc2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2520,18 +3237,13 @@ class svn_opt_subcommand_desc2_t:
 svn_opt_subcommand_desc2_t_swigregister = _core.svn_opt_subcommand_desc2_t_swigregister
 svn_opt_subcommand_desc2_t_swigregister(svn_opt_subcommand_desc2_t)
 
-class svn_opt_subcommand_desc2_t_desc_overrides:
+class svn_opt_subcommand_desc2_t_desc_overrides(object):
     """Proxy of C svn_opt_subcommand_desc2_t_desc_overrides struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_subcommand_desc2_t_desc_overrides, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_subcommand_desc2_t_desc_overrides, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["optch"] = _core.svn_opt_subcommand_desc2_t_desc_overrides_optch_set
-    __swig_getmethods__["optch"] = _core.svn_opt_subcommand_desc2_t_desc_overrides_optch_get
-    __swig_setmethods__["desc"] = _core.svn_opt_subcommand_desc2_t_desc_overrides_desc_set
-    __swig_getmethods__["desc"] = _core.svn_opt_subcommand_desc2_t_desc_overrides_desc_get
+    optch = _swig_property(_core.svn_opt_subcommand_desc2_t_desc_overrides_optch_get, _core.svn_opt_subcommand_desc2_t_desc_overrides_optch_set)
+    desc = _swig_property(_core.svn_opt_subcommand_desc2_t_desc_overrides_desc_get, _core.svn_opt_subcommand_desc2_t_desc_overrides_desc_set)
 
     def __init__(self):
         """__init__(svn_opt_subcommand_desc2_t_desc_overrides self) -> svn_opt_subcommand_desc2_t_desc_overrides"""
@@ -2545,24 +3257,16 @@ class svn_opt_subcommand_desc2_t_desc_overrides:
 svn_opt_subcommand_desc2_t_desc_overrides_swigregister = _core.svn_opt_subcommand_desc2_t_desc_overrides_swigregister
 svn_opt_subcommand_desc2_t_desc_overrides_swigregister(svn_opt_subcommand_desc2_t_desc_overrides)
 
-class svn_opt_subcommand_desc_t:
+class svn_opt_subcommand_desc_t(object):
     """Proxy of C svn_opt_subcommand_desc_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_subcommand_desc_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_subcommand_desc_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _core.svn_opt_subcommand_desc_t_name_set
-    __swig_getmethods__["name"] = _core.svn_opt_subcommand_desc_t_name_get
-    __swig_setmethods__["cmd_func"] = _core.svn_opt_subcommand_desc_t_cmd_func_set
-    __swig_getmethods__["cmd_func"] = _core.svn_opt_subcommand_desc_t_cmd_func_get
-    __swig_setmethods__["aliases"] = _core.svn_opt_subcommand_desc_t_aliases_set
-    __swig_getmethods__["aliases"] = _core.svn_opt_subcommand_desc_t_aliases_get
-    __swig_setmethods__["help"] = _core.svn_opt_subcommand_desc_t_help_set
-    __swig_getmethods__["help"] = _core.svn_opt_subcommand_desc_t_help_get
-    __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
+    name = _swig_property(_core.svn_opt_subcommand_desc_t_name_get, _core.svn_opt_subcommand_desc_t_name_set)
+    cmd_func = _swig_property(_core.svn_opt_subcommand_desc_t_cmd_func_get, _core.svn_opt_subcommand_desc_t_cmd_func_set)
+    aliases = _swig_property(_core.svn_opt_subcommand_desc_t_aliases_get, _core.svn_opt_subcommand_desc_t_aliases_set)
+    help = _swig_property(_core.svn_opt_subcommand_desc_t_help_get, _core.svn_opt_subcommand_desc_t_help_set)
+    valid_options = _swig_property(_core.svn_opt_subcommand_desc_t_valid_options_get, _core.svn_opt_subcommand_desc_t_valid_options_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2577,23 +3281,57 @@ class svn_opt_subcommand_desc_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2603,7 +3341,7 @@ class svn_opt_subcommand_desc_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2619,85 +3357,80 @@ svn_opt_subcommand_desc_t_swigregister = _core.svn_opt_subcommand_desc_t_swigreg
 svn_opt_subcommand_desc_t_swigregister(svn_opt_subcommand_desc_t)
 
 
-def svn_opt_get_canonical_subcommand3(table, cmd_name):
+def svn_opt_get_canonical_subcommand3(table: 'svn_opt_subcommand_desc3_t', cmd_name: 'char const *') -> "svn_opt_subcommand_desc3_t const *":
     """svn_opt_get_canonical_subcommand3(svn_opt_subcommand_desc3_t table, char const * cmd_name) -> svn_opt_subcommand_desc3_t"""
     return _core.svn_opt_get_canonical_subcommand3(table, cmd_name)
 
-def svn_opt_get_canonical_subcommand2(table, cmd_name):
+def svn_opt_get_canonical_subcommand2(table: 'svn_opt_subcommand_desc2_t', cmd_name: 'char const *') -> "svn_opt_subcommand_desc2_t const *":
     """svn_opt_get_canonical_subcommand2(svn_opt_subcommand_desc2_t table, char const * cmd_name) -> svn_opt_subcommand_desc2_t"""
     return _core.svn_opt_get_canonical_subcommand2(table, cmd_name)
 
-def svn_opt_get_canonical_subcommand(table, cmd_name):
+def svn_opt_get_canonical_subcommand(table: 'svn_opt_subcommand_desc_t', cmd_name: 'char const *') -> "svn_opt_subcommand_desc_t const *":
     """svn_opt_get_canonical_subcommand(svn_opt_subcommand_desc_t table, char const * cmd_name) -> svn_opt_subcommand_desc_t"""
     return _core.svn_opt_get_canonical_subcommand(table, cmd_name)
 
-def svn_opt_get_option_from_code3(*args):
+def svn_opt_get_option_from_code3(*args) -> "apr_getopt_option_t const *":
     """svn_opt_get_option_from_code3(int code, apr_getopt_option_t const * option_table, svn_opt_subcommand_desc3_t command, apr_pool_t pool) -> apr_getopt_option_t const *"""
     return _core.svn_opt_get_option_from_code3(*args)
 
-def svn_opt_get_option_from_code2(*args):
+def svn_opt_get_option_from_code2(*args) -> "apr_getopt_option_t const *":
     """svn_opt_get_option_from_code2(int code, apr_getopt_option_t const * option_table, svn_opt_subcommand_desc2_t command, apr_pool_t pool) -> apr_getopt_option_t const *"""
     return _core.svn_opt_get_option_from_code2(*args)
 
-def svn_opt_get_option_from_code(code, option_table):
+def svn_opt_get_option_from_code(code: 'int', option_table: 'apr_getopt_option_t const *') -> "apr_getopt_option_t const *":
     """svn_opt_get_option_from_code(int code, apr_getopt_option_t const * option_table) -> apr_getopt_option_t const *"""
     return _core.svn_opt_get_option_from_code(code, option_table)
 
-def svn_opt_subcommand_takes_option4(command, option_code):
+def svn_opt_subcommand_takes_option4(command: 'svn_opt_subcommand_desc3_t', option_code: 'int') -> "int *":
     """svn_opt_subcommand_takes_option4(svn_opt_subcommand_desc3_t command, int option_code) -> svn_boolean_t"""
     return _core.svn_opt_subcommand_takes_option4(command, option_code)
 
-def svn_opt_subcommand_takes_option3(command, option_code):
+def svn_opt_subcommand_takes_option3(command: 'svn_opt_subcommand_desc2_t', option_code: 'int') -> "int *":
     """svn_opt_subcommand_takes_option3(svn_opt_subcommand_desc2_t command, int option_code) -> svn_boolean_t"""
     return _core.svn_opt_subcommand_takes_option3(command, option_code)
 
-def svn_opt_subcommand_takes_option2(command, option_code):
+def svn_opt_subcommand_takes_option2(command: 'svn_opt_subcommand_desc2_t', option_code: 'int') -> "svn_boolean_t":
     """svn_opt_subcommand_takes_option2(svn_opt_subcommand_desc2_t command, int option_code) -> svn_boolean_t"""
     return _core.svn_opt_subcommand_takes_option2(command, option_code)
 
-def svn_opt_subcommand_takes_option(command, option_code):
+def svn_opt_subcommand_takes_option(command: 'svn_opt_subcommand_desc_t', option_code: 'int') -> "svn_boolean_t":
     """svn_opt_subcommand_takes_option(svn_opt_subcommand_desc_t command, int option_code) -> svn_boolean_t"""
     return _core.svn_opt_subcommand_takes_option(command, option_code)
 
-def svn_opt_print_generic_help3(*args):
+def svn_opt_print_generic_help3(*args) -> "void":
     """svn_opt_print_generic_help3(char const * header, svn_opt_subcommand_desc3_t cmd_table, apr_getopt_option_t const * opt_table, char const * footer, apr_pool_t pool, FILE * stream)"""
     return _core.svn_opt_print_generic_help3(*args)
 
-def svn_opt_print_generic_help2(*args):
+def svn_opt_print_generic_help2(*args) -> "void":
     """svn_opt_print_generic_help2(char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * opt_table, char const * footer, apr_pool_t pool, FILE * stream)"""
     return _core.svn_opt_print_generic_help2(*args)
 
-def svn_opt_format_option(*args):
+def svn_opt_format_option(*args) -> "char const **":
     """svn_opt_format_option(apr_getopt_option_t const * opt, svn_boolean_t doc, apr_pool_t pool)"""
     return _core.svn_opt_format_option(*args)
 
-def svn_opt_subcommand_help4(*args):
+def svn_opt_subcommand_help4(*args) -> "int *":
     """svn_opt_subcommand_help4(char const * subcommand, svn_opt_subcommand_desc3_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)"""
     return _core.svn_opt_subcommand_help4(*args)
 
-def svn_opt_subcommand_help3(*args):
+def svn_opt_subcommand_help3(*args) -> "int *":
     """svn_opt_subcommand_help3(char const * subcommand, svn_opt_subcommand_desc2_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)"""
     return _core.svn_opt_subcommand_help3(*args)
 
-def svn_opt_subcommand_help2(*args):
+def svn_opt_subcommand_help2(*args) -> "void":
     """svn_opt_subcommand_help2(char const * subcommand, svn_opt_subcommand_desc2_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)"""
     return _core.svn_opt_subcommand_help2(*args)
 
-def svn_opt_subcommand_help(*args):
+def svn_opt_subcommand_help(*args) -> "void":
     """svn_opt_subcommand_help(char const * subcommand, svn_opt_subcommand_desc_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)"""
     return _core.svn_opt_subcommand_help(*args)
-class svn_opt_revision_value_t:
+class svn_opt_revision_value_t(object):
     """Proxy of C svn_opt_revision_value_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_revision_value_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_revision_value_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["number"] = _core.svn_opt_revision_value_t_number_set
-    __swig_getmethods__["number"] = _core.svn_opt_revision_value_t_number_get
-    __swig_setmethods__["date"] = _core.svn_opt_revision_value_t_date_set
-    __swig_getmethods__["date"] = _core.svn_opt_revision_value_t_date_get
+    number = _swig_property(_core.svn_opt_revision_value_t_number_get, _core.svn_opt_revision_value_t_number_set)
+    date = _swig_property(_core.svn_opt_revision_value_t_date_get, _core.svn_opt_revision_value_t_date_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2712,23 +3445,57 @@ class svn_opt_revision_value_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2738,7 +3505,7 @@ class svn_opt_revision_value_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2753,18 +3520,13 @@ class svn_opt_revision_value_t:
 svn_opt_revision_value_t_swigregister = _core.svn_opt_revision_value_t_swigregister
 svn_opt_revision_value_t_swigregister(svn_opt_revision_value_t)
 
-class svn_opt_revision_t:
+class svn_opt_revision_t(object):
     """Proxy of C svn_opt_revision_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_revision_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_revision_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["kind"] = _core.svn_opt_revision_t_kind_set
-    __swig_getmethods__["kind"] = _core.svn_opt_revision_t_kind_get
-    __swig_setmethods__["value"] = _core.svn_opt_revision_t_value_set
-    __swig_getmethods__["value"] = _core.svn_opt_revision_t_value_get
+    kind = _swig_property(_core.svn_opt_revision_t_kind_get, _core.svn_opt_revision_t_kind_set)
+    value = _swig_property(_core.svn_opt_revision_t_value_get, _core.svn_opt_revision_t_value_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2779,23 +3541,57 @@ class svn_opt_revision_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2805,7 +3601,7 @@ class svn_opt_revision_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2820,18 +3616,13 @@ class svn_opt_revision_t:
 svn_opt_revision_t_swigregister = _core.svn_opt_revision_t_swigregister
 svn_opt_revision_t_swigregister(svn_opt_revision_t)
 
-class svn_opt_revision_range_t:
+class svn_opt_revision_range_t(object):
     """Proxy of C svn_opt_revision_range_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_revision_range_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_revision_range_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["start"] = _core.svn_opt_revision_range_t_start_set
-    __swig_getmethods__["start"] = _core.svn_opt_revision_range_t_start_get
-    __swig_setmethods__["end"] = _core.svn_opt_revision_range_t_end_set
-    __swig_getmethods__["end"] = _core.svn_opt_revision_range_t_end_get
+    start = _swig_property(_core.svn_opt_revision_range_t_start_get, _core.svn_opt_revision_range_t_start_set)
+    end = _swig_property(_core.svn_opt_revision_range_t_end_get, _core.svn_opt_revision_range_t_end_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2846,23 +3637,57 @@ class svn_opt_revision_range_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2872,7 +3697,7 @@ class svn_opt_revision_range_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2888,93 +3713,86 @@ svn_opt_revision_range_t_swigregister = _core.svn_opt_revision_range_t_swigregis
 svn_opt_revision_range_t_swigregister(svn_opt_revision_range_t)
 
 
-def svn_opt_parse_revision(*args):
+def svn_opt_parse_revision(*args) -> "int":
     """svn_opt_parse_revision(svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * arg, apr_pool_t pool) -> int"""
     return _core.svn_opt_parse_revision(*args)
 
-def svn_opt_parse_revision_to_range(*args):
+def svn_opt_parse_revision_to_range(*args) -> "int":
     """svn_opt_parse_revision_to_range(apr_array_header_t opt_ranges, char const * arg, apr_pool_t pool) -> int"""
     return _core.svn_opt_parse_revision_to_range(*args)
 
-def svn_opt_resolve_revisions(*args):
+def svn_opt_resolve_revisions(*args) -> "svn_error_t *":
     """svn_opt_resolve_revisions(svn_opt_revision_t peg_rev, svn_opt_revision_t op_rev, svn_boolean_t is_url, svn_boolean_t notice_local_mods, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_resolve_revisions(*args)
 
-def svn_opt_args_to_target_array3(*args):
+def svn_opt_args_to_target_array3(*args) -> "apr_array_header_t **":
     """svn_opt_args_to_target_array3(apr_getopt_t * os, apr_array_header_t known_targets, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_args_to_target_array3(*args)
 
-def svn_opt_args_to_target_array2(*args):
+def svn_opt_args_to_target_array2(*args) -> "apr_array_header_t **":
     """svn_opt_args_to_target_array2(apr_getopt_t * os, apr_array_header_t known_targets, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_args_to_target_array2(*args)
 
-def svn_opt_parse_revprop(*args):
+def svn_opt_parse_revprop(*args) -> "apr_hash_t **":
     """svn_opt_parse_revprop(char const * revprop_spec, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_parse_revprop(*args)
 
-def svn_opt_push_implicit_dot_target(*args):
+def svn_opt_push_implicit_dot_target(*args) -> "void":
     """svn_opt_push_implicit_dot_target(apr_array_header_t targets, apr_pool_t pool)"""
     return _core.svn_opt_push_implicit_dot_target(*args)
 
-def svn_opt_parse_num_args(*args):
+def svn_opt_parse_num_args(*args) -> "apr_array_header_t **":
     """svn_opt_parse_num_args(apr_getopt_t * os, int num_args, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_parse_num_args(*args)
 
-def svn_opt_parse_all_args(*args):
+def svn_opt_parse_all_args(*args) -> "apr_array_header_t **":
     """svn_opt_parse_all_args(apr_getopt_t * os, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_parse_all_args(*args)
 
-def svn_opt_parse_path(*args):
+def svn_opt_parse_path(*args) -> "char const **":
     """svn_opt_parse_path(svn_opt_revision_t rev, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_parse_path(*args)
 
-def svn_opt_print_help5(*args):
+def svn_opt_print_help5(*args) -> "int *":
     """svn_opt_print_help5(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, svn_boolean_t verbose, char const * version_footer, char const * header, svn_opt_subcommand_desc3_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_print_help5(*args)
 
-def svn_opt_print_help4(*args):
+def svn_opt_print_help4(*args) -> "int *":
     """svn_opt_print_help4(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, svn_boolean_t verbose, char const * version_footer, char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_print_help4(*args)
 
-def svn_opt_print_help3(*args):
+def svn_opt_print_help3(*args) -> "int *":
     """svn_opt_print_help3(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, char const * version_footer, char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_print_help3(*args)
 
-def svn_opt_print_help2(*args):
+def svn_opt_print_help2(*args) -> "svn_error_t *":
     """svn_opt_print_help2(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, char const * version_footer, char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_print_help2(*args)
 
-def svn_opt_print_help(*args):
+def svn_opt_print_help(*args) -> "svn_error_t *":
     """svn_opt_print_help(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, char const * version_footer, char const * header, svn_opt_subcommand_desc_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_opt_print_help(*args)
 
-def svn_cmdline_init(progname, error_stream):
+def svn_cmdline_init(progname: 'char const *', error_stream: 'FILE *') -> "int":
     """svn_cmdline_init(char const * progname, FILE * error_stream) -> int"""
     return _core.svn_cmdline_init(progname, error_stream)
 
-def svn_cmdline_create_auth_baton2(*args):
+def svn_cmdline_create_auth_baton2(*args) -> "svn_auth_baton_t **":
     """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):
+def svn_cmdline_create_auth_baton(*args) -> "svn_auth_baton_t **":
     """svn_cmdline_create_auth_baton(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, svn_config_t * cfg, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_cmdline_create_auth_baton(*args)
-class svn_auth_provider_t:
+class svn_auth_provider_t(object):
     """Proxy of C svn_auth_provider_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_provider_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_provider_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["cred_kind"] = _core.svn_auth_provider_t_cred_kind_set
-    __swig_getmethods__["cred_kind"] = _core.svn_auth_provider_t_cred_kind_get
-    __swig_setmethods__["first_credentials"] = _core.svn_auth_provider_t_first_credentials_set
-    __swig_getmethods__["first_credentials"] = _core.svn_auth_provider_t_first_credentials_get
-    __swig_setmethods__["next_credentials"] = _core.svn_auth_provider_t_next_credentials_set
-    __swig_getmethods__["next_credentials"] = _core.svn_auth_provider_t_next_credentials_get
-    __swig_setmethods__["save_credentials"] = _core.svn_auth_provider_t_save_credentials_set
-    __swig_getmethods__["save_credentials"] = _core.svn_auth_provider_t_save_credentials_get
+    cred_kind = _swig_property(_core.svn_auth_provider_t_cred_kind_get, _core.svn_auth_provider_t_cred_kind_set)
+    first_credentials = _swig_property(_core.svn_auth_provider_t_first_credentials_get, _core.svn_auth_provider_t_first_credentials_set)
+    next_credentials = _swig_property(_core.svn_auth_provider_t_next_credentials_get, _core.svn_auth_provider_t_next_credentials_set)
+    save_credentials = _swig_property(_core.svn_auth_provider_t_save_credentials_get, _core.svn_auth_provider_t_save_credentials_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2989,23 +3807,57 @@ class svn_auth_provider_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3015,7 +3867,7 @@ class svn_auth_provider_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def first_credentials(self, *args):
@@ -3042,18 +3894,13 @@ class svn_auth_provider_t:
 svn_auth_provider_t_swigregister = _core.svn_auth_provider_t_swigregister
 svn_auth_provider_t_swigregister(svn_auth_provider_t)
 
-class svn_auth_provider_object_t:
+class svn_auth_provider_object_t(object):
     """Proxy of C svn_auth_provider_object_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_provider_object_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_provider_object_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["vtable"] = _core.svn_auth_provider_object_t_vtable_set
-    __swig_getmethods__["vtable"] = _core.svn_auth_provider_object_t_vtable_get
-    __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
+    vtable = _swig_property(_core.svn_auth_provider_object_t_vtable_get, _core.svn_auth_provider_object_t_vtable_set)
+    provider_baton = _swig_property(_core.svn_auth_provider_object_t_provider_baton_get, _core.svn_auth_provider_object_t_provider_baton_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -3068,23 +3915,57 @@ class svn_auth_provider_object_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3094,7 +3975,7 @@ class svn_auth_provider_object_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -3110,20 +3991,14 @@ svn_auth_provider_object_t_swigregister = _core.svn_auth_provider_object_t_swigr
 svn_auth_provider_object_t_swigregister(svn_auth_provider_object_t)
 
 SVN_AUTH_CRED_SIMPLE = _core.SVN_AUTH_CRED_SIMPLE
-class svn_auth_cred_simple_t:
+class svn_auth_cred_simple_t(object):
     """Proxy of C svn_auth_cred_simple_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_cred_simple_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_cred_simple_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["username"] = _core.svn_auth_cred_simple_t_username_set
-    __swig_getmethods__["username"] = _core.svn_auth_cred_simple_t_username_get
-    __swig_setmethods__["password"] = _core.svn_auth_cred_simple_t_password_set
-    __swig_getmethods__["password"] = _core.svn_auth_cred_simple_t_password_get
-    __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
+    username = _swig_property(_core.svn_auth_cred_simple_t_username_get, _core.svn_auth_cred_simple_t_username_set)
+    password = _swig_property(_core.svn_auth_cred_simple_t_password_get, _core.svn_auth_cred_simple_t_password_set)
+    may_save = _swig_property(_core.svn_auth_cred_simple_t_may_save_get, _core.svn_auth_cred_simple_t_may_save_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -3138,23 +4013,57 @@ class svn_auth_cred_simple_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3164,7 +4073,7 @@ class svn_auth_cred_simple_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -3180,18 +4089,13 @@ svn_auth_cred_simple_t_swigregister = _core.svn_auth_cred_simple_t_swigregister
 svn_auth_cred_simple_t_swigregister(svn_auth_cred_simple_t)
 
 SVN_AUTH_CRED_USERNAME = _core.SVN_AUTH_CRED_USERNAME
-class svn_auth_cred_username_t:
+class svn_auth_cred_username_t(object):
     """Proxy of C svn_auth_cred_username_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_cred_username_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_cred_username_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["username"] = _core.svn_auth_cred_username_t_username_set
-    __swig_getmethods__["username"] = _core.svn_auth_cred_username_t_username_get
-    __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
+    username = _swig_property(_core.svn_auth_cred_username_t_username_get, _core.svn_auth_cred_username_t_username_set)
+    may_save = _swig_property(_core.svn_auth_cred_username_t_may_save_get, _core.svn_auth_cred_username_t_may_save_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -3206,23 +4110,57 @@ class svn_auth_cred_username_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3232,7 +4170,7 @@ class svn_auth_cred_username_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -3248,18 +4186,13 @@ svn_auth_cred_username_t_swigregister = _core.svn_auth_cred_username_t_swigregis
 svn_auth_cred_username_t_swigregister(svn_auth_cred_username_t)
 
 SVN_AUTH_CRED_SSL_CLIENT_CERT = _core.SVN_AUTH_CRED_SSL_CLIENT_CERT
-class svn_auth_cred_ssl_client_cert_t:
+class svn_auth_cred_ssl_client_cert_t(object):
     """Proxy of C svn_auth_cred_ssl_client_cert_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_cred_ssl_client_cert_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_cred_ssl_client_cert_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["cert_file"] = _core.svn_auth_cred_ssl_client_cert_t_cert_file_set
-    __swig_getmethods__["cert_file"] = _core.svn_auth_cred_ssl_client_cert_t_cert_file_get
-    __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
+    cert_file = _swig_property(_core.svn_auth_cred_ssl_client_cert_t_cert_file_get, _core.svn_auth_cred_ssl_client_cert_t_cert_file_set)
+    may_save = _swig_property(_core.svn_auth_cred_ssl_client_cert_t_may_save_get, _core.svn_auth_cred_ssl_client_cert_t_may_save_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -3274,23 +4207,57 @@ class svn_auth_cred_ssl_client_cert_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3300,7 +4267,7 @@ class svn_auth_cred_ssl_client_cert_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -3316,18 +4283,13 @@ svn_auth_cred_ssl_client_cert_t_swigregister = _core.svn_auth_cred_ssl_client_ce
 svn_auth_cred_ssl_client_cert_t_swigregister(svn_auth_cred_ssl_client_cert_t)
 
 SVN_AUTH_CRED_SSL_CLIENT_CERT_PW = _core.SVN_AUTH_CRED_SSL_CLIENT_CERT_PW
-class svn_auth_cred_ssl_client_cert_pw_t:
+class svn_auth_cred_ssl_client_cert_pw_t(object):
     """Proxy of C svn_auth_cred_ssl_client_cert_pw_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_cred_ssl_client_cert_pw_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_cred_ssl_client_cert_pw_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["password"] = _core.svn_auth_cred_ssl_client_cert_pw_t_password_set
-    __swig_getmethods__["password"] = _core.svn_auth_cred_ssl_client_cert_pw_t_password_get
-    __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
+    password = _swig_property(_core.svn_auth_cred_ssl_client_cert_pw_t_password_get, _core.svn_auth_cred_ssl_client_cert_pw_t_password_set)
+    may_save = _swig_property(_core.svn_auth_cred_ssl_client_cert_pw_t_may_save_get, _core.svn_auth_cred_ssl_client_cert_pw_t_may_save_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -3342,23 +4304,57 @@ class svn_auth_cred_ssl_client_cert_pw_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3368,7 +4364,7 @@ class svn_auth_cred_ssl_client_cert_pw_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -3384,26 +4380,17 @@ svn_auth_cred_ssl_client_cert_pw_t_swigregister = _core.svn_auth_cred_ssl_client
 svn_auth_cred_ssl_client_cert_pw_t_swigregister(svn_auth_cred_ssl_client_cert_pw_t)
 
 SVN_AUTH_CRED_SSL_SERVER_TRUST = _core.SVN_AUTH_CRED_SSL_SERVER_TRUST
-class svn_auth_ssl_server_cert_info_t:
+class svn_auth_ssl_server_cert_info_t(object):
     """Proxy of C svn_auth_ssl_server_cert_info_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_ssl_server_cert_info_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_ssl_server_cert_info_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["hostname"] = _core.svn_auth_ssl_server_cert_info_t_hostname_set
-    __swig_getmethods__["hostname"] = _core.svn_auth_ssl_server_cert_info_t_hostname_get
-    __swig_setmethods__["fingerprint"] = _core.svn_auth_ssl_server_cert_info_t_fingerprint_set
-    __swig_getmethods__["fingerprint"] = _core.svn_auth_ssl_server_cert_info_t_fingerprint_get
-    __swig_setmethods__["valid_from"] = _core.svn_auth_ssl_server_cert_info_t_valid_from_set
-    __swig_getmethods__["valid_from"] = _core.svn_auth_ssl_server_cert_info_t_valid_from_get
-    __swig_setmethods__["valid_until"] = _core.svn_auth_ssl_server_cert_info_t_valid_until_set
-    __swig_getmethods__["valid_until"] = _core.svn_auth_ssl_server_cert_info_t_valid_until_get
-    __swig_setmethods__["issuer_dname"] = _core.svn_auth_ssl_server_cert_info_t_issuer_dname_set
-    __swig_getmethods__["issuer_dname"] = _core.svn_auth_ssl_server_cert_info_t_issuer_dname_get
-    __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
+    hostname = _swig_property(_core.svn_auth_ssl_server_cert_info_t_hostname_get, _core.svn_auth_ssl_server_cert_info_t_hostname_set)
+    fingerprint = _swig_property(_core.svn_auth_ssl_server_cert_info_t_fingerprint_get, _core.svn_auth_ssl_server_cert_info_t_fingerprint_set)
+    valid_from = _swig_property(_core.svn_auth_ssl_server_cert_info_t_valid_from_get, _core.svn_auth_ssl_server_cert_info_t_valid_from_set)
+    valid_until = _swig_property(_core.svn_auth_ssl_server_cert_info_t_valid_until_get, _core.svn_auth_ssl_server_cert_info_t_valid_until_set)
+    issuer_dname = _swig_property(_core.svn_auth_ssl_server_cert_info_t_issuer_dname_get, _core.svn_auth_ssl_server_cert_info_t_issuer_dname_set)
+    ascii_cert = _swig_property(_core.svn_auth_ssl_server_cert_info_t_ascii_cert_get, _core.svn_auth_ssl_server_cert_info_t_ascii_cert_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -3418,23 +4405,57 @@ class svn_auth_ssl_server_cert_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3444,7 +4465,7 @@ class svn_auth_ssl_server_cert_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -3460,21 +4481,16 @@ svn_auth_ssl_server_cert_info_t_swigregister = _core.svn_auth_ssl_server_cert_in
 svn_auth_ssl_server_cert_info_t_swigregister(svn_auth_ssl_server_cert_info_t)
 
 
-def svn_auth_ssl_server_cert_info_dup(*args):
+def svn_auth_ssl_server_cert_info_dup(*args) -> "svn_auth_ssl_server_cert_info_t *":
     """svn_auth_ssl_server_cert_info_dup(svn_auth_ssl_server_cert_info_t info, apr_pool_t pool) -> svn_auth_ssl_server_cert_info_t"""
     return _core.svn_auth_ssl_server_cert_info_dup(*args)
-class svn_auth_cred_ssl_server_trust_t:
+class svn_auth_cred_ssl_server_trust_t(object):
     """Proxy of C svn_auth_cred_ssl_server_trust_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_cred_ssl_server_trust_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_cred_ssl_server_trust_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["may_save"] = _core.svn_auth_cred_ssl_server_trust_t_may_save_set
-    __swig_getmethods__["may_save"] = _core.svn_auth_cred_ssl_server_trust_t_may_save_get
-    __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
+    may_save = _swig_property(_core.svn_auth_cred_ssl_server_trust_t_may_save_get, _core.svn_auth_cred_ssl_server_trust_t_may_save_set)
+    accepted_failures = _swig_property(_core.svn_auth_cred_ssl_server_trust_t_accepted_failures_get, _core.svn_auth_cred_ssl_server_trust_t_accepted_failures_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -3489,23 +4505,57 @@ class svn_auth_cred_ssl_server_trust_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3515,7 +4565,7 @@ class svn_auth_cred_ssl_server_trust_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -3536,7 +4586,7 @@ SVN_AUTH_SSL_CNMISMATCH = _core.SVN_AUTH_SSL_CNMISMATCH
 SVN_AUTH_SSL_UNKNOWNCA = _core.SVN_AUTH_SSL_UNKNOWNCA
 SVN_AUTH_SSL_OTHER = _core.SVN_AUTH_SSL_OTHER
 
-def svn_auth_open(*args):
+def svn_auth_open(*args) -> "svn_auth_baton_t **":
     """svn_auth_open(apr_array_header_t providers, apr_pool_t pool)"""
     val = _core.svn_auth_open(*args)
 
@@ -3545,7 +4595,7 @@ def svn_auth_open(*args):
 
     return val
 
-def svn_auth_set_parameter(auth_baton, name, value):
+def svn_auth_set_parameter(auth_baton: 'svn_auth_baton_t *', name: 'char const *', value: 'void const *') -> "void":
     """svn_auth_set_parameter(svn_auth_baton_t * auth_baton, char const * name, void const * value)"""
     return _core.svn_auth_set_parameter(auth_baton, name, value)
 SVN_AUTH_PARAM_PREFIX = _core.SVN_AUTH_PARAM_PREFIX
@@ -3565,86 +4615,83 @@ SVN_AUTH_PARAM_CONFIG = _core.SVN_AUTH_PARAM_CONFIG
 SVN_AUTH_PARAM_SERVER_GROUP = _core.SVN_AUTH_PARAM_SERVER_GROUP
 SVN_AUTH_PARAM_CONFIG_DIR = _core.SVN_AUTH_PARAM_CONFIG_DIR
 
-def svn_auth_first_credentials(*args):
+def svn_auth_first_credentials(*args) -> "void **, svn_auth_iterstate_t **":
     """svn_auth_first_credentials(char const * cred_kind, char const * realmstring, svn_auth_baton_t * auth_baton, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_first_credentials(*args)
 
-def svn_auth_next_credentials(*args):
+def svn_auth_next_credentials(*args) -> "void **":
     """svn_auth_next_credentials(svn_auth_iterstate_t * state, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_next_credentials(*args)
 
-def svn_auth_save_credentials(*args):
+def svn_auth_save_credentials(*args) -> "svn_error_t *":
     """svn_auth_save_credentials(svn_auth_iterstate_t * state, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_save_credentials(*args)
 
-def svn_auth_forget_credentials(*args):
+def svn_auth_forget_credentials(*args) -> "svn_error_t *":
     """svn_auth_forget_credentials(svn_auth_baton_t * auth_baton, char const * cred_kind, char const * realmstring, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_forget_credentials(*args)
 
-def svn_auth_get_simple_prompt_provider(*args):
+def svn_auth_get_simple_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_simple_prompt_provider(svn_auth_simple_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)"""
     return _core.svn_auth_get_simple_prompt_provider(*args)
 
-def svn_auth_get_username_prompt_provider(*args):
+def svn_auth_get_username_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_username_prompt_provider(svn_auth_username_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)"""
     return _core.svn_auth_get_username_prompt_provider(*args)
 
-def svn_auth_get_simple_provider2(*args):
+def svn_auth_get_simple_provider2(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_simple_provider2(svn_auth_plaintext_prompt_func_t plaintext_prompt_func, void * prompt_baton, apr_pool_t pool)"""
     return _core.svn_auth_get_simple_provider2(*args)
 
-def svn_auth_get_simple_provider(*args):
+def svn_auth_get_simple_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_simple_provider(apr_pool_t pool)"""
     return _core.svn_auth_get_simple_provider(*args)
 
-def svn_auth_get_platform_specific_provider(*args):
+def svn_auth_get_platform_specific_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_platform_specific_provider(char const * provider_name, char const * provider_type, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_get_platform_specific_provider(*args)
 
-def svn_auth_get_platform_specific_client_providers(*args):
+def svn_auth_get_platform_specific_client_providers(*args) -> "apr_array_header_t **":
     """svn_auth_get_platform_specific_client_providers(svn_config_t * config, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_get_platform_specific_client_providers(*args)
 SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC = _core.SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC
 SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON = _core.SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON
 
-def svn_auth_get_username_provider(*args):
+def svn_auth_get_username_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_username_provider(apr_pool_t pool)"""
     return _core.svn_auth_get_username_provider(*args)
 
-def svn_auth_get_ssl_server_trust_file_provider(*args):
+def svn_auth_get_ssl_server_trust_file_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_ssl_server_trust_file_provider(apr_pool_t pool)"""
     return _core.svn_auth_get_ssl_server_trust_file_provider(*args)
 
-def svn_auth_get_ssl_client_cert_file_provider(*args):
+def svn_auth_get_ssl_client_cert_file_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_ssl_client_cert_file_provider(apr_pool_t pool)"""
     return _core.svn_auth_get_ssl_client_cert_file_provider(*args)
 
-def svn_auth_get_ssl_client_cert_pw_file_provider2(*args):
+def svn_auth_get_ssl_client_cert_pw_file_provider2(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_ssl_client_cert_pw_file_provider2(svn_auth_plaintext_passphrase_prompt_func_t plaintext_passphrase_prompt_func, void * prompt_baton, apr_pool_t pool)"""
     return _core.svn_auth_get_ssl_client_cert_pw_file_provider2(*args)
 
-def svn_auth_get_ssl_client_cert_pw_file_provider(*args):
+def svn_auth_get_ssl_client_cert_pw_file_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_ssl_client_cert_pw_file_provider(apr_pool_t pool)"""
     return _core.svn_auth_get_ssl_client_cert_pw_file_provider(*args)
 
-def svn_auth_get_ssl_server_trust_prompt_provider(*args):
+def svn_auth_get_ssl_server_trust_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_ssl_server_trust_prompt_provider(svn_auth_ssl_server_trust_prompt_func_t prompt_func, apr_pool_t pool)"""
     return _core.svn_auth_get_ssl_server_trust_prompt_provider(*args)
 
-def svn_auth_get_ssl_client_cert_prompt_provider(*args):
+def svn_auth_get_ssl_client_cert_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_ssl_client_cert_prompt_provider(svn_auth_ssl_client_cert_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)"""
     return _core.svn_auth_get_ssl_client_cert_prompt_provider(*args)
 
-def svn_auth_get_ssl_client_cert_pw_prompt_provider(*args):
+def svn_auth_get_ssl_client_cert_pw_prompt_provider(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_get_ssl_client_cert_pw_prompt_provider(svn_auth_ssl_client_cert_pw_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)"""
     return _core.svn_auth_get_ssl_client_cert_pw_prompt_provider(*args)
-class svn_auth_baton_t:
+class svn_auth_baton_t(object):
     """Proxy of C svn_auth_baton_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_baton_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_baton_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3663,23 +4710,57 @@ class svn_auth_baton_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3689,18 +4770,15 @@ class svn_auth_baton_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_auth_baton_t_swigregister = _core.svn_auth_baton_t_swigregister
 svn_auth_baton_t_swigregister(svn_auth_baton_t)
 
-class svn_auth_iterstate_t:
+class svn_auth_iterstate_t(object):
     """Proxy of C svn_auth_iterstate_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_iterstate_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_iterstate_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3719,23 +4797,57 @@ class svn_auth_iterstate_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3745,66 +4857,63 @@ class svn_auth_iterstate_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_auth_iterstate_t_swigregister = _core.svn_auth_iterstate_t_swigregister
 svn_auth_iterstate_t_swigregister(svn_auth_iterstate_t)
 
 
-def svn_auth_provider_invoke_first_credentials(*args):
+def svn_auth_provider_invoke_first_credentials(*args) -> "void **, void **":
     """svn_auth_provider_invoke_first_credentials(svn_auth_provider_t _obj, void * provider_baton, apr_hash_t parameters, char const * realmstring, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_provider_invoke_first_credentials(*args)
 
-def svn_auth_provider_invoke_next_credentials(*args):
+def svn_auth_provider_invoke_next_credentials(*args) -> "void **":
     """svn_auth_provider_invoke_next_credentials(svn_auth_provider_t _obj, void * iter_baton, void * provider_baton, apr_hash_t parameters, char const * realmstring, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_provider_invoke_next_credentials(*args)
 
-def svn_auth_provider_invoke_save_credentials(*args):
+def svn_auth_provider_invoke_save_credentials(*args) -> "svn_boolean_t *":
     """svn_auth_provider_invoke_save_credentials(svn_auth_provider_t _obj, void * credentials, void * provider_baton, apr_hash_t parameters, char const * realmstring, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_provider_invoke_save_credentials(*args)
 
-def svn_auth_invoke_simple_provider_func(*args):
+def svn_auth_invoke_simple_provider_func(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_invoke_simple_provider_func(svn_auth_simple_provider_func_t _obj, apr_pool_t pool)"""
     return _core.svn_auth_invoke_simple_provider_func(*args)
 
-def svn_auth_invoke_ssl_client_cert_pw_provider_func(*args):
+def svn_auth_invoke_ssl_client_cert_pw_provider_func(*args) -> "svn_auth_provider_object_t **":
     """svn_auth_invoke_ssl_client_cert_pw_provider_func(svn_auth_ssl_client_cert_pw_provider_func_t _obj, apr_pool_t pool)"""
     return _core.svn_auth_invoke_ssl_client_cert_pw_provider_func(*args)
 
-def svn_auth_invoke_simple_prompt_func(*args):
+def svn_auth_invoke_simple_prompt_func(*args) -> "svn_auth_cred_simple_t **":
     """svn_auth_invoke_simple_prompt_func(svn_auth_simple_prompt_func_t _obj, void * baton, char const * realm, char const * username, svn_boolean_t may_save, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_invoke_simple_prompt_func(*args)
 
-def svn_auth_invoke_username_prompt_func(*args):
+def svn_auth_invoke_username_prompt_func(*args) -> "svn_auth_cred_username_t **":
     """svn_auth_invoke_username_prompt_func(svn_auth_username_prompt_func_t _obj, void * baton, char const * realm, svn_boolean_t may_save, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_invoke_username_prompt_func(*args)
 
-def svn_auth_invoke_ssl_server_trust_prompt_func(*args):
+def svn_auth_invoke_ssl_server_trust_prompt_func(*args) -> "svn_auth_cred_ssl_server_trust_t **":
     """svn_auth_invoke_ssl_server_trust_prompt_func(svn_auth_ssl_server_trust_prompt_func_t _obj, void * baton, char const * realm, apr_uint32_t failures, svn_auth_ssl_server_cert_info_t cert_info, svn_boolean_t may_save, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_invoke_ssl_server_trust_prompt_func(*args)
 
-def svn_auth_invoke_ssl_client_cert_prompt_func(*args):
+def svn_auth_invoke_ssl_client_cert_prompt_func(*args) -> "svn_auth_cred_ssl_client_cert_t **":
     """svn_auth_invoke_ssl_client_cert_prompt_func(svn_auth_ssl_client_cert_prompt_func_t _obj, void * baton, char const * realm, svn_boolean_t may_save, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_invoke_ssl_client_cert_prompt_func(*args)
 
-def svn_auth_invoke_ssl_client_cert_pw_prompt_func(*args):
+def svn_auth_invoke_ssl_client_cert_pw_prompt_func(*args) -> "svn_auth_cred_ssl_client_cert_pw_t **":
     """svn_auth_invoke_ssl_client_cert_pw_prompt_func(svn_auth_ssl_client_cert_pw_prompt_func_t _obj, void * baton, char const * realm, svn_boolean_t may_save, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_invoke_ssl_client_cert_pw_prompt_func(*args)
 
-def svn_auth_invoke_plaintext_prompt_func(*args):
+def svn_auth_invoke_plaintext_prompt_func(*args) -> "svn_boolean_t *":
     """svn_auth_invoke_plaintext_prompt_func(svn_auth_plaintext_prompt_func_t _obj, char const * realmstring, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_invoke_plaintext_prompt_func(*args)
 
-def svn_auth_invoke_plaintext_passphrase_prompt_func(*args):
+def svn_auth_invoke_plaintext_passphrase_prompt_func(*args) -> "svn_boolean_t *":
     """svn_auth_invoke_plaintext_passphrase_prompt_func(svn_auth_plaintext_passphrase_prompt_func_t _obj, char const * realmstring, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_auth_invoke_plaintext_passphrase_prompt_func(*args)
-class svn_auth_simple_provider_func_t:
+class svn_auth_simple_provider_func_t(object):
     """Proxy of C svn_auth_simple_provider_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_simple_provider_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_simple_provider_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3823,23 +4932,57 @@ class svn_auth_simple_provider_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3849,7 +4992,7 @@ class svn_auth_simple_provider_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3858,13 +5001,10 @@ class svn_auth_simple_provider_func_t:
 svn_auth_simple_provider_func_t_swigregister = _core.svn_auth_simple_provider_func_t_swigregister
 svn_auth_simple_provider_func_t_swigregister(svn_auth_simple_provider_func_t)
 
-class svn_auth_ssl_client_cert_pw_provider_func_t:
+class svn_auth_ssl_client_cert_pw_provider_func_t(object):
     """Proxy of C svn_auth_ssl_client_cert_pw_provider_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_ssl_client_cert_pw_provider_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_ssl_client_cert_pw_provider_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3883,23 +5023,57 @@ class svn_auth_ssl_client_cert_pw_provider_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3909,7 +5083,7 @@ class svn_auth_ssl_client_cert_pw_provider_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3918,13 +5092,10 @@ class svn_auth_ssl_client_cert_pw_provider_func_t:
 svn_auth_ssl_client_cert_pw_provider_func_t_swigregister = _core.svn_auth_ssl_client_cert_pw_provider_func_t_swigregister
 svn_auth_ssl_client_cert_pw_provider_func_t_swigregister(svn_auth_ssl_client_cert_pw_provider_func_t)
 
-class svn_auth_simple_prompt_func_t:
+class svn_auth_simple_prompt_func_t(object):
     """Proxy of C svn_auth_simple_prompt_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_simple_prompt_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_simple_prompt_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3943,23 +5114,57 @@ class svn_auth_simple_prompt_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3969,7 +5174,7 @@ class svn_auth_simple_prompt_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3978,13 +5183,10 @@ class svn_auth_simple_prompt_func_t:
 svn_auth_simple_prompt_func_t_swigregister = _core.svn_auth_simple_prompt_func_t_swigregister
 svn_auth_simple_prompt_func_t_swigregister(svn_auth_simple_prompt_func_t)
 
-class svn_auth_username_prompt_func_t:
+class svn_auth_username_prompt_func_t(object):
     """Proxy of C svn_auth_username_prompt_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_username_prompt_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_username_prompt_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4003,23 +5205,57 @@ class svn_auth_username_prompt_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4029,7 +5265,7 @@ class svn_auth_username_prompt_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4038,13 +5274,10 @@ class svn_auth_username_prompt_func_t:
 svn_auth_username_prompt_func_t_swigregister = _core.svn_auth_username_prompt_func_t_swigregister
 svn_auth_username_prompt_func_t_swigregister(svn_auth_username_prompt_func_t)
 
-class svn_auth_ssl_server_trust_prompt_func_t:
+class svn_auth_ssl_server_trust_prompt_func_t(object):
     """Proxy of C svn_auth_ssl_server_trust_prompt_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_ssl_server_trust_prompt_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_ssl_server_trust_prompt_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4063,23 +5296,57 @@ class svn_auth_ssl_server_trust_prompt_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4089,7 +5356,7 @@ class svn_auth_ssl_server_trust_prompt_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4098,13 +5365,10 @@ class svn_auth_ssl_server_trust_prompt_func_t:
 svn_auth_ssl_server_trust_prompt_func_t_swigregister = _core.svn_auth_ssl_server_trust_prompt_func_t_swigregister
 svn_auth_ssl_server_trust_prompt_func_t_swigregister(svn_auth_ssl_server_trust_prompt_func_t)
 
-class svn_auth_ssl_client_cert_prompt_func_t:
+class svn_auth_ssl_client_cert_prompt_func_t(object):
     """Proxy of C svn_auth_ssl_client_cert_prompt_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_ssl_client_cert_prompt_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_ssl_client_cert_prompt_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4123,23 +5387,57 @@ class svn_auth_ssl_client_cert_prompt_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4149,7 +5447,7 @@ class svn_auth_ssl_client_cert_prompt_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4158,13 +5456,10 @@ class svn_auth_ssl_client_cert_prompt_func_t:
 svn_auth_ssl_client_cert_prompt_func_t_swigregister = _core.svn_auth_ssl_client_cert_prompt_func_t_swigregister
 svn_auth_ssl_client_cert_prompt_func_t_swigregister(svn_auth_ssl_client_cert_prompt_func_t)
 
-class svn_auth_ssl_client_cert_pw_prompt_func_t:
+class svn_auth_ssl_client_cert_pw_prompt_func_t(object):
     """Proxy of C svn_auth_ssl_client_cert_pw_prompt_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_ssl_client_cert_pw_prompt_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_ssl_client_cert_pw_prompt_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4183,23 +5478,57 @@ class svn_auth_ssl_client_cert_pw_prompt_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4209,7 +5538,7 @@ class svn_auth_ssl_client_cert_pw_prompt_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4218,13 +5547,10 @@ class svn_auth_ssl_client_cert_pw_prompt_func_t:
 svn_auth_ssl_client_cert_pw_prompt_func_t_swigregister = _core.svn_auth_ssl_client_cert_pw_prompt_func_t_swigregister
 svn_auth_ssl_client_cert_pw_prompt_func_t_swigregister(svn_auth_ssl_client_cert_pw_prompt_func_t)
 
-class svn_auth_plaintext_prompt_func_t:
+class svn_auth_plaintext_prompt_func_t(object):
     """Proxy of C svn_auth_plaintext_prompt_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_plaintext_prompt_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_plaintext_prompt_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4243,23 +5569,57 @@ class svn_auth_plaintext_prompt_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4269,7 +5629,7 @@ class svn_auth_plaintext_prompt_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4278,13 +5638,10 @@ class svn_auth_plaintext_prompt_func_t:
 svn_auth_plaintext_prompt_func_t_swigregister = _core.svn_auth_plaintext_prompt_func_t_swigregister
 svn_auth_plaintext_prompt_func_t_swigregister(svn_auth_plaintext_prompt_func_t)
 
-class svn_auth_plaintext_passphrase_prompt_func_t:
+class svn_auth_plaintext_passphrase_prompt_func_t(object):
     """Proxy of C svn_auth_plaintext_passphrase_prompt_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_plaintext_passphrase_prompt_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_plaintext_passphrase_prompt_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4303,23 +5660,57 @@ class svn_auth_plaintext_passphrase_prompt_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4329,7 +5720,7 @@ class svn_auth_plaintext_passphrase_prompt_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4338,13 +5729,10 @@ class svn_auth_plaintext_passphrase_prompt_func_t:
 svn_auth_plaintext_passphrase_prompt_func_t_swigregister = _core.svn_auth_plaintext_passphrase_prompt_func_t_swigregister
 svn_auth_plaintext_passphrase_prompt_func_t_swigregister(svn_auth_plaintext_passphrase_prompt_func_t)
 
-class svn_auth_gnome_keyring_unlock_prompt_func_t:
+class svn_auth_gnome_keyring_unlock_prompt_func_t(object):
     """Proxy of C svn_auth_gnome_keyring_unlock_prompt_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_auth_gnome_keyring_unlock_prompt_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_auth_gnome_keyring_unlock_prompt_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4363,23 +5751,57 @@ class svn_auth_gnome_keyring_unlock_prompt_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4389,7 +5811,7 @@ class svn_auth_gnome_keyring_unlock_prompt_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4486,107 +5908,107 @@ SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP = _core.SVN_CONFIG_DEFAULT_OP
 SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT = _core.SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT
 SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS = _core.SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS
 
-def svn_config_get_config(*args):
+def svn_config_get_config(*args) -> "apr_hash_t **":
     """svn_config_get_config(char const * config_dir, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_config_get_config(*args)
 
-def svn_config_create2(*args):
+def svn_config_create2(*args) -> "svn_config_t **":
     """svn_config_create2(svn_boolean_t section_names_case_sensitive, svn_boolean_t option_names_case_sensitive, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_config_create2(*args)
 
-def svn_config_create(*args):
+def svn_config_create(*args) -> "svn_config_t **":
     """svn_config_create(svn_boolean_t section_names_case_sensitive, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_config_create(*args)
 
-def svn_config_read3(*args):
+def svn_config_read3(*args) -> "svn_config_t **":
     """svn_config_read3(char const * file, svn_boolean_t must_exist, svn_boolean_t section_names_case_sensitive, svn_boolean_t option_names_case_sensitive, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_config_read3(*args)
 
-def svn_config_read2(*args):
+def svn_config_read2(*args) -> "svn_config_t **":
     """svn_config_read2(char const * file, svn_boolean_t must_exist, svn_boolean_t section_names_case_sensitive, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_config_read2(*args)
 
-def svn_config_read(*args):
+def svn_config_read(*args) -> "svn_config_t **":
     """svn_config_read(char const * file, svn_boolean_t must_exist, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_config_read(*args)
 
-def svn_config_parse(*args):
+def svn_config_parse(*args) -> "svn_config_t **":
     """svn_config_parse(svn_stream_t * stream, svn_boolean_t section_names_case_sensitive, svn_boolean_t option_names_case_sensitive, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_config_parse(*args)
 
-def svn_config_merge(cfg, file, must_exist):
+def svn_config_merge(cfg: 'svn_config_t *', file: 'char const *', must_exist: 'svn_boolean_t') -> "svn_error_t *":
     """svn_config_merge(svn_config_t * cfg, char const * file, svn_boolean_t must_exist) -> svn_error_t"""
     return _core.svn_config_merge(cfg, file, must_exist)
 
-def svn_config_get(cfg, section, option, default_value):
+def svn_config_get(cfg: 'svn_config_t *', section: 'char const *', option: 'char const *', default_value: 'char const *') -> "char const **":
     """svn_config_get(svn_config_t * cfg, char const * section, char const * option, char const * default_value)"""
     return _core.svn_config_get(cfg, section, option, default_value)
 
-def svn_config_set(cfg, section, option, value):
+def svn_config_set(cfg: 'svn_config_t *', section: 'char const *', option: 'char const *', value: 'char const *') -> "void":
     """svn_config_set(svn_config_t * cfg, char const * section, char const * option, char const * value)"""
     return _core.svn_config_set(cfg, section, option, value)
 
-def svn_config_get_bool(cfg, section, option, default_value):
+def svn_config_get_bool(cfg: 'svn_config_t *', section: 'char const *', option: 'char const *', default_value: 'svn_boolean_t') -> "svn_boolean_t *":
     """svn_config_get_bool(svn_config_t * cfg, char const * section, char const * option, svn_boolean_t default_value) -> svn_error_t"""
     return _core.svn_config_get_bool(cfg, section, option, default_value)
 
-def svn_config_set_bool(cfg, section, option, value):
+def svn_config_set_bool(cfg: 'svn_config_t *', section: 'char const *', option: 'char const *', value: 'svn_boolean_t') -> "void":
     """svn_config_set_bool(svn_config_t * cfg, char const * section, char const * option, svn_boolean_t value)"""
     return _core.svn_config_set_bool(cfg, section, option, value)
 
-def svn_config_get_int64(cfg, section, option, default_value):
+def svn_config_get_int64(cfg: 'svn_config_t *', section: 'char const *', option: 'char const *', default_value: 'apr_int64_t') -> "apr_int64_t *":
     """svn_config_get_int64(svn_config_t * cfg, char const * section, char const * option, apr_int64_t default_value) -> svn_error_t"""
     return _core.svn_config_get_int64(cfg, section, option, default_value)
 
-def svn_config_set_int64(cfg, section, option, value):
+def svn_config_set_int64(cfg: 'svn_config_t *', section: 'char const *', option: 'char const *', value: 'apr_int64_t') -> "void":
     """svn_config_set_int64(svn_config_t * cfg, char const * section, char const * option, apr_int64_t value)"""
     return _core.svn_config_set_int64(cfg, section, option, value)
 
-def svn_config_get_yes_no_ask(cfg, section, option, default_value):
+def svn_config_get_yes_no_ask(cfg: 'svn_config_t *', section: 'char const *', option: 'char const *', default_value: 'char const *') -> "char const **":
     """svn_config_get_yes_no_ask(svn_config_t * cfg, char const * section, char const * option, char const * default_value) -> svn_error_t"""
     return _core.svn_config_get_yes_no_ask(cfg, section, option, default_value)
 
-def svn_config_get_tristate(cfg, valuep, section, option, unknown_value, default_value):
+def svn_config_get_tristate(cfg: 'svn_config_t *', valuep: 'svn_tristate_t *', section: 'char const *', option: 'char const *', unknown_value: 'char const *', default_value: 'svn_tristate_t') -> "svn_error_t *":
     """svn_config_get_tristate(svn_config_t * cfg, svn_tristate_t * valuep, char const * section, char const * option, char const * unknown_value, svn_tristate_t default_value) -> svn_error_t"""
     return _core.svn_config_get_tristate(cfg, valuep, section, option, unknown_value, default_value)
 
-def svn_config_enumerate_sections(cfg, callback, baton):
+def svn_config_enumerate_sections(cfg: 'svn_config_t *', callback: 'svn_config_section_enumerator_t', baton: 'void *') -> "int":
     """svn_config_enumerate_sections(svn_config_t * cfg, svn_config_section_enumerator_t callback, void * baton) -> int"""
     return _core.svn_config_enumerate_sections(cfg, callback, baton)
 
-def svn_config_enumerate_sections2(*args):
+def svn_config_enumerate_sections2(*args) -> "int":
     """svn_config_enumerate_sections2(svn_config_t * cfg, svn_config_section_enumerator2_t callback, apr_pool_t pool) -> int"""
     return _core.svn_config_enumerate_sections2(*args)
 
-def svn_config_enumerate(cfg, section, callback, baton):
+def svn_config_enumerate(cfg: 'svn_config_t *', section: 'char const *', callback: 'svn_config_enumerator_t', baton: 'void *') -> "int":
     """svn_config_enumerate(svn_config_t * cfg, char const * section, svn_config_enumerator_t callback, void * baton) -> int"""
     return _core.svn_config_enumerate(cfg, section, callback, baton)
 
-def svn_config_enumerate2(*args):
+def svn_config_enumerate2(*args) -> "int":
     """svn_config_enumerate2(svn_config_t * cfg, char const * section, svn_config_enumerator2_t callback, apr_pool_t pool) -> int"""
     return _core.svn_config_enumerate2(*args)
 
-def svn_config_has_section(cfg, section):
+def svn_config_has_section(cfg: 'svn_config_t *', section: 'char const *') -> "svn_boolean_t":
     """svn_config_has_section(svn_config_t * cfg, char const * section) -> svn_boolean_t"""
     return _core.svn_config_has_section(cfg, section)
 
-def svn_config_find_group(*args):
+def svn_config_find_group(*args) -> "char const *":
     """svn_config_find_group(svn_config_t * cfg, char const * key, char const * master_section, apr_pool_t pool) -> char const *"""
     return _core.svn_config_find_group(*args)
 
-def svn_config_get_server_setting(cfg, server_group, option_name, default_value):
+def svn_config_get_server_setting(cfg: 'svn_config_t *', server_group: 'char const *', option_name: 'char const *', default_value: 'char const *') -> "char const *":
     """svn_config_get_server_setting(svn_config_t * cfg, char const * server_group, char const * option_name, char const * default_value) -> char const *"""
     return _core.svn_config_get_server_setting(cfg, server_group, option_name, default_value)
 
-def svn_config_get_server_setting_int(*args):
+def svn_config_get_server_setting_int(*args) -> "apr_int64_t *":
     """svn_config_get_server_setting_int(svn_config_t * cfg, char const * server_group, char const * option_name, apr_int64_t default_value, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_config_get_server_setting_int(*args)
 
-def svn_config_get_server_setting_bool(cfg, server_group, option_name, default_value):
+def svn_config_get_server_setting_bool(cfg: 'svn_config_t *', server_group: 'char const *', option_name: 'char const *', default_value: 'svn_boolean_t') -> "svn_boolean_t *":
     """svn_config_get_server_setting_bool(svn_config_t * cfg, char const * server_group, char const * option_name, svn_boolean_t default_value) -> svn_error_t"""
     return _core.svn_config_get_server_setting_bool(cfg, server_group, option_name, default_value)
 
-def svn_config_ensure(*args):
+def svn_config_ensure(*args) -> "svn_error_t *":
     """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
@@ -4597,36 +6019,33 @@ 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):
+def svn_config_read_auth_data(*args) -> "apr_hash_t **":
     """svn_config_read_auth_data(char const * cred_kind, char const * realmstring, char const * config_dir, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_config_read_auth_data(*args)
 
-def svn_config_write_auth_data(*args):
+def svn_config_write_auth_data(*args) -> "svn_error_t *":
     """svn_config_write_auth_data(apr_hash_t hash, char const * cred_kind, char const * realmstring, char const * config_dir, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_config_write_auth_data(*args)
 
-def svn_config_walk_auth_data(*args):
+def svn_config_walk_auth_data(*args) -> "svn_error_t *":
     """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"""
     return _core.svn_config_walk_auth_data(*args)
 
-def svn_config_get_user_config_path(*args):
+def svn_config_get_user_config_path(*args) -> "char const **":
     """svn_config_get_user_config_path(char const * config_dir, char const * fname, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_config_get_user_config_path(*args)
 
-def svn_config_dup(*args):
+def svn_config_dup(*args) -> "svn_config_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):
+def svn_config_copy_config(*args) -> "apr_hash_t **":
     """svn_config_copy_config(apr_hash_t src_hash, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_config_copy_config(*args)
-class svn_config_t:
+class svn_config_t(object):
     """Proxy of C svn_config_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_config_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_config_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4645,23 +6064,57 @@ class svn_config_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4671,38 +6124,35 @@ class svn_config_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_config_t_swigregister = _core.svn_config_t_swigregister
 svn_config_t_swigregister(svn_config_t)
 
 
-def svn_config_invoke_section_enumerator(_obj, name, baton):
+def svn_config_invoke_section_enumerator(_obj: 'svn_config_section_enumerator_t', name: 'char const *', baton: 'void *') -> "svn_boolean_t":
     """svn_config_invoke_section_enumerator(svn_config_section_enumerator_t _obj, char const * name, void * baton) -> svn_boolean_t"""
     return _core.svn_config_invoke_section_enumerator(_obj, name, baton)
 
-def svn_config_invoke_section_enumerator2(*args):
+def svn_config_invoke_section_enumerator2(*args) -> "svn_boolean_t":
     """svn_config_invoke_section_enumerator2(svn_config_section_enumerator2_t _obj, char const * name, void * baton, apr_pool_t pool) -> svn_boolean_t"""
     return _core.svn_config_invoke_section_enumerator2(*args)
 
-def svn_config_invoke_enumerator(_obj, name, value, baton):
+def svn_config_invoke_enumerator(_obj: 'svn_config_enumerator_t', name: 'char const *', value: 'char const *', baton: 'void *') -> "svn_boolean_t":
     """svn_config_invoke_enumerator(svn_config_enumerator_t _obj, char const * name, char const * value, void * baton) -> svn_boolean_t"""
     return _core.svn_config_invoke_enumerator(_obj, name, value, baton)
 
-def svn_config_invoke_enumerator2(*args):
+def svn_config_invoke_enumerator2(*args) -> "svn_boolean_t":
     """svn_config_invoke_enumerator2(svn_config_enumerator2_t _obj, char const * name, char const * value, void * baton, apr_pool_t pool) -> svn_boolean_t"""
     return _core.svn_config_invoke_enumerator2(*args)
 
-def svn_config_invoke_auth_walk_func(*args):
+def svn_config_invoke_auth_walk_func(*args) -> "svn_boolean_t *":
     """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)
-class svn_config_section_enumerator_t:
+class svn_config_section_enumerator_t(object):
     """Proxy of C svn_config_section_enumerator_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_config_section_enumerator_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_config_section_enumerator_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4721,23 +6171,57 @@ class svn_config_section_enumerator_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4747,7 +6231,7 @@ class svn_config_section_enumerator_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4756,13 +6240,10 @@ class svn_config_section_enumerator_t:
 svn_config_section_enumerator_t_swigregister = _core.svn_config_section_enumerator_t_swigregister
 svn_config_section_enumerator_t_swigregister(svn_config_section_enumerator_t)
 
-class svn_config_section_enumerator2_t:
+class svn_config_section_enumerator2_t(object):
     """Proxy of C svn_config_section_enumerator2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_config_section_enumerator2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_config_section_enumerator2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4781,23 +6262,57 @@ class svn_config_section_enumerator2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4807,7 +6322,7 @@ class svn_config_section_enumerator2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4816,13 +6331,10 @@ class svn_config_section_enumerator2_t:
 svn_config_section_enumerator2_t_swigregister = _core.svn_config_section_enumerator2_t_swigregister
 svn_config_section_enumerator2_t_swigregister(svn_config_section_enumerator2_t)
 
-class svn_config_enumerator_t:
+class svn_config_enumerator_t(object):
     """Proxy of C svn_config_enumerator_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_config_enumerator_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_config_enumerator_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4841,23 +6353,57 @@ class svn_config_enumerator_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4867,7 +6413,7 @@ class svn_config_enumerator_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4876,13 +6422,10 @@ class svn_config_enumerator_t:
 svn_config_enumerator_t_swigregister = _core.svn_config_enumerator_t_swigregister
 svn_config_enumerator_t_swigregister(svn_config_enumerator_t)
 
-class svn_config_enumerator2_t:
+class svn_config_enumerator2_t(object):
     """Proxy of C svn_config_enumerator2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_config_enumerator2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_config_enumerator2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4901,23 +6444,57 @@ class svn_config_enumerator2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4927,7 +6504,7 @@ class svn_config_enumerator2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4936,13 +6513,10 @@ class svn_config_enumerator2_t:
 svn_config_enumerator2_t_swigregister = _core.svn_config_enumerator2_t_swigregister
 svn_config_enumerator2_t_swigregister(svn_config_enumerator2_t)
 
-class svn_config_auth_walk_func_t:
+class svn_config_auth_walk_func_t(object):
     """Proxy of C svn_config_auth_walk_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_config_auth_walk_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_config_auth_walk_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4961,23 +6535,57 @@ class svn_config_auth_walk_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4987,7 +6595,7 @@ class svn_config_auth_walk_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4997,408 +6605,401 @@ svn_config_auth_walk_func_t_swigregister = _core.svn_config_auth_walk_func_t_swi
 svn_config_auth_walk_func_t_swigregister(svn_config_auth_walk_func_t)
 
 
-def svn_utf_initialize2(*args):
+def svn_utf_initialize2(*args) -> "void":
     """svn_utf_initialize2(svn_boolean_t assume_native_utf8, apr_pool_t pool)"""
     return _core.svn_utf_initialize2(*args)
 
-def svn_utf_initialize(*args):
+def svn_utf_initialize(*args) -> "void":
     """svn_utf_initialize(apr_pool_t pool)"""
     return _core.svn_utf_initialize(*args)
 
-def svn_utf_stringbuf_to_utf8(*args):
+def svn_utf_stringbuf_to_utf8(*args) -> "svn_stringbuf_t **":
     """svn_utf_stringbuf_to_utf8(svn_stringbuf_t const * src, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_stringbuf_to_utf8(*args)
 
-def svn_utf_string_to_utf8(*args):
+def svn_utf_string_to_utf8(*args) -> "svn_string_t **":
     """svn_utf_string_to_utf8(svn_string_t const * src, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_string_to_utf8(*args)
 
-def svn_utf_cstring_to_utf8(*args):
+def svn_utf_cstring_to_utf8(*args) -> "char const **":
     """svn_utf_cstring_to_utf8(char const * src, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_cstring_to_utf8(*args)
 
-def svn_utf_cstring_to_utf8_ex2(*args):
+def svn_utf_cstring_to_utf8_ex2(*args) -> "char const **":
     """svn_utf_cstring_to_utf8_ex2(char const * src, char const * frompage, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_cstring_to_utf8_ex2(*args)
 
-def svn_utf_cstring_to_utf8_ex(*args):
+def svn_utf_cstring_to_utf8_ex(*args) -> "char const **":
     """svn_utf_cstring_to_utf8_ex(char const * src, char const * frompage, char const * convset_key, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_cstring_to_utf8_ex(*args)
 
-def svn_utf_stringbuf_from_utf8(*args):
+def svn_utf_stringbuf_from_utf8(*args) -> "svn_stringbuf_t **":
     """svn_utf_stringbuf_from_utf8(svn_stringbuf_t const * src, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_stringbuf_from_utf8(*args)
 
-def svn_utf_string_from_utf8(*args):
+def svn_utf_string_from_utf8(*args) -> "svn_string_t **":
     """svn_utf_string_from_utf8(svn_string_t const * src, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_string_from_utf8(*args)
 
-def svn_utf_cstring_from_utf8(*args):
+def svn_utf_cstring_from_utf8(*args) -> "char const **":
     """svn_utf_cstring_from_utf8(char const * src, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_cstring_from_utf8(*args)
 
-def svn_utf_cstring_from_utf8_ex2(*args):
+def svn_utf_cstring_from_utf8_ex2(*args) -> "char const **":
     """svn_utf_cstring_from_utf8_ex2(char const * src, char const * topage, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_cstring_from_utf8_ex2(*args)
 
-def svn_utf_cstring_from_utf8_ex(*args):
+def svn_utf_cstring_from_utf8_ex(*args) -> "char const **":
     """svn_utf_cstring_from_utf8_ex(char const * src, char const * topage, char const * convset_key, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_cstring_from_utf8_ex(*args)
 
-def svn_utf_cstring_from_utf8_fuzzy(*args):
+def svn_utf_cstring_from_utf8_fuzzy(*args) -> "char const *":
     """svn_utf_cstring_from_utf8_fuzzy(char const * src, apr_pool_t pool) -> char const *"""
     return _core.svn_utf_cstring_from_utf8_fuzzy(*args)
 
-def svn_utf_cstring_from_utf8_stringbuf(*args):
+def svn_utf_cstring_from_utf8_stringbuf(*args) -> "char const **":
     """svn_utf_cstring_from_utf8_stringbuf(svn_stringbuf_t const * src, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_cstring_from_utf8_stringbuf(*args)
 
-def svn_utf_cstring_from_utf8_string(*args):
+def svn_utf_cstring_from_utf8_string(*args) -> "char const **":
     """svn_utf_cstring_from_utf8_string(svn_string_t const * src, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_utf_cstring_from_utf8_string(*args)
 
-def svn_utf_cstring_utf8_width(cstr):
+def svn_utf_cstring_utf8_width(cstr: 'char const *') -> "int":
     """svn_utf_cstring_utf8_width(char const * cstr) -> int"""
     return _core.svn_utf_cstring_utf8_width(cstr)
 
-def svn_nls_init():
+def svn_nls_init() -> "svn_error_t *":
     """svn_nls_init() -> svn_error_t"""
     return _core.svn_nls_init()
 
-def svn_path_internal_style(*args):
+def svn_path_internal_style(*args) -> "char const *":
     """svn_path_internal_style(char const * path, apr_pool_t pool) -> char const *"""
     return _core.svn_path_internal_style(*args)
 
-def svn_path_local_style(*args):
+def svn_path_local_style(*args) -> "char const *":
     """svn_path_local_style(char const * path, apr_pool_t pool) -> char const *"""
     return _core.svn_path_local_style(*args)
 
-def svn_path_splitext(*args):
+def svn_path_splitext(*args) -> "char const **, char const **":
     """svn_path_splitext(char const * path, apr_pool_t pool)"""
     return _core.svn_path_splitext(*args)
 
-def svn_path_is_empty(path):
+def svn_path_is_empty(path: 'char const *') -> "int":
     """svn_path_is_empty(char const * path) -> int"""
     return _core.svn_path_is_empty(path)
 
-def svn_dirent_is_root(dirent, len):
+def svn_dirent_is_root(dirent: 'char const *', len: 'apr_size_t') -> "svn_boolean_t":
     """svn_dirent_is_root(char const * dirent, apr_size_t len) -> svn_boolean_t"""
     return _core.svn_dirent_is_root(dirent, len)
 
-def svn_path_canonicalize(*args):
+def svn_path_canonicalize(*args) -> "char const *":
     """svn_path_canonicalize(char const * path, apr_pool_t pool) -> char const *"""
     return _core.svn_path_canonicalize(*args)
 
-def svn_path_is_canonical(*args):
+def svn_path_is_canonical(*args) -> "svn_boolean_t":
     """svn_path_is_canonical(char const * path, apr_pool_t pool) -> svn_boolean_t"""
     return _core.svn_path_is_canonical(*args)
 
-def svn_path_compare_paths(path1, path2):
+def svn_path_compare_paths(path1: 'char const *', path2: 'char const *') -> "int":
     """svn_path_compare_paths(char const * path1, char const * path2) -> int"""
     return _core.svn_path_compare_paths(path1, path2)
 
-def svn_path_get_longest_ancestor(*args):
+def svn_path_get_longest_ancestor(*args) -> "char *":
     """svn_path_get_longest_ancestor(char const * path1, char const * path2, apr_pool_t pool) -> char *"""
     return _core.svn_path_get_longest_ancestor(*args)
 
-def svn_path_is_dotpath_present(path):
+def svn_path_is_dotpath_present(path: 'char const *') -> "svn_boolean_t":
     """svn_path_is_dotpath_present(char const * path) -> svn_boolean_t"""
     return _core.svn_path_is_dotpath_present(path)
 
-def svn_path_is_url(path):
+def svn_path_is_url(path: 'char const *') -> "svn_boolean_t":
     """svn_path_is_url(char const * path) -> svn_boolean_t"""
     return _core.svn_path_is_url(path)
 
-def svn_path_is_uri_safe(path):
+def svn_path_is_uri_safe(path: 'char const *') -> "svn_boolean_t":
     """svn_path_is_uri_safe(char const * path) -> svn_boolean_t"""
     return _core.svn_path_is_uri_safe(path)
 
-def svn_path_url_add_component2(*args):
+def svn_path_url_add_component2(*args) -> "char const *":
     """svn_path_url_add_component2(char const * url, char const * component, apr_pool_t pool) -> char const *"""
     return _core.svn_path_url_add_component2(*args)
 
-def svn_path_is_repos_relative_url(path):
+def svn_path_is_repos_relative_url(path: 'char const *') -> "svn_boolean_t":
     """svn_path_is_repos_relative_url(char const * path) -> svn_boolean_t"""
     return _core.svn_path_is_repos_relative_url(path)
 
-def svn_path_resolve_repos_relative_url(*args):
+def svn_path_resolve_repos_relative_url(*args) -> "char const **":
     """svn_path_resolve_repos_relative_url(char const * relative_url, char const * repos_root_url, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_path_resolve_repos_relative_url(*args)
 
-def svn_path_illegal_path_escape(*args):
+def svn_path_illegal_path_escape(*args) -> "char const *":
     """svn_path_illegal_path_escape(char const * path, apr_pool_t pool) -> char const *"""
     return _core.svn_path_illegal_path_escape(*args)
 
-def svn_dirent_internal_style(*args):
+def svn_dirent_internal_style(*args) -> "char const *":
     """svn_dirent_internal_style(char const * dirent, apr_pool_t result_pool) -> char const *"""
     return _core.svn_dirent_internal_style(*args)
 
-def svn_dirent_internal_style_safe(*args):
+def svn_dirent_internal_style_safe(*args) -> "char const **, char const **":
     """svn_dirent_internal_style_safe(char const * dirent, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_dirent_internal_style_safe(*args)
 
-def svn_dirent_local_style(*args):
+def svn_dirent_local_style(*args) -> "char const *":
     """svn_dirent_local_style(char const * dirent, apr_pool_t result_pool) -> char const *"""
     return _core.svn_dirent_local_style(*args)
 
-def svn_dirent_join(*args):
+def svn_dirent_join(*args) -> "char *":
     """svn_dirent_join(char const * base, char const * component, apr_pool_t result_pool) -> char *"""
     return _core.svn_dirent_join(*args)
 
-def svn_relpath_join(*args):
+def svn_relpath_join(*args) -> "char *":
     """svn_relpath_join(char const * base, char const * component, apr_pool_t result_pool) -> char *"""
     return _core.svn_relpath_join(*args)
 
-def svn_dirent_basename(*args):
+def svn_dirent_basename(*args) -> "char const *":
     """svn_dirent_basename(char const * dirent, apr_pool_t result_pool) -> char const *"""
     return _core.svn_dirent_basename(*args)
 
-def svn_dirent_dirname(*args):
+def svn_dirent_dirname(*args) -> "char *":
     """svn_dirent_dirname(char const * dirent, apr_pool_t result_pool) -> char *"""
     return _core.svn_dirent_dirname(*args)
 
-def svn_dirent_split(*args):
+def svn_dirent_split(*args) -> "char const **, char const **":
     """svn_dirent_split(char const * dirent, apr_pool_t result_pool)"""
     return _core.svn_dirent_split(*args)
 
-def svn_relpath_split(*args):
+def svn_relpath_split(*args) -> "char const **, char const **":
     """svn_relpath_split(char const * relpath, apr_pool_t result_pool)"""
     return _core.svn_relpath_split(*args)
 
-def svn_relpath_basename(*args):
+def svn_relpath_basename(*args) -> "char const *":
     """svn_relpath_basename(char const * relpath, apr_pool_t result_pool) -> char const *"""
     return _core.svn_relpath_basename(*args)
 
-def svn_relpath_dirname(*args):
+def svn_relpath_dirname(*args) -> "char *":
     """svn_relpath_dirname(char const * relpath, apr_pool_t result_pool) -> char *"""
     return _core.svn_relpath_dirname(*args)
 
-def svn_relpath_prefix(*args):
+def svn_relpath_prefix(*args) -> "char const *":
     """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):
+def svn_uri_split(*args) -> "char const **, char const **":
     """svn_uri_split(char const * uri, apr_pool_t result_pool)"""
     return _core.svn_uri_split(*args)
 
-def svn_uri_basename(*args):
+def svn_uri_basename(*args) -> "char const *":
     """svn_uri_basename(char const * uri, apr_pool_t result_pool) -> char const *"""
     return _core.svn_uri_basename(*args)
 
-def svn_uri_dirname(*args):
+def svn_uri_dirname(*args) -> "char *":
     """svn_uri_dirname(char const * uri, apr_pool_t result_pool) -> char *"""
     return _core.svn_uri_dirname(*args)
 
-def svn_dirent_is_absolute(dirent):
+def svn_dirent_is_absolute(dirent: 'char const *') -> "svn_boolean_t":
     """svn_dirent_is_absolute(char const * dirent) -> svn_boolean_t"""
     return _core.svn_dirent_is_absolute(dirent)
 
-def svn_uri_is_root(uri, len):
+def svn_uri_is_root(uri: 'char const *', len: 'apr_size_t') -> "svn_boolean_t":
     """svn_uri_is_root(char const * uri, apr_size_t len) -> svn_boolean_t"""
     return _core.svn_uri_is_root(uri, len)
 
-def svn_dirent_canonicalize(*args):
+def svn_dirent_canonicalize(*args) -> "char const *":
     """svn_dirent_canonicalize(char const * dirent, apr_pool_t result_pool) -> char const *"""
     return _core.svn_dirent_canonicalize(*args)
 
-def svn_dirent_canonicalize_safe(*args):
+def svn_dirent_canonicalize_safe(*args) -> "char const **, char const **":
     """svn_dirent_canonicalize_safe(char const * dirent, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_dirent_canonicalize_safe(*args)
 
-def svn_relpath_canonicalize(*args):
+def svn_relpath_canonicalize(*args) -> "char const *":
     """svn_relpath_canonicalize(char const * relpath, apr_pool_t result_pool) -> char const *"""
     return _core.svn_relpath_canonicalize(*args)
 
-def svn_relpath_canonicalize_safe(*args):
+def svn_relpath_canonicalize_safe(*args) -> "char const **, char const **":
     """svn_relpath_canonicalize_safe(char const * relpath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_relpath_canonicalize_safe(*args)
 
-def svn_uri_canonicalize(*args):
+def svn_uri_canonicalize(*args) -> "char const *":
     """svn_uri_canonicalize(char const * uri, apr_pool_t result_pool) -> char const *"""
     return _core.svn_uri_canonicalize(*args)
 
-def svn_uri_canonicalize_safe(*args):
+def svn_uri_canonicalize_safe(*args) -> "char const **, char const **":
     """svn_uri_canonicalize_safe(char const * uri, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_uri_canonicalize_safe(*args)
 
-def svn_dirent_is_canonical(*args):
+def svn_dirent_is_canonical(*args) -> "svn_boolean_t":
     """svn_dirent_is_canonical(char const * dirent, apr_pool_t scratch_pool) -> svn_boolean_t"""
     return _core.svn_dirent_is_canonical(*args)
 
-def svn_relpath_is_canonical(relpath):
+def svn_relpath_is_canonical(relpath: 'char const *') -> "svn_boolean_t":
     """svn_relpath_is_canonical(char const * relpath) -> svn_boolean_t"""
     return _core.svn_relpath_is_canonical(relpath)
 
-def svn_uri_is_canonical(*args):
+def svn_uri_is_canonical(*args) -> "svn_boolean_t":
     """svn_uri_is_canonical(char const * uri, apr_pool_t scratch_pool) -> svn_boolean_t"""
     return _core.svn_uri_is_canonical(*args)
 
-def svn_dirent_get_longest_ancestor(*args):
+def svn_dirent_get_longest_ancestor(*args) -> "char *":
     """svn_dirent_get_longest_ancestor(char const * dirent1, char const * dirent2, apr_pool_t result_pool) -> char *"""
     return _core.svn_dirent_get_longest_ancestor(*args)
 
-def svn_relpath_get_longest_ancestor(*args):
+def svn_relpath_get_longest_ancestor(*args) -> "char *":
     """svn_relpath_get_longest_ancestor(char const * relpath1, char const * relpath2, apr_pool_t result_pool) -> char *"""
     return _core.svn_relpath_get_longest_ancestor(*args)
 
-def svn_uri_get_longest_ancestor(*args):
+def svn_uri_get_longest_ancestor(*args) -> "char *":
     """svn_uri_get_longest_ancestor(char const * uri1, char const * uri2, apr_pool_t result_pool) -> char *"""
     return _core.svn_uri_get_longest_ancestor(*args)
 
-def svn_dirent_get_absolute(*args):
+def svn_dirent_get_absolute(*args) -> "char const **":
     """svn_dirent_get_absolute(char const * relative, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_dirent_get_absolute(*args)
 
-def svn_dirent_is_child(*args):
+def svn_dirent_is_child(*args) -> "char const *":
     """svn_dirent_is_child(char const * parent_dirent, char const * child_dirent, apr_pool_t result_pool) -> char const *"""
     return _core.svn_dirent_is_child(*args)
 
-def svn_dirent_is_ancestor(parent_dirent, child_dirent):
+def svn_dirent_is_ancestor(parent_dirent: 'char const *', child_dirent: 'char const *') -> "svn_boolean_t":
     """svn_dirent_is_ancestor(char const * parent_dirent, char const * child_dirent) -> svn_boolean_t"""
     return _core.svn_dirent_is_ancestor(parent_dirent, child_dirent)
 
-def svn_uri__is_ancestor(parent_uri, child_uri):
+def svn_uri__is_ancestor(parent_uri: 'char const *', child_uri: 'char const *') -> "svn_boolean_t":
     """svn_uri__is_ancestor(char const * parent_uri, char const * child_uri) -> svn_boolean_t"""
     return _core.svn_uri__is_ancestor(parent_uri, child_uri)
 
-def svn_dirent_skip_ancestor(parent_dirent, child_dirent):
+def svn_dirent_skip_ancestor(parent_dirent: 'char const *', child_dirent: 'char const *') -> "char const *":
     """svn_dirent_skip_ancestor(char const * parent_dirent, char const * child_dirent) -> char const *"""
     return _core.svn_dirent_skip_ancestor(parent_dirent, child_dirent)
 
-def svn_relpath_skip_ancestor(parent_relpath, child_relpath):
+def svn_relpath_skip_ancestor(parent_relpath: 'char const *', child_relpath: 'char const *') -> "char const *":
     """svn_relpath_skip_ancestor(char const * parent_relpath, char const * child_relpath) -> char const *"""
     return _core.svn_relpath_skip_ancestor(parent_relpath, child_relpath)
 
-def svn_uri_skip_ancestor(*args):
+def svn_uri_skip_ancestor(*args) -> "char const *":
     """svn_uri_skip_ancestor(char const * parent_uri, char const * child_uri, apr_pool_t result_pool) -> char const *"""
     return _core.svn_uri_skip_ancestor(*args)
 
-def svn_uri_get_dirent_from_file_url(*args):
+def svn_uri_get_dirent_from_file_url(*args) -> "char const **":
     """svn_uri_get_dirent_from_file_url(char const * url, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_uri_get_dirent_from_file_url(*args)
 
-def svn_uri_get_file_url_from_dirent(*args):
+def svn_uri_get_file_url_from_dirent(*args) -> "char const **":
     """svn_uri_get_file_url_from_dirent(char const * dirent, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_uri_get_file_url_from_dirent(*args)
 SVN_MERGEINFO_NONINHERITABLE_STR = _core.SVN_MERGEINFO_NONINHERITABLE_STR
 
-def svn_mergeinfo_parse(*args):
+def svn_mergeinfo_parse(*args) -> "apr_hash_t **":
     """svn_mergeinfo_parse(char const * input, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_mergeinfo_parse(*args)
 
-def svn_mergeinfo_diff2(*args):
+def svn_mergeinfo_diff2(*args) -> "apr_hash_t **, apr_hash_t **":
     """svn_mergeinfo_diff2(apr_hash_t mergefrom, apr_hash_t mergeto, svn_boolean_t consider_inheritance, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_mergeinfo_diff2(*args)
 
-def svn_mergeinfo_diff(*args):
+def svn_mergeinfo_diff(*args) -> "apr_hash_t **, apr_hash_t **":
     """svn_mergeinfo_diff(apr_hash_t mergefrom, apr_hash_t mergeto, svn_boolean_t consider_inheritance, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_mergeinfo_diff(*args)
 
-def svn_mergeinfo_merge2(*args):
+def svn_mergeinfo_merge2(*args) -> "svn_error_t *":
     """svn_mergeinfo_merge2(apr_hash_t mergeinfo, apr_hash_t changes, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_mergeinfo_merge2(*args)
 
-def svn_mergeinfo_catalog_merge(*args):
+def svn_mergeinfo_catalog_merge(*args) -> "svn_error_t *":
     """svn_mergeinfo_catalog_merge(apr_hash_t mergeinfo_catalog, apr_hash_t changes_catalog, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_mergeinfo_catalog_merge(*args)
 
-def svn_mergeinfo_remove(*args):
+def svn_mergeinfo_remove(*args) -> "apr_hash_t **":
     """svn_mergeinfo_remove(apr_hash_t eraser, apr_hash_t whiteboard, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_mergeinfo_remove(*args)
 
-def svn_mergeinfo_remove2(*args):
+def svn_mergeinfo_remove2(*args) -> "apr_hash_t **":
     """svn_mergeinfo_remove2(apr_hash_t eraser, apr_hash_t whiteboard, svn_boolean_t consider_inheritance, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_mergeinfo_remove2(*args)
 
-def svn_rangelist_diff(*args):
+def svn_rangelist_diff(*args) -> "svn_rangelist_t **, svn_rangelist_t **":
     """svn_rangelist_diff(apr_array_header_t arg3, apr_array_header_t to, svn_boolean_t consider_inheritance, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_rangelist_diff(*args)
 
-def svn_rangelist_merge2(*args):
+def svn_rangelist_merge2(*args) -> "svn_error_t *":
     """svn_rangelist_merge2(apr_array_header_t rangelist, apr_array_header_t changes, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_rangelist_merge2(*args)
 
-def svn_rangelist_remove(*args):
+def svn_rangelist_remove(*args) -> "svn_rangelist_t **":
     """svn_rangelist_remove(apr_array_header_t eraser, apr_array_header_t whiteboard, svn_boolean_t consider_inheritance, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_rangelist_remove(*args)
 
-def svn_mergeinfo_intersect2(*args):
+def svn_mergeinfo_intersect2(*args) -> "apr_hash_t **":
     """svn_mergeinfo_intersect2(apr_hash_t mergeinfo1, apr_hash_t mergeinfo2, svn_boolean_t consider_inheritance, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_mergeinfo_intersect2(*args)
 
-def svn_mergeinfo_intersect(*args):
+def svn_mergeinfo_intersect(*args) -> "apr_hash_t **":
     """svn_mergeinfo_intersect(apr_hash_t mergeinfo1, apr_hash_t mergeinfo2, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_mergeinfo_intersect(*args)
 
-def svn_rangelist_intersect(*args):
+def svn_rangelist_intersect(*args) -> "svn_rangelist_t **":
     """svn_rangelist_intersect(apr_array_header_t rangelist1, apr_array_header_t rangelist2, svn_boolean_t consider_inheritance, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_rangelist_intersect(*args)
 
-def svn_rangelist_to_string(*args):
+def svn_rangelist_to_string(*args) -> "svn_string_t **":
     """svn_rangelist_to_string(apr_array_header_t rangelist, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_rangelist_to_string(*args)
 
-def svn_rangelist_inheritable2(*args):
+def svn_rangelist_inheritable2(*args) -> "svn_rangelist_t **":
     """svn_rangelist_inheritable2(apr_array_header_t rangelist, svn_revnum_t start, svn_revnum_t end, svn_boolean_t inheritable, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_rangelist_inheritable2(*args)
 
-def svn_rangelist_inheritable(*args):
+def svn_rangelist_inheritable(*args) -> "svn_rangelist_t **":
     """svn_rangelist_inheritable(apr_array_header_t rangelist, svn_revnum_t start, svn_revnum_t end, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_rangelist_inheritable(*args)
 
-def svn_mergeinfo_inheritable2(*args):
+def svn_mergeinfo_inheritable2(*args) -> "apr_hash_t **":
     """svn_mergeinfo_inheritable2(apr_hash_t mergeinfo, char const * path, svn_revnum_t start, svn_revnum_t end, svn_boolean_t inheritable, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_mergeinfo_inheritable2(*args)
 
-def svn_mergeinfo_inheritable(*args):
+def svn_mergeinfo_inheritable(*args) -> "apr_hash_t **":
     """svn_mergeinfo_inheritable(apr_hash_t mergeinfo, char const * path, svn_revnum_t start, svn_revnum_t end, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_mergeinfo_inheritable(*args)
 
-def svn_mergeinfo_to_string(*args):
+def svn_mergeinfo_to_string(*args) -> "svn_string_t **":
     """svn_mergeinfo_to_string(apr_hash_t mergeinput, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_mergeinfo_to_string(*args)
 
-def svn_mergeinfo_catalog_dup(*args):
+def svn_mergeinfo_catalog_dup(*args) -> "svn_mergeinfo_catalog_t":
     """svn_mergeinfo_catalog_dup(apr_hash_t mergeinfo_catalog, apr_pool_t pool) -> apr_hash_t"""
     return _core.svn_mergeinfo_catalog_dup(*args)
 
-def svn_mergeinfo_dup(*args):
+def svn_mergeinfo_dup(*args) -> "svn_mergeinfo_t":
     """svn_mergeinfo_dup(apr_hash_t mergeinfo, apr_pool_t pool) -> apr_hash_t"""
     return _core.svn_mergeinfo_dup(*args)
 
-def svn_rangelist_dup(*args):
+def svn_rangelist_dup(*args) -> "svn_rangelist_t *":
     """svn_rangelist_dup(apr_array_header_t rangelist, apr_pool_t pool) -> apr_array_header_t"""
     return _core.svn_rangelist_dup(*args)
 svn_mergeinfo_explicit = _core.svn_mergeinfo_explicit
 svn_mergeinfo_inherited = _core.svn_mergeinfo_inherited
 svn_mergeinfo_nearest_ancestor = _core.svn_mergeinfo_nearest_ancestor
 
-def svn_inheritance_to_word(inherit):
+def svn_inheritance_to_word(inherit: 'svn_mergeinfo_inheritance_t') -> "char const *":
     """svn_inheritance_to_word(svn_mergeinfo_inheritance_t inherit) -> char const *"""
     return _core.svn_inheritance_to_word(inherit)
 
-def svn_inheritance_from_word(word):
+def svn_inheritance_from_word(word: 'char const *') -> "svn_mergeinfo_inheritance_t":
     """svn_inheritance_from_word(char const * word) -> svn_mergeinfo_inheritance_t"""
     return _core.svn_inheritance_from_word(word)
 svn_io_file_del_none = _core.svn_io_file_del_none
 svn_io_file_del_on_close = _core.svn_io_file_del_on_close
 svn_io_file_del_on_pool_cleanup = _core.svn_io_file_del_on_pool_cleanup
-class svn_io_dirent2_t:
+class svn_io_dirent2_t(object):
     """Proxy of C svn_io_dirent2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_io_dirent2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_io_dirent2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["kind"] = _core.svn_io_dirent2_t_kind_set
-    __swig_getmethods__["kind"] = _core.svn_io_dirent2_t_kind_get
-    __swig_setmethods__["special"] = _core.svn_io_dirent2_t_special_set
-    __swig_getmethods__["special"] = _core.svn_io_dirent2_t_special_get
-    __swig_setmethods__["filesize"] = _core.svn_io_dirent2_t_filesize_set
-    __swig_getmethods__["filesize"] = _core.svn_io_dirent2_t_filesize_get
-    __swig_setmethods__["mtime"] = _core.svn_io_dirent2_t_mtime_set
-    __swig_getmethods__["mtime"] = _core.svn_io_dirent2_t_mtime_get
+    kind = _swig_property(_core.svn_io_dirent2_t_kind_get, _core.svn_io_dirent2_t_kind_set)
+    special = _swig_property(_core.svn_io_dirent2_t_special_get, _core.svn_io_dirent2_t_special_set)
+    filesize = _swig_property(_core.svn_io_dirent2_t_filesize_get, _core.svn_io_dirent2_t_filesize_set)
+    mtime = _swig_property(_core.svn_io_dirent2_t_mtime_get, _core.svn_io_dirent2_t_mtime_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -5413,23 +7014,57 @@ class svn_io_dirent2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -5439,7 +7074,7 @@ class svn_io_dirent2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -5455,25 +7090,20 @@ svn_io_dirent2_t_swigregister = _core.svn_io_dirent2_t_swigregister
 svn_io_dirent2_t_swigregister(svn_io_dirent2_t)
 
 
-def svn_io_dirent2_create(*args):
+def svn_io_dirent2_create(*args) -> "svn_io_dirent2_t *":
     """svn_io_dirent2_create(apr_pool_t result_pool) -> svn_io_dirent2_t"""
     return _core.svn_io_dirent2_create(*args)
 
-def svn_io_dirent2_dup(*args):
+def svn_io_dirent2_dup(*args) -> "svn_io_dirent2_t *":
     """svn_io_dirent2_dup(svn_io_dirent2_t item, apr_pool_t result_pool) -> svn_io_dirent2_t"""
     return _core.svn_io_dirent2_dup(*args)
-class svn_io_dirent_t:
+class svn_io_dirent_t(object):
     """Proxy of C svn_io_dirent_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_io_dirent_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_io_dirent_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["kind"] = _core.svn_io_dirent_t_kind_set
-    __swig_getmethods__["kind"] = _core.svn_io_dirent_t_kind_get
-    __swig_setmethods__["special"] = _core.svn_io_dirent_t_special_set
-    __swig_getmethods__["special"] = _core.svn_io_dirent_t_special_get
+    kind = _swig_property(_core.svn_io_dirent_t_kind_get, _core.svn_io_dirent_t_kind_set)
+    special = _swig_property(_core.svn_io_dirent_t_special_get, _core.svn_io_dirent_t_special_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -5488,23 +7118,57 @@ class svn_io_dirent_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -5514,7 +7178,7 @@ class svn_io_dirent_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -5530,396 +7194,393 @@ svn_io_dirent_t_swigregister = _core.svn_io_dirent_t_swigregister
 svn_io_dirent_t_swigregister(svn_io_dirent_t)
 
 
-def svn_io_open_uniquely_named(*args):
+def svn_io_open_uniquely_named(*args) -> "apr_file_t **, char const **":
     """svn_io_open_uniquely_named(char const * dirpath, char const * filename, char const * suffix, svn_io_file_del_t delete_when, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_open_uniquely_named(*args)
 
-def svn_io_open_unique_file3(*args):
+def svn_io_open_unique_file3(*args) -> "apr_file_t **, char const **":
     """svn_io_open_unique_file3(char const * dirpath, svn_io_file_del_t delete_when, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_open_unique_file3(*args)
 
-def svn_io_open_unique_file2(*args):
+def svn_io_open_unique_file2(*args) -> "apr_file_t **, char const **":
     """svn_io_open_unique_file2(char const * path, char const * suffix, svn_io_file_del_t delete_when, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_open_unique_file2(*args)
 
-def svn_io_open_unique_file(*args):
+def svn_io_open_unique_file(*args) -> "apr_file_t **, char const **":
     """svn_io_open_unique_file(char const * path, char const * suffix, svn_boolean_t delete_on_close, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_open_unique_file(*args)
 
-def svn_io_copy_perms(*args):
+def svn_io_copy_perms(*args) -> "svn_error_t *":
     """svn_io_copy_perms(char const * src, char const * dst, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_copy_perms(*args)
 
-def svn_io_sleep_for_timestamps(*args):
+def svn_io_sleep_for_timestamps(*args) -> "void":
     """svn_io_sleep_for_timestamps(char const * path, apr_pool_t pool)"""
     return _core.svn_io_sleep_for_timestamps(*args)
 
-def svn_io_filesizes_three_different_p(*args):
+def svn_io_filesizes_three_different_p(*args) -> "svn_boolean_t *, svn_boolean_t *, svn_boolean_t *":
     """svn_io_filesizes_three_different_p(char const * file1, char const * file2, char const * file3, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_filesizes_three_different_p(*args)
 
-def svn_io_file_checksum2(*args):
+def svn_io_file_checksum2(*args) -> "svn_checksum_t **":
     """svn_io_file_checksum2(char const * file, svn_checksum_kind_t kind, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_file_checksum2(*args)
 
-def svn_io_file_checksum(*args):
+def svn_io_file_checksum(*args) -> "unsigned char [ANY]":
     """svn_io_file_checksum(char const * file, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_file_checksum(*args)
 
-def svn_io_files_contents_same_p(*args):
+def svn_io_files_contents_same_p(*args) -> "svn_boolean_t *":
     """svn_io_files_contents_same_p(char const * file1, char const * file2, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_files_contents_same_p(*args)
 
-def svn_io_files_contents_three_same_p(*args):
+def svn_io_files_contents_three_same_p(*args) -> "svn_boolean_t *, svn_boolean_t *, svn_boolean_t *":
     """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):
+def svn_io_file_create_bytes(*args) -> "svn_error_t *":
     """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):
+def svn_io_file_create_empty(*args) -> "svn_error_t *":
     """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):
+def svn_io_lock_open_file(*args) -> "svn_error_t *":
     """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)
 
-def svn_io_unlock_open_file(*args):
+def svn_io_unlock_open_file(*args) -> "svn_error_t *":
     """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(stream, read_fn, read_full_fn):
+def svn_stream_set_read2(stream: 'svn_stream_t *', read_fn: 'svn_read_fn_t', read_full_fn: 'svn_read_fn_t') -> "void":
     """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(stream, read_fn, read_full_fn)
 
-def svn_stream_set_skip(stream, skip_fn):
+def svn_stream_set_skip(stream: 'svn_stream_t *', skip_fn: 'svn_stream_skip_fn_t') -> "void":
     """svn_stream_set_skip(svn_stream_t * stream, svn_stream_skip_fn_t skip_fn)"""
     return _core.svn_stream_set_skip(stream, skip_fn)
 
-def svn_stream_set_mark(stream, mark_fn):
+def svn_stream_set_mark(stream: 'svn_stream_t *', mark_fn: 'svn_stream_mark_fn_t') -> "void":
     """svn_stream_set_mark(svn_stream_t * stream, svn_stream_mark_fn_t mark_fn)"""
     return _core.svn_stream_set_mark(stream, mark_fn)
 
-def svn_stream_set_seek(stream, seek_fn):
+def svn_stream_set_seek(stream: 'svn_stream_t *', seek_fn: 'svn_stream_seek_fn_t') -> "void":
     """svn_stream_set_seek(svn_stream_t * stream, svn_stream_seek_fn_t seek_fn)"""
     return _core.svn_stream_set_seek(stream, seek_fn)
 
-def svn_stream_set_data_available(stream, data_available):
+def svn_stream_set_data_available(stream: 'svn_stream_t *', data_available: 'svn_stream_data_available_fn_t') -> "void":
     """svn_stream_set_data_available(svn_stream_t * stream, svn_stream_data_available_fn_t data_available)"""
     return _core.svn_stream_set_data_available(stream, data_available)
 
-def svn_stream_set_readline(stream, readline_fn):
+def svn_stream_set_readline(stream: 'svn_stream_t *', readline_fn: 'svn_stream_readline_fn_t') -> "void":
     """svn_stream_set_readline(svn_stream_t * stream, svn_stream_readline_fn_t readline_fn)"""
     return _core.svn_stream_set_readline(stream, readline_fn)
 
-def svn_stream_empty(*args):
+def svn_stream_empty(*args) -> "svn_stream_t *":
     """svn_stream_empty(apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_empty(*args)
 
-def svn_stream_disown(*args):
+def svn_stream_disown(*args) -> "svn_stream_t *":
     """svn_stream_disown(svn_stream_t * stream, apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_disown(*args)
 
-def svn_stream_open_readonly(*args):
+def svn_stream_open_readonly(*args) -> "svn_stream_t **":
     """svn_stream_open_readonly(char const * path, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_stream_open_readonly(*args)
 
-def svn_stream_open_writable(*args):
+def svn_stream_open_writable(*args) -> "svn_stream_t **":
     """svn_stream_open_writable(char const * path, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_stream_open_writable(*args)
 
-def svn_stream_open_unique(*args):
+def svn_stream_open_unique(*args) -> "svn_stream_t **, char const **":
     """svn_stream_open_unique(char const * dirpath, svn_io_file_del_t delete_when, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_stream_open_unique(*args)
 
-def svn_stream_from_aprfile2(*args):
+def svn_stream_from_aprfile2(*args) -> "svn_stream_t *":
     """svn_stream_from_aprfile2(apr_file_t file, svn_boolean_t disown, apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_from_aprfile2(*args)
 
-def svn_stream_from_aprfile(*args):
+def svn_stream_from_aprfile(*args) -> "svn_stream_t *":
     """svn_stream_from_aprfile(apr_file_t file, apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_from_aprfile(*args)
 
-def svn_stream_for_stdin2(*args):
+def svn_stream_for_stdin2(*args) -> "svn_stream_t **":
     """svn_stream_for_stdin2(svn_boolean_t buffered, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_for_stdin2(*args)
 
-def svn_stream_for_stdin(*args):
+def svn_stream_for_stdin(*args) -> "svn_stream_t **":
     """svn_stream_for_stdin(apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_for_stdin(*args)
 
-def svn_stream_for_stderr(*args):
+def svn_stream_for_stderr(*args) -> "svn_stream_t **":
     """svn_stream_for_stderr(apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_for_stderr(*args)
 
-def svn_stream_for_stdout(*args):
+def svn_stream_for_stdout(*args) -> "svn_stream_t **":
     """svn_stream_for_stdout(apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_for_stdout(*args)
 
-def svn_stringbuf_from_stream(*args):
+def svn_stringbuf_from_stream(*args) -> "svn_stringbuf_t **":
     """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):
+def svn_stream_from_stringbuf(*args) -> "svn_stream_t *":
     """svn_stream_from_stringbuf(svn_stringbuf_t * str, apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_from_stringbuf(*args)
 
-def svn_stream_from_string(*args):
+def svn_stream_from_string(*args) -> "svn_stream_t *":
     """svn_stream_from_string(svn_string_t const * str, apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_from_string(*args)
 
-def svn_stream_buffered(*args):
+def svn_stream_buffered(*args) -> "svn_stream_t *":
     """svn_stream_buffered(apr_pool_t result_pool) -> svn_stream_t *"""
     return _core.svn_stream_buffered(*args)
 
-def svn_stream_compressed(*args):
+def svn_stream_compressed(*args) -> "svn_stream_t *":
     """svn_stream_compressed(svn_stream_t * stream, apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_compressed(*args)
 
-def svn_stream_checksummed2(*args):
+def svn_stream_checksummed2(*args) -> "svn_checksum_t **, svn_checksum_t **":
     """svn_stream_checksummed2(svn_stream_t * stream, svn_checksum_kind_t checksum_kind, svn_boolean_t read_all, apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_checksummed2(*args)
 
-def svn_stream_contents_checksum(*args):
+def svn_stream_contents_checksum(*args) -> "svn_checksum_t **":
     """svn_stream_contents_checksum(svn_stream_t * stream, svn_checksum_kind_t kind, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_stream_contents_checksum(*args)
 
-def svn_stream_read_full(stream, buffer):
+def svn_stream_read_full(stream: 'svn_stream_t *', buffer: 'char *') -> "apr_size_t *":
     """svn_stream_read_full(svn_stream_t * stream, char * buffer) -> svn_error_t"""
     return _core.svn_stream_read_full(stream, buffer)
 
-def svn_stream_supports_partial_read(stream):
+def svn_stream_supports_partial_read(stream: 'svn_stream_t *') -> "svn_boolean_t":
     """svn_stream_supports_partial_read(svn_stream_t * stream) -> svn_boolean_t"""
     return _core.svn_stream_supports_partial_read(stream)
 
-def svn_stream_read2(stream, buffer):
+def svn_stream_read2(stream: 'svn_stream_t *', buffer: 'char *') -> "apr_size_t *":
     """svn_stream_read2(svn_stream_t * stream, char * buffer) -> svn_error_t"""
     return _core.svn_stream_read2(stream, buffer)
 
-def svn_stream_read(stream, buffer):
+def svn_stream_read(stream: 'svn_stream_t *', buffer: 'char *') -> "apr_size_t *":
     """svn_stream_read(svn_stream_t * stream, char * buffer) -> svn_error_t"""
     return _core.svn_stream_read(stream, buffer)
 
-def svn_stream_skip(stream, len):
+def svn_stream_skip(stream: 'svn_stream_t *', len: 'apr_size_t') -> "svn_error_t *":
     """svn_stream_skip(svn_stream_t * stream, apr_size_t len) -> svn_error_t"""
     return _core.svn_stream_skip(stream, len)
 
-def svn_stream_write(stream, data):
+def svn_stream_write(stream: 'svn_stream_t *', data: 'char const *') -> "apr_size_t *":
     """svn_stream_write(svn_stream_t * stream, char const * data) -> svn_error_t"""
     return _core.svn_stream_write(stream, data)
 
-def svn_stream_close(stream):
+def svn_stream_close(stream: 'svn_stream_t *') -> "svn_error_t *":
     """svn_stream_close(svn_stream_t * stream) -> svn_error_t"""
     return _core.svn_stream_close(stream)
 
-def svn_stream_reset(stream):
+def svn_stream_reset(stream: 'svn_stream_t *') -> "svn_error_t *":
     """svn_stream_reset(svn_stream_t * stream) -> svn_error_t"""
     return _core.svn_stream_reset(stream)
 
-def svn_stream_supports_mark(stream):
+def svn_stream_supports_mark(stream: 'svn_stream_t *') -> "svn_boolean_t":
     """svn_stream_supports_mark(svn_stream_t * stream) -> svn_boolean_t"""
     return _core.svn_stream_supports_mark(stream)
 
-def svn_stream_supports_reset(stream):
+def svn_stream_supports_reset(stream: 'svn_stream_t *') -> "svn_boolean_t":
     """svn_stream_supports_reset(svn_stream_t * stream) -> svn_boolean_t"""
     return _core.svn_stream_supports_reset(stream)
 
-def svn_stream_mark(*args):
+def svn_stream_mark(*args) -> "svn_stream_mark_t **":
     """svn_stream_mark(svn_stream_t * stream, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_mark(*args)
 
-def svn_stream_seek(stream, mark):
+def svn_stream_seek(stream: 'svn_stream_t *', mark: 'svn_stream_mark_t const *') -> "svn_error_t *":
     """svn_stream_seek(svn_stream_t * stream, svn_stream_mark_t const * mark) -> svn_error_t"""
     return _core.svn_stream_seek(stream, mark)
 
-def svn_stream_data_available(stream):
+def svn_stream_data_available(stream: 'svn_stream_t *') -> "svn_boolean_t *":
     """svn_stream_data_available(svn_stream_t * stream) -> svn_error_t"""
     return _core.svn_stream_data_available(stream)
 
-def svn_stream_tee(*args):
+def svn_stream_tee(*args) -> "svn_stream_t *":
     """svn_stream_tee(svn_stream_t * out1, svn_stream_t * out2, apr_pool_t pool) -> svn_stream_t *"""
     return _core.svn_stream_tee(*args)
 
-def svn_stream_puts(stream, str):
+def svn_stream_puts(stream: 'svn_stream_t *', str: 'char const *') -> "svn_error_t *":
     """svn_stream_puts(svn_stream_t * stream, char const * str) -> svn_error_t"""
     return _core.svn_stream_puts(stream, str)
 
-def svn_stream_readline(*args):
+def svn_stream_readline(*args) -> "svn_stringbuf_t **, svn_boolean_t *":
     """svn_stream_readline(svn_stream_t * stream, char const * eol, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_readline(*args)
 
-def svn_stream_copy3(*args):
+def svn_stream_copy3(*args) -> "svn_error_t *":
     """svn_stream_copy3(svn_stream_t * arg1, svn_stream_t * to, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_copy3(*args)
 
-def svn_stream_copy2(*args):
+def svn_stream_copy2(*args) -> "svn_error_t *":
     """svn_stream_copy2(svn_stream_t * arg1, svn_stream_t * to, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_copy2(*args)
 
-def svn_stream_copy(*args):
+def svn_stream_copy(*args) -> "svn_error_t *":
     """svn_stream_copy(svn_stream_t * arg1, svn_stream_t * to, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_copy(*args)
 
-def svn_stream_contents_same2(*args):
+def svn_stream_contents_same2(*args) -> "svn_boolean_t *":
     """svn_stream_contents_same2(svn_stream_t * stream1, svn_stream_t * stream2, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_contents_same2(*args)
 
-def svn_stream_contents_same(*args):
+def svn_stream_contents_same(*args) -> "svn_boolean_t *":
     """svn_stream_contents_same(svn_stream_t * stream1, svn_stream_t * stream2, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_contents_same(*args)
 
-def svn_string_from_stream2(*args):
+def svn_string_from_stream2(*args) -> "svn_string_t **":
     """svn_string_from_stream2(svn_stream_t * stream, apr_size_t len_hint, apr_pool_t result_pool) -> svn_error_t"""
     return _core.svn_string_from_stream2(*args)
 
-def svn_string_from_stream(*args):
+def svn_string_from_stream(*args) -> "svn_string_t **":
     """svn_string_from_stream(svn_stream_t * stream, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_string_from_stream(*args)
 
-def svn_stream_lazyopen_create(*args):
+def svn_stream_lazyopen_create(*args) -> "svn_stream_t *":
     """svn_stream_lazyopen_create(svn_stream_lazyopen_func_t open_func, void * open_baton, svn_boolean_t open_on_close, apr_pool_t result_pool) -> svn_stream_t *"""
     return _core.svn_stream_lazyopen_create(*args)
 
-def svn_stringbuf_from_file2(*args):
+def svn_stringbuf_from_file2(*args) -> "svn_stringbuf_t **":
     """svn_stringbuf_from_file2(char const * filename, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stringbuf_from_file2(*args)
 
-def svn_stringbuf_from_file(*args):
+def svn_stringbuf_from_file(*args) -> "svn_stringbuf_t **":
     """svn_stringbuf_from_file(char const * filename, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stringbuf_from_file(*args)
 
-def svn_stringbuf_from_aprfile(*args):
+def svn_stringbuf_from_aprfile(*args) -> "svn_stringbuf_t **":
     """svn_stringbuf_from_aprfile(apr_file_t file, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stringbuf_from_aprfile(*args)
 
-def svn_io_remove_file2(*args):
+def svn_io_remove_file2(*args) -> "svn_error_t *":
     """svn_io_remove_file2(char const * path, svn_boolean_t ignore_enoent, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_remove_file2(*args)
 
-def svn_io_remove_file(*args):
+def svn_io_remove_file(*args) -> "svn_error_t *":
     """svn_io_remove_file(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_remove_file(*args)
 
-def svn_io_remove_dir2(*args):
+def svn_io_remove_dir2(*args) -> "svn_error_t *":
     """svn_io_remove_dir2(char const * path, svn_boolean_t ignore_enoent, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_remove_dir2(*args)
 
-def svn_io_remove_dir(*args):
+def svn_io_remove_dir(*args) -> "svn_error_t *":
     """svn_io_remove_dir(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_remove_dir(*args)
 
-def svn_io_get_dirents3(*args):
+def svn_io_get_dirents3(*args) -> "apr_hash_t **":
     """svn_io_get_dirents3(char const * path, svn_boolean_t only_check_type, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_get_dirents3(*args)
 
-def svn_io_stat_dirent2(*args):
+def svn_io_stat_dirent2(*args) -> "svn_io_dirent2_t **":
     """svn_io_stat_dirent2(char const * path, svn_boolean_t verify_truename, svn_boolean_t ignore_enoent, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_stat_dirent2(*args)
 
-def svn_io_stat_dirent(*args):
+def svn_io_stat_dirent(*args) -> "svn_io_dirent2_t **":
     """svn_io_stat_dirent(char const * path, svn_boolean_t ignore_enoent, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_stat_dirent(*args)
 
-def svn_io_dir_walk2(*args):
+def svn_io_dir_walk2(*args) -> "svn_error_t *":
     """svn_io_dir_walk2(char const * dirname, apr_int32_t wanted, svn_io_walk_func_t walk_func, void * walk_baton, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_dir_walk2(*args)
 
-def svn_io_start_cmd3(*args):
+def svn_io_start_cmd3(*args) -> "svn_error_t *":
     """svn_io_start_cmd3(apr_proc_t * cmd_proc, char const * path, char const * cmd, char const *const * args, char const *const * env, svn_boolean_t inherit, svn_boolean_t infile_pipe, apr_file_t infile, svn_boolean_t outfile_pipe, apr_file_t outfile, svn_boolean_t errfile_pipe, apr_file_t errfile, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_start_cmd3(*args)
 
-def svn_io_start_cmd2(*args):
+def svn_io_start_cmd2(*args) -> "svn_error_t *":
     """svn_io_start_cmd2(apr_proc_t * cmd_proc, char const * path, char const * cmd, char const *const * args, svn_boolean_t inherit, svn_boolean_t infile_pipe, apr_file_t infile, svn_boolean_t outfile_pipe, apr_file_t outfile, svn_boolean_t errfile_pipe, apr_file_t errfile, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_start_cmd2(*args)
 
-def svn_io_run_diff2(*args):
+def svn_io_run_diff2(*args) -> "int *":
     """svn_io_run_diff2(char const * dir, char const *const * user_args, int num_user_args, char const * label1, char const * label2, char const * arg6, char const * to, apr_file_t outfile, apr_file_t errfile, char const * diff_cmd, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_run_diff2(*args)
 
-def svn_io_run_diff3_3(*args):
+def svn_io_run_diff3_3(*args) -> "int *":
     """svn_io_run_diff3_3(char const * dir, char const * mine, char const * older, char const * yours, char const * mine_label, char const * older_label, char const * yours_label, apr_file_t merged, char const * diff3_cmd, apr_array_header_t user_args, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_run_diff3_3(*args)
 
-def svn_io_parse_mimetypes_file(*args):
+def svn_io_parse_mimetypes_file(*args) -> "apr_hash_t **":
     """svn_io_parse_mimetypes_file(char const * mimetypes_file, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_parse_mimetypes_file(*args)
 
-def svn_io_detect_mimetype2(*args):
+def svn_io_detect_mimetype2(*args) -> "char const **":
     """svn_io_detect_mimetype2(char const * file, apr_hash_t mimetype_map, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_detect_mimetype2(*args)
 
-def svn_io_detect_mimetype(*args):
+def svn_io_detect_mimetype(*args) -> "char const **":
     """svn_io_detect_mimetype(char const * file, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_detect_mimetype(*args)
 
-def svn_io_is_binary_data(buf, len):
+def svn_io_is_binary_data(buf: 'void const *', len: 'apr_size_t') -> "svn_boolean_t":
     """svn_io_is_binary_data(void const * buf, apr_size_t len) -> svn_boolean_t"""
     return _core.svn_io_is_binary_data(buf, len)
 
-def svn_io_file_putc(*args):
+def svn_io_file_putc(*args) -> "svn_error_t *":
     """svn_io_file_putc(char ch, apr_file_t file, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_file_putc(*args)
 
-def svn_io_file_size_get(*args):
+def svn_io_file_size_get(*args) -> "svn_filesize_t *":
     """svn_io_file_size_get(apr_file_t file, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_file_size_get(*args)
 
-def svn_io_file_get_offset(*args):
+def svn_io_file_get_offset(*args) -> "svn_error_t *":
     """svn_io_file_get_offset(apr_off_t * offset_p, apr_file_t file, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_file_get_offset(*args)
 
-def svn_io_file_read_full2(*args):
+def svn_io_file_read_full2(*args) -> "apr_size_t *, svn_boolean_t *":
     """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):
+def svn_io_file_aligned_seek(*args) -> "svn_error_t *":
     """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):
+def svn_io_file_flush(*args) -> "svn_error_t *":
     """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_atomic2(*args):
+def svn_io_write_atomic2(*args) -> "svn_error_t *":
     """svn_io_write_atomic2(char const * final_path, void const * buf, apr_size_t nbytes, char const * copy_perms_path, svn_boolean_t flush_to_disk, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_write_atomic2(*args)
 
-def svn_io_write_atomic(*args):
+def svn_io_write_atomic(*args) -> "svn_error_t *":
     """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):
+def svn_io_write_unique(*args) -> "char const **":
     """svn_io_write_unique(char const * dirpath, void const * buf, apr_size_t nbytes, svn_io_file_del_t delete_when, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_write_unique(*args)
 
-def svn_io_file_trunc(*args):
+def svn_io_file_trunc(*args) -> "svn_error_t *":
     """svn_io_file_trunc(apr_file_t file, apr_off_t offset, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_file_trunc(*args)
 
-def svn_io_file_rename2(*args):
+def svn_io_file_rename2(*args) -> "svn_error_t *":
     """svn_io_file_rename2(char const * from_path, char const * to_path, svn_boolean_t flush_to_disk, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_file_rename2(*args)
 
-def svn_io_dir_close(thedir):
+def svn_io_dir_close(thedir: 'apr_dir_t *') -> "svn_error_t *":
     """svn_io_dir_close(apr_dir_t * thedir) -> svn_error_t"""
     return _core.svn_io_dir_close(thedir)
 
-def svn_io_file_name_get(*args):
+def svn_io_file_name_get(*args) -> "char const **":
     """svn_io_file_name_get(apr_file_t file, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_file_name_get(*args)
 
-def svn_io_file_readline(*args):
+def svn_io_file_readline(*args) -> "svn_stringbuf_t **, char const **, svn_boolean_t *":
     """svn_io_file_readline(apr_file_t file, apr_size_t max_len, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_io_file_readline(*args)
-class svn_stream_t:
+class svn_stream_t(object):
     """Proxy of C svn_stream_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_stream_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_stream_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -5938,23 +7599,57 @@ class svn_stream_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -5964,18 +7659,15 @@ class svn_stream_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_stream_t_swigregister = _core.svn_stream_t_swigregister
 svn_stream_t_swigregister(svn_stream_t)
 
-class svn_stream_mark_t:
+class svn_stream_mark_t(object):
     """Proxy of C svn_stream_mark_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_stream_mark_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_stream_mark_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -5994,23 +7686,57 @@ class svn_stream_mark_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6020,58 +7746,55 @@ class svn_stream_mark_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_stream_mark_t_swigregister = _core.svn_stream_mark_t_swigregister
 svn_stream_mark_t_swigregister(svn_stream_mark_t)
 
 
-def svn_read_invoke_fn(_obj, baton, buffer):
+def svn_read_invoke_fn(_obj: 'svn_read_fn_t', baton: 'void *', buffer: 'char *') -> "apr_size_t *":
     """svn_read_invoke_fn(svn_read_fn_t _obj, void * baton, char * buffer) -> svn_error_t"""
     return _core.svn_read_invoke_fn(_obj, baton, buffer)
 
-def svn_stream_invoke_skip_fn(_obj, baton, len):
+def svn_stream_invoke_skip_fn(_obj: 'svn_stream_skip_fn_t', baton: 'void *', len: 'apr_size_t') -> "svn_error_t *":
     """svn_stream_invoke_skip_fn(svn_stream_skip_fn_t _obj, void * baton, apr_size_t len) -> svn_error_t"""
     return _core.svn_stream_invoke_skip_fn(_obj, baton, len)
 
-def svn_write_invoke_fn(_obj, baton, data):
+def svn_write_invoke_fn(_obj: 'svn_write_fn_t', baton: 'void *', data: 'char const *') -> "apr_size_t *":
     """svn_write_invoke_fn(svn_write_fn_t _obj, void * baton, char const * data) -> svn_error_t"""
     return _core.svn_write_invoke_fn(_obj, baton, data)
 
-def svn_close_invoke_fn(_obj, baton):
+def svn_close_invoke_fn(_obj: 'svn_close_fn_t', baton: 'void *') -> "svn_error_t *":
     """svn_close_invoke_fn(svn_close_fn_t _obj, void * baton) -> svn_error_t"""
     return _core.svn_close_invoke_fn(_obj, baton)
 
-def svn_stream_invoke_mark_fn(*args):
+def svn_stream_invoke_mark_fn(*args) -> "svn_stream_mark_t **":
     """svn_stream_invoke_mark_fn(svn_stream_mark_fn_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_invoke_mark_fn(*args)
 
-def svn_stream_invoke_seek_fn(_obj, baton, mark):
+def svn_stream_invoke_seek_fn(_obj: 'svn_stream_seek_fn_t', baton: 'void *', mark: 'svn_stream_mark_t const *') -> "svn_error_t *":
     """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(_obj, baton, mark)
 
-def svn_stream_invoke_data_available_fn(_obj, baton):
+def svn_stream_invoke_data_available_fn(_obj: 'svn_stream_data_available_fn_t', baton: 'void *') -> "svn_boolean_t *":
     """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(_obj, baton)
 
-def svn_stream_invoke_readline_fn(*args):
+def svn_stream_invoke_readline_fn(*args) -> "svn_stringbuf_t **, svn_boolean_t *":
     """svn_stream_invoke_readline_fn(svn_stream_readline_fn_t _obj, void * baton, char const * eol, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_stream_invoke_readline_fn(*args)
 
-def svn_stream_invoke_lazyopen_func(*args):
+def svn_stream_invoke_lazyopen_func(*args) -> "svn_stream_t **":
     """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)
 
-def svn_io_invoke_walk_func(*args):
+def svn_io_invoke_walk_func(*args) -> "svn_error_t *":
     """svn_io_invoke_walk_func(svn_io_walk_func_t _obj, void * baton, char const * path, apr_finfo_t const * finfo, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_io_invoke_walk_func(*args)
-class svn_read_fn_t:
+class svn_read_fn_t(object):
     """Proxy of C svn_read_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_read_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_read_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6090,23 +7813,57 @@ class svn_read_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6116,7 +7873,7 @@ class svn_read_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6125,13 +7882,10 @@ class svn_read_fn_t:
 svn_read_fn_t_swigregister = _core.svn_read_fn_t_swigregister
 svn_read_fn_t_swigregister(svn_read_fn_t)
 
-class svn_stream_skip_fn_t:
+class svn_stream_skip_fn_t(object):
     """Proxy of C svn_stream_skip_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_stream_skip_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_stream_skip_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6150,23 +7904,57 @@ class svn_stream_skip_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6176,7 +7964,7 @@ class svn_stream_skip_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6185,13 +7973,10 @@ class svn_stream_skip_fn_t:
 svn_stream_skip_fn_t_swigregister = _core.svn_stream_skip_fn_t_swigregister
 svn_stream_skip_fn_t_swigregister(svn_stream_skip_fn_t)
 
-class svn_write_fn_t:
+class svn_write_fn_t(object):
     """Proxy of C svn_write_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_write_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_write_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6210,23 +7995,57 @@ class svn_write_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6236,7 +8055,7 @@ class svn_write_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6245,13 +8064,10 @@ class svn_write_fn_t:
 svn_write_fn_t_swigregister = _core.svn_write_fn_t_swigregister
 svn_write_fn_t_swigregister(svn_write_fn_t)
 
-class svn_close_fn_t:
+class svn_close_fn_t(object):
     """Proxy of C svn_close_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_close_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_close_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6270,23 +8086,57 @@ class svn_close_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6296,7 +8146,7 @@ class svn_close_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6305,13 +8155,10 @@ class svn_close_fn_t:
 svn_close_fn_t_swigregister = _core.svn_close_fn_t_swigregister
 svn_close_fn_t_swigregister(svn_close_fn_t)
 
-class svn_stream_mark_fn_t:
+class svn_stream_mark_fn_t(object):
     """Proxy of C svn_stream_mark_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_stream_mark_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_stream_mark_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6330,23 +8177,57 @@ class svn_stream_mark_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6356,7 +8237,7 @@ class svn_stream_mark_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6365,13 +8246,10 @@ class svn_stream_mark_fn_t:
 svn_stream_mark_fn_t_swigregister = _core.svn_stream_mark_fn_t_swigregister
 svn_stream_mark_fn_t_swigregister(svn_stream_mark_fn_t)
 
-class svn_stream_seek_fn_t:
+class svn_stream_seek_fn_t(object):
     """Proxy of C svn_stream_seek_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_stream_seek_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_stream_seek_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6390,23 +8268,57 @@ class svn_stream_seek_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6416,7 +8328,7 @@ class svn_stream_seek_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6425,13 +8337,10 @@ 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:
+class svn_stream_data_available_fn_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6450,23 +8359,57 @@ class svn_stream_data_available_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6476,7 +8419,7 @@ class svn_stream_data_available_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6485,13 +8428,10 @@ class svn_stream_data_available_fn_t:
 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_readline_fn_t:
+class svn_stream_readline_fn_t(object):
     """Proxy of C svn_stream_readline_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_stream_readline_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_stream_readline_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6510,23 +8450,57 @@ class svn_stream_readline_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6536,7 +8510,7 @@ class svn_stream_readline_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6545,13 +8519,10 @@ class svn_stream_readline_fn_t:
 svn_stream_readline_fn_t_swigregister = _core.svn_stream_readline_fn_t_swigregister
 svn_stream_readline_fn_t_swigregister(svn_stream_readline_fn_t)
 
-class svn_stream_lazyopen_func_t:
+class svn_stream_lazyopen_func_t(object):
     """Proxy of C svn_stream_lazyopen_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_stream_lazyopen_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_stream_lazyopen_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6570,23 +8541,57 @@ class svn_stream_lazyopen_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6596,7 +8601,7 @@ class svn_stream_lazyopen_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6605,13 +8610,10 @@ class svn_stream_lazyopen_func_t:
 svn_stream_lazyopen_func_t_swigregister = _core.svn_stream_lazyopen_func_t_swigregister
 svn_stream_lazyopen_func_t_swigregister(svn_stream_lazyopen_func_t)
 
-class svn_io_walk_func_t:
+class svn_io_walk_func_t(object):
     """Proxy of C svn_io_walk_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_io_walk_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_io_walk_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6630,23 +8632,57 @@ class svn_io_walk_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6656,7 +8692,7 @@ class svn_io_walk_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -6669,18 +8705,13 @@ 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:
+class svn_checksum_t(object):
     """Proxy of C svn_checksum_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_checksum_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_checksum_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["digest"] = _core.svn_checksum_t_digest_set
-    __swig_getmethods__["digest"] = _core.svn_checksum_t_digest_get
-    __swig_setmethods__["kind"] = _core.svn_checksum_t_kind_set
-    __swig_getmethods__["kind"] = _core.svn_checksum_t_kind_get
+    digest = _swig_property(_core.svn_checksum_t_digest_get, _core.svn_checksum_t_digest_set)
+    kind = _swig_property(_core.svn_checksum_t_kind_get, _core.svn_checksum_t_kind_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -6695,23 +8726,57 @@ class svn_checksum_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6721,7 +8786,7 @@ class svn_checksum_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -6737,84 +8802,81 @@ svn_checksum_t_swigregister = _core.svn_checksum_t_swigregister
 svn_checksum_t_swigregister(svn_checksum_t)
 
 
-def svn_checksum_create(*args):
+def svn_checksum_create(*args) -> "svn_checksum_t *":
     """svn_checksum_create(svn_checksum_kind_t kind, apr_pool_t pool) -> svn_checksum_t"""
     return _core.svn_checksum_create(*args)
 
-def svn_checksum_clear(checksum):
+def svn_checksum_clear(checksum: 'svn_checksum_t') -> "svn_error_t *":
     """svn_checksum_clear(svn_checksum_t checksum) -> svn_error_t"""
     return _core.svn_checksum_clear(checksum)
 
-def svn_checksum_match(checksum1, checksum2):
+def svn_checksum_match(checksum1: 'svn_checksum_t', checksum2: 'svn_checksum_t') -> "svn_boolean_t":
     """svn_checksum_match(svn_checksum_t checksum1, svn_checksum_t checksum2) -> svn_boolean_t"""
     return _core.svn_checksum_match(checksum1, checksum2)
 
-def svn_checksum_dup(*args):
+def svn_checksum_dup(*args) -> "svn_checksum_t *":
     """svn_checksum_dup(svn_checksum_t checksum, apr_pool_t pool) -> svn_checksum_t"""
     return _core.svn_checksum_dup(*args)
 
-def svn_checksum_to_cstring_display(*args):
+def svn_checksum_to_cstring_display(*args) -> "char const *":
     """svn_checksum_to_cstring_display(svn_checksum_t checksum, apr_pool_t pool) -> char const *"""
     return _core.svn_checksum_to_cstring_display(*args)
 
-def svn_checksum_to_cstring(*args):
+def svn_checksum_to_cstring(*args) -> "char const *":
     """svn_checksum_to_cstring(svn_checksum_t checksum, apr_pool_t pool) -> char const *"""
     return _core.svn_checksum_to_cstring(*args)
 
-def svn_checksum_serialize(*args):
+def svn_checksum_serialize(*args) -> "char const *":
     """svn_checksum_serialize(svn_checksum_t checksum, apr_pool_t result_pool, apr_pool_t scratch_pool) -> char const *"""
     return _core.svn_checksum_serialize(*args)
 
-def svn_checksum_deserialize(*args):
+def svn_checksum_deserialize(*args) -> "svn_checksum_t **":
     """svn_checksum_deserialize(char const * data, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _core.svn_checksum_deserialize(*args)
 
-def svn_checksum_parse_hex(*args):
+def svn_checksum_parse_hex(*args) -> "svn_checksum_t **":
     """svn_checksum_parse_hex(svn_checksum_kind_t kind, char const * hex, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_checksum_parse_hex(*args)
 
-def svn_checksum(*args):
+def svn_checksum(*args) -> "svn_checksum_t **":
     """svn_checksum(svn_checksum_kind_t kind, void const * data, apr_size_t len, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_checksum(*args)
 
-def svn_checksum_empty_checksum(*args):
+def svn_checksum_empty_checksum(*args) -> "svn_checksum_t *":
     """svn_checksum_empty_checksum(svn_checksum_kind_t kind, apr_pool_t pool) -> svn_checksum_t"""
     return _core.svn_checksum_empty_checksum(*args)
 
-def svn_checksum_ctx_create(*args):
+def svn_checksum_ctx_create(*args) -> "svn_checksum_ctx_t *":
     """svn_checksum_ctx_create(svn_checksum_kind_t kind, apr_pool_t pool) -> svn_checksum_ctx_t *"""
     return _core.svn_checksum_ctx_create(*args)
 
-def svn_checksum_ctx_reset(ctx):
+def svn_checksum_ctx_reset(ctx: 'svn_checksum_ctx_t *') -> "svn_error_t *":
     """svn_checksum_ctx_reset(svn_checksum_ctx_t * ctx) -> svn_error_t"""
     return _core.svn_checksum_ctx_reset(ctx)
 
-def svn_checksum_update(ctx, data, len):
+def svn_checksum_update(ctx: 'svn_checksum_ctx_t *', data: 'void const *', len: 'apr_size_t') -> "svn_error_t *":
     """svn_checksum_update(svn_checksum_ctx_t * ctx, void const * data, apr_size_t len) -> svn_error_t"""
     return _core.svn_checksum_update(ctx, data, len)
 
-def svn_checksum_final(*args):
+def svn_checksum_final(*args) -> "svn_checksum_t **":
     """svn_checksum_final(svn_checksum_ctx_t const * ctx, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_checksum_final(*args)
 
-def svn_checksum_size(checksum):
+def svn_checksum_size(checksum: 'svn_checksum_t') -> "apr_size_t":
     """svn_checksum_size(svn_checksum_t checksum) -> apr_size_t"""
     return _core.svn_checksum_size(checksum)
 
-def svn_checksum_is_empty_checksum(checksum):
+def svn_checksum_is_empty_checksum(checksum: 'svn_checksum_t') -> "svn_boolean_t":
     """svn_checksum_is_empty_checksum(svn_checksum_t checksum) -> svn_boolean_t"""
     return _core.svn_checksum_is_empty_checksum(checksum)
 
-def svn_checksum_mismatch_err(*args):
+def svn_checksum_mismatch_err(*args) -> "svn_error_t *":
     """svn_checksum_mismatch_err(svn_checksum_t expected, svn_checksum_t actual, apr_pool_t scratch_pool, char const * fmt) -> svn_error_t"""
     return _core.svn_checksum_mismatch_err(*args)
-class svn_checksum_ctx_t:
+class svn_checksum_ctx_t(object):
     """Proxy of C svn_checksum_ctx_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_checksum_ctx_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_checksum_ctx_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6833,23 +8895,57 @@ class svn_checksum_ctx_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6859,25 +8955,19 @@ class svn_checksum_ctx_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_checksum_ctx_t_swigregister = _core.svn_checksum_ctx_t_swigregister
 svn_checksum_ctx_t_swigregister(svn_checksum_ctx_t)
 
-class svn_cache_config_t:
+class svn_cache_config_t(object):
     """Proxy of C svn_cache_config_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_cache_config_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_cache_config_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["cache_size"] = _core.svn_cache_config_t_cache_size_set
-    __swig_getmethods__["cache_size"] = _core.svn_cache_config_t_cache_size_get
-    __swig_setmethods__["file_handle_count"] = _core.svn_cache_config_t_file_handle_count_set
-    __swig_getmethods__["file_handle_count"] = _core.svn_cache_config_t_file_handle_count_get
-    __swig_setmethods__["single_threaded"] = _core.svn_cache_config_t_single_threaded_set
-    __swig_getmethods__["single_threaded"] = _core.svn_cache_config_t_single_threaded_get
+    cache_size = _swig_property(_core.svn_cache_config_t_cache_size_get, _core.svn_cache_config_t_cache_size_set)
+    file_handle_count = _swig_property(_core.svn_cache_config_t_file_handle_count_get, _core.svn_cache_config_t_file_handle_count_set)
+    single_threaded = _swig_property(_core.svn_cache_config_t_single_threaded_get, _core.svn_cache_config_t_single_threaded_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -6892,23 +8982,57 @@ class svn_cache_config_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -6918,7 +9042,7 @@ class svn_cache_config_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -6934,32 +9058,29 @@ svn_cache_config_t_swigregister = _core.svn_cache_config_t_swigregister
 svn_cache_config_t_swigregister(svn_cache_config_t)
 
 
-def svn_cache_config_get():
+def svn_cache_config_get() -> "svn_cache_config_t const *":
     """svn_cache_config_get() -> svn_cache_config_t"""
     return _core.svn_cache_config_get()
 
-def svn_cache_config_set(settings):
+def svn_cache_config_set(settings: 'svn_cache_config_t') -> "void":
     """svn_cache_config_set(svn_cache_config_t settings)"""
     return _core.svn_cache_config_set(settings)
 
-def svn_auth_set_gnome_keyring_unlock_prompt_func(ab, prompt_func):
+def svn_auth_set_gnome_keyring_unlock_prompt_func(ab: 'svn_auth_baton_t *', prompt_func: 'svn_auth_gnome_keyring_unlock_prompt_func_t') -> "void":
     """svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t * ab, svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func)"""
     return _core.svn_auth_set_gnome_keyring_unlock_prompt_func(ab, prompt_func)
 
-def svn_swig_py_set_application_pool(*args):
+def svn_swig_py_set_application_pool(*args) -> "void":
     """svn_swig_py_set_application_pool(PyObject * py_pool, apr_pool_t pool)"""
     return _core.svn_swig_py_set_application_pool(*args)
 
-def svn_swig_py_clear_application_pool():
+def svn_swig_py_clear_application_pool() -> "void":
     """svn_swig_py_clear_application_pool()"""
     return _core.svn_swig_py_clear_application_pool()
-class apr_array_header_t:
+class apr_array_header_t(object):
     """Proxy of C apr_array_header_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, apr_array_header_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, apr_array_header_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -6978,23 +9099,57 @@ class apr_array_header_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -7004,18 +9159,15 @@ class apr_array_header_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 apr_array_header_t_swigregister = _core.apr_array_header_t_swigregister
 apr_array_header_t_swigregister(apr_array_header_t)
 
-class apr_file_t:
+class apr_file_t(object):
     """Proxy of C apr_file_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, apr_file_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, apr_file_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -7034,23 +9186,57 @@ class apr_file_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -7060,18 +9246,15 @@ class apr_file_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 apr_file_t_swigregister = _core.apr_file_t_swigregister
 apr_file_t_swigregister(apr_file_t)
 
-class apr_hash_t:
+class apr_hash_t(object):
     """Proxy of C apr_hash_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, apr_hash_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, apr_hash_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -7090,23 +9273,57 @@ class apr_hash_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -7116,7 +9333,7 @@ class apr_hash_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 apr_hash_t_swigregister = _core.apr_hash_t_swigregister
 apr_hash_t_swigregister(apr_hash_t)
@@ -7137,6 +9354,7 @@ class GenericSWIGWrapper:
   def set_parent_pool(self, pool):
     """Set the parent pool of this object"""
     self._parent_pool = pool
+    self._is_valid = weakref.ref(pool._is_valid)
 
   def valid(self):
     """Is this object valid?"""
@@ -7152,17 +9370,20 @@ class GenericSWIGWrapper:
     return self.this
 
 def _mark_weakpool_invalid(weakpool):
-  if weakpool and weakpool() and hasattr(weakpool(), "_is_valid"):
-    del weakpool()._is_valid
+  if weakpool:
+    pool = weakpool()
+    if pool:
+      try:
+        del pool._is_valid
+      except AttributeError:
+        pass
 
 
-class apr_pool_t:
+
+class apr_pool_t(object):
     """Proxy of C apr_pool_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, apr_pool_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, apr_pool_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -7194,7 +9415,11 @@ class apr_pool_t:
     def valid(self):
       """Check whether this memory pool and its parents
       are still valid"""
-      return hasattr(self,"_is_valid")
+      try:
+        self._is_valid
+        return True
+      except AttributeError:
+        return False
 
     def assert_valid(self):
       """Assert that this memory_pool is still valid."""
@@ -7225,10 +9450,15 @@ class apr_pool_t:
         self._svn_swig_py_clear_application_pool()
 
     # Mark self as invalid
-      if hasattr(self, "_parent_pool"):
+      try:
         del self._parent_pool
-      if hasattr(self, "_is_valid"):
+      except AttributeError:
+        pass
+
+      try:
         del self._is_valid
+      except AttributeError:
+        pass
 
     def __del__(self):
       """Automatically destroy memory pools, if necessary"""
@@ -7261,8 +9491,11 @@ class apr_pool_t:
     def _wrap(self, obj):
       """Mark a SWIG object as owned by this pool"""
       self.assert_valid()
-      if hasattr(obj, "set_parent_pool"):
-        obj.set_parent_pool(self)
+
+      fn = getattr(obj, 'set_parent_pool', None)
+
+      if fn is not None:
+        fn(self)
         return obj
       elif obj is None:
         return None
@@ -7278,19 +9511,19 @@ apr_pool_t_swigregister(apr_pool_t)
 svn_pool_create()
 
 
-def svn_swig_mergeinfo_merge(*args):
+def svn_swig_mergeinfo_merge(*args) -> "apr_hash_t **":
     """svn_swig_mergeinfo_merge(apr_hash_t ** mergeinfo_inout, apr_hash_t changes, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_swig_mergeinfo_merge(*args)
 
-def svn_swig_mergeinfo_sort(*args):
+def svn_swig_mergeinfo_sort(*args) -> "apr_hash_t **":
     """svn_swig_mergeinfo_sort(apr_hash_t ** mergeinfo_inout, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_swig_mergeinfo_sort(*args)
 
-def svn_swig_rangelist_merge(*args):
+def svn_swig_rangelist_merge(*args) -> "svn_rangelist_t **":
     """svn_swig_rangelist_merge(svn_rangelist_t ** rangelist_inout, apr_array_header_t changes, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_swig_rangelist_merge(*args)
 
-def svn_swig_rangelist_reverse(*args):
+def svn_swig_rangelist_reverse(*args) -> "svn_rangelist_t **":
     """svn_swig_rangelist_reverse(svn_rangelist_t ** rangelist_inout, apr_pool_t pool) -> svn_error_t"""
     return _core.svn_swig_rangelist_reverse(*args)
 
diff --git a/subversion/bindings/swig/python/delta.py b/subversion/bindings/swig/python/delta.py
index 0383fd9..52325d9 100644
--- a/subversion/bindings/swig/python/delta.py
+++ b/subversion/bindings/swig/python/delta.py
@@ -39,6 +39,11 @@ else:
 del _swig_python_version_info
 
 try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
@@ -54,7 +59,7 @@ def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
     if method:
         return method(self, value)
     if (not static):
-        self.__dict__[name] = value
+        object.__setattr__(self, name, value)
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
 
@@ -80,14 +85,26 @@ def _swig_repr(self):
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self, name, value):
+        if (name == "thisown"):
+            return self.this.own(value)
+        if hasattr(self, name) or (name == "this"):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
+
 def _copy_metadata_deep(value, old_value):
   """Copy all attributes of old_value into value, recursively traversing
   lists and dicts if needed."""
   if value is None or old_value is None or value is old_value: return
 
   if isinstance(value, dict):
-    for k, v in value.iteritems():
-      _copy_metadata_deep(v, old_value[k])
+    for k in value:
+      _copy_metadata_deep(value[k], old_value[k])
   elif isinstance(value, list):
     for v, old_v in zip(value, old_value):
       _copy_metadata_deep(v, old_v)
@@ -100,44 +117,58 @@ def _copy_metadata_deep(value, old_value):
 def _assert_valid_deep(value):
   """Assert value's validity, recursively traversing lists and dicts."""
   if isinstance(value, dict):
-    for v in value.itervalues():
-      _assert_valid_deep(v)
+    for k in value:
+      _assert_valid_deep(value[k])
   elif isinstance(value, list):
     for v in value:
       _assert_valid_deep(v)
-  else:
-    if hasattr(value, "assert_valid"):
-      value.assert_valid()
+# Ensure that the passed in value isn't a type, which could have an
+# assert_valid attribute, but it can not be called without an instance.
+  elif type(value) != type:
+    try:
+      fn = value.assert_valid
+    except AttributeError:
+      pass
+    else:
+      fn()
+
+
+
+  # SWIG classes generated with -modern do not define this variable
+try:
+  _newclass
+except NameError:
+  _newclass = 1
+else:
+  raise RuntimeError("Require -modern option, but _newclass is defined")
+
+_get_instance_attr = object.__getattribute__
+_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 
 import libsvn.core
 
-def svn_swig_py_make_editor(*args):
+def svn_swig_py_make_editor(*args) -> "svn_delta_editor_t const **, void **":
     """svn_swig_py_make_editor(PyObject * py_editor, apr_pool_t pool)"""
     return _delta.svn_swig_py_make_editor(*args)
 SVN_DELTA_COMPRESSION_LEVEL_NONE = _delta.SVN_DELTA_COMPRESSION_LEVEL_NONE
 SVN_DELTA_COMPRESSION_LEVEL_MAX = _delta.SVN_DELTA_COMPRESSION_LEVEL_MAX
 SVN_DELTA_COMPRESSION_LEVEL_DEFAULT = _delta.SVN_DELTA_COMPRESSION_LEVEL_DEFAULT
 
-def svn_delta_version():
+def svn_delta_version() -> "svn_version_t const *":
     """svn_delta_version() -> svn_version_t const *"""
     return _delta.svn_delta_version()
 svn_txdelta_source = _delta.svn_txdelta_source
 svn_txdelta_target = _delta.svn_txdelta_target
 svn_txdelta_new = _delta.svn_txdelta_new
-class svn_txdelta_op_t:
+class svn_txdelta_op_t(object):
     """Proxy of C svn_txdelta_op_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_txdelta_op_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_txdelta_op_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["action_code"] = _delta.svn_txdelta_op_t_action_code_set
-    __swig_getmethods__["action_code"] = _delta.svn_txdelta_op_t_action_code_get
-    __swig_setmethods__["offset"] = _delta.svn_txdelta_op_t_offset_set
-    __swig_getmethods__["offset"] = _delta.svn_txdelta_op_t_offset_get
-    __swig_setmethods__["length"] = _delta.svn_txdelta_op_t_length_set
-    __swig_getmethods__["length"] = _delta.svn_txdelta_op_t_length_get
+    action_code = _swig_property(_delta.svn_txdelta_op_t_action_code_get, _delta.svn_txdelta_op_t_action_code_set)
+    offset = _swig_property(_delta.svn_txdelta_op_t_offset_get, _delta.svn_txdelta_op_t_offset_set)
+    length = _swig_property(_delta.svn_txdelta_op_t_length_get, _delta.svn_txdelta_op_t_length_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -152,23 +183,57 @@ class svn_txdelta_op_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -178,7 +243,7 @@ class svn_txdelta_op_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -193,27 +258,19 @@ class svn_txdelta_op_t:
 svn_txdelta_op_t_swigregister = _delta.svn_txdelta_op_t_swigregister
 svn_txdelta_op_t_swigregister(svn_txdelta_op_t)
 
-class svn_txdelta_window_t:
+class svn_txdelta_window_t(object):
     """Proxy of C svn_txdelta_window_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_txdelta_window_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_txdelta_window_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["sview_offset"] = _delta.svn_txdelta_window_t_sview_offset_set
-    __swig_getmethods__["sview_offset"] = _delta.svn_txdelta_window_t_sview_offset_get
-    __swig_setmethods__["sview_len"] = _delta.svn_txdelta_window_t_sview_len_set
-    __swig_getmethods__["sview_len"] = _delta.svn_txdelta_window_t_sview_len_get
-    __swig_setmethods__["tview_len"] = _delta.svn_txdelta_window_t_tview_len_set
-    __swig_getmethods__["tview_len"] = _delta.svn_txdelta_window_t_tview_len_get
-    __swig_setmethods__["num_ops"] = _delta.svn_txdelta_window_t_num_ops_set
-    __swig_getmethods__["num_ops"] = _delta.svn_txdelta_window_t_num_ops_get
-    __swig_setmethods__["src_ops"] = _delta.svn_txdelta_window_t_src_ops_set
-    __swig_getmethods__["src_ops"] = _delta.svn_txdelta_window_t_src_ops_get
-    __swig_getmethods__["new_data"] = _delta.svn_txdelta_window_t_new_data_get
-
-    def _ops_get(self):
+    sview_offset = _swig_property(_delta.svn_txdelta_window_t_sview_offset_get, _delta.svn_txdelta_window_t_sview_offset_set)
+    sview_len = _swig_property(_delta.svn_txdelta_window_t_sview_len_get, _delta.svn_txdelta_window_t_sview_len_set)
+    tview_len = _swig_property(_delta.svn_txdelta_window_t_tview_len_get, _delta.svn_txdelta_window_t_tview_len_set)
+    num_ops = _swig_property(_delta.svn_txdelta_window_t_num_ops_get, _delta.svn_txdelta_window_t_num_ops_set)
+    src_ops = _swig_property(_delta.svn_txdelta_window_t_src_ops_get, _delta.svn_txdelta_window_t_src_ops_set)
+    new_data = _swig_property(_delta.svn_txdelta_window_t_new_data_get)
+
+    def _ops_get(self) -> "void":
         """_ops_get(svn_txdelta_window_t self)"""
         return _delta.svn_txdelta_window_t__ops_get(self)
 
@@ -234,23 +291,57 @@ class svn_txdelta_window_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -260,7 +351,7 @@ class svn_txdelta_window_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -276,135 +367,115 @@ svn_txdelta_window_t_swigregister = _delta.svn_txdelta_window_t_swigregister
 svn_txdelta_window_t_swigregister(svn_txdelta_window_t)
 
 
-def svn_txdelta_window_dup(*args):
+def svn_txdelta_window_dup(*args) -> "svn_txdelta_window_t *":
     """svn_txdelta_window_dup(svn_txdelta_window_t window, apr_pool_t pool) -> svn_txdelta_window_t"""
     return _delta.svn_txdelta_window_dup(*args)
 
-def svn_txdelta_compose_windows(*args):
+def svn_txdelta_compose_windows(*args) -> "svn_txdelta_window_t *":
     """svn_txdelta_compose_windows(svn_txdelta_window_t window_A, svn_txdelta_window_t window_B, apr_pool_t pool) -> svn_txdelta_window_t"""
     return _delta.svn_txdelta_compose_windows(*args)
 
-def svn_txdelta_apply_instructions(window, sbuf, tbuf):
+def svn_txdelta_apply_instructions(window: 'svn_txdelta_window_t', sbuf: 'char const *', tbuf: 'char *') -> "apr_size_t *":
     """svn_txdelta_apply_instructions(svn_txdelta_window_t window, char const * sbuf, char * tbuf)"""
     return _delta.svn_txdelta_apply_instructions(window, sbuf, tbuf)
 
-def svn_txdelta_run(*args):
+def svn_txdelta_run(*args) -> "svn_checksum_t **":
     """svn_txdelta_run(svn_stream_t * source, svn_stream_t * target, svn_txdelta_window_handler_t handler, void * handler_baton, svn_checksum_kind_t checksum_kind, svn_cancel_func_t cancel_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_txdelta_run(*args)
 
-def svn_txdelta_stream_create(*args):
+def svn_txdelta_stream_create(*args) -> "svn_txdelta_stream_t *":
     """svn_txdelta_stream_create(void * baton, svn_txdelta_next_window_fn_t next_window, svn_txdelta_md5_digest_fn_t md5_digest, apr_pool_t pool) -> svn_txdelta_stream_t *"""
     return _delta.svn_txdelta_stream_create(*args)
 
-def svn_txdelta_next_window(*args):
+def svn_txdelta_next_window(*args) -> "svn_txdelta_window_t **":
     """svn_txdelta_next_window(svn_txdelta_stream_t * stream, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_txdelta_next_window(*args)
 
-def svn_txdelta_md5_digest(stream):
+def svn_txdelta_md5_digest(stream: 'svn_txdelta_stream_t *') -> "unsigned char const *":
     """svn_txdelta_md5_digest(svn_txdelta_stream_t * stream) -> unsigned char const *"""
     return _delta.svn_txdelta_md5_digest(stream)
 
-def svn_txdelta2(*args):
+def svn_txdelta2(*args) -> "svn_txdelta_stream_t **":
     """svn_txdelta2(svn_stream_t * source, svn_stream_t * target, svn_boolean_t calculate_checksum, apr_pool_t pool)"""
     return _delta.svn_txdelta2(*args)
 
-def svn_txdelta(*args):
+def svn_txdelta(*args) -> "svn_txdelta_stream_t **":
     """svn_txdelta(svn_stream_t * source, svn_stream_t * target, apr_pool_t pool)"""
     return _delta.svn_txdelta(*args)
 
-def svn_txdelta_target_push(*args):
+def svn_txdelta_target_push(*args) -> "svn_stream_t *":
     """svn_txdelta_target_push(svn_txdelta_window_handler_t handler, void * handler_baton, svn_stream_t * source, apr_pool_t pool) -> svn_stream_t *"""
     return _delta.svn_txdelta_target_push(*args)
 
-def svn_txdelta_send_string(*args):
+def svn_txdelta_send_string(*args) -> "svn_error_t *":
     """svn_txdelta_send_string(svn_string_t const * string, svn_txdelta_window_handler_t handler, void * handler_baton, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_txdelta_send_string(*args)
 
-def svn_txdelta_send_stream(*args):
+def svn_txdelta_send_stream(*args) -> "unsigned char *":
     """svn_txdelta_send_stream(svn_stream_t * stream, svn_txdelta_window_handler_t handler, void * handler_baton, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_txdelta_send_stream(*args)
 
-def svn_txdelta_send_txstream(*args):
+def svn_txdelta_send_txstream(*args) -> "svn_error_t *":
     """svn_txdelta_send_txstream(svn_txdelta_stream_t * txstream, svn_txdelta_window_handler_t handler, void * handler_baton, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_txdelta_send_txstream(*args)
 
-def svn_txdelta_send_contents(*args):
+def svn_txdelta_send_contents(*args) -> "svn_error_t *":
     """svn_txdelta_send_contents(unsigned char const * contents, apr_size_t len, svn_txdelta_window_handler_t handler, void * handler_baton, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_txdelta_send_contents(*args)
 
-def svn_txdelta_apply(*args):
+def svn_txdelta_apply(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_txdelta_apply(svn_stream_t * source, svn_stream_t * target, char const * error_info, apr_pool_t pool)"""
     return _delta.svn_txdelta_apply(*args)
 
-def svn_txdelta_to_svndiff3(*args):
+def svn_txdelta_to_svndiff3(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_txdelta_to_svndiff3(svn_stream_t * output, int svndiff_version, int compression_level, apr_pool_t pool)"""
     return _delta.svn_txdelta_to_svndiff3(*args)
 
-def svn_txdelta_to_svndiff2(*args):
+def svn_txdelta_to_svndiff2(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_txdelta_to_svndiff2(svn_stream_t * output, int svndiff_version, apr_pool_t pool)"""
     return _delta.svn_txdelta_to_svndiff2(*args)
 
-def svn_txdelta_to_svndiff(*args):
+def svn_txdelta_to_svndiff(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_txdelta_to_svndiff(svn_stream_t * output, apr_pool_t pool)"""
     return _delta.svn_txdelta_to_svndiff(*args)
 
-def svn_txdelta_to_svndiff_stream(*args):
+def svn_txdelta_to_svndiff_stream(*args) -> "svn_stream_t *":
     """svn_txdelta_to_svndiff_stream(svn_txdelta_stream_t * txstream, int svndiff_version, int compression_level, apr_pool_t pool) -> svn_stream_t *"""
     return _delta.svn_txdelta_to_svndiff_stream(*args)
 
-def svn_txdelta_parse_svndiff(*args):
+def svn_txdelta_parse_svndiff(*args) -> "svn_stream_t *":
     """svn_txdelta_parse_svndiff(svn_txdelta_window_handler_t handler, void * handler_baton, svn_boolean_t error_on_early_close, apr_pool_t pool) -> svn_stream_t *"""
     return _delta.svn_txdelta_parse_svndiff(*args)
 
-def svn_txdelta_read_svndiff_window(*args):
+def svn_txdelta_read_svndiff_window(*args) -> "svn_txdelta_window_t **":
     """svn_txdelta_read_svndiff_window(svn_stream_t * stream, int svndiff_version, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_txdelta_read_svndiff_window(*args)
 
-def svn_txdelta_skip_svndiff_window(*args):
+def svn_txdelta_skip_svndiff_window(*args) -> "svn_error_t *":
     """svn_txdelta_skip_svndiff_window(apr_file_t file, int svndiff_version, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_txdelta_skip_svndiff_window(*args)
-class svn_delta_editor_t:
+class svn_delta_editor_t(object):
     """Proxy of C svn_delta_editor_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_delta_editor_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_delta_editor_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["set_target_revision"] = _delta.svn_delta_editor_t_set_target_revision_set
-    __swig_getmethods__["set_target_revision"] = _delta.svn_delta_editor_t_set_target_revision_get
-    __swig_setmethods__["open_root"] = _delta.svn_delta_editor_t_open_root_set
-    __swig_getmethods__["open_root"] = _delta.svn_delta_editor_t_open_root_get
-    __swig_setmethods__["delete_entry"] = _delta.svn_delta_editor_t_delete_entry_set
-    __swig_getmethods__["delete_entry"] = _delta.svn_delta_editor_t_delete_entry_get
-    __swig_setmethods__["add_directory"] = _delta.svn_delta_editor_t_add_directory_set
-    __swig_getmethods__["add_directory"] = _delta.svn_delta_editor_t_add_directory_get
-    __swig_setmethods__["open_directory"] = _delta.svn_delta_editor_t_open_directory_set
-    __swig_getmethods__["open_directory"] = _delta.svn_delta_editor_t_open_directory_get
-    __swig_setmethods__["change_dir_prop"] = _delta.svn_delta_editor_t_change_dir_prop_set
-    __swig_getmethods__["change_dir_prop"] = _delta.svn_delta_editor_t_change_dir_prop_get
-    __swig_setmethods__["close_directory"] = _delta.svn_delta_editor_t_close_directory_set
-    __swig_getmethods__["close_directory"] = _delta.svn_delta_editor_t_close_directory_get
-    __swig_setmethods__["absent_directory"] = _delta.svn_delta_editor_t_absent_directory_set
-    __swig_getmethods__["absent_directory"] = _delta.svn_delta_editor_t_absent_directory_get
-    __swig_setmethods__["add_file"] = _delta.svn_delta_editor_t_add_file_set
-    __swig_getmethods__["add_file"] = _delta.svn_delta_editor_t_add_file_get
-    __swig_setmethods__["open_file"] = _delta.svn_delta_editor_t_open_file_set
-    __swig_getmethods__["open_file"] = _delta.svn_delta_editor_t_open_file_get
-    __swig_setmethods__["apply_textdelta"] = _delta.svn_delta_editor_t_apply_textdelta_set
-    __swig_getmethods__["apply_textdelta"] = _delta.svn_delta_editor_t_apply_textdelta_get
-    __swig_setmethods__["change_file_prop"] = _delta.svn_delta_editor_t_change_file_prop_set
-    __swig_getmethods__["change_file_prop"] = _delta.svn_delta_editor_t_change_file_prop_get
-    __swig_setmethods__["close_file"] = _delta.svn_delta_editor_t_close_file_set
-    __swig_getmethods__["close_file"] = _delta.svn_delta_editor_t_close_file_get
-    __swig_setmethods__["absent_file"] = _delta.svn_delta_editor_t_absent_file_set
-    __swig_getmethods__["absent_file"] = _delta.svn_delta_editor_t_absent_file_get
-    __swig_setmethods__["close_edit"] = _delta.svn_delta_editor_t_close_edit_set
-    __swig_getmethods__["close_edit"] = _delta.svn_delta_editor_t_close_edit_get
-    __swig_setmethods__["abort_edit"] = _delta.svn_delta_editor_t_abort_edit_set
-    __swig_getmethods__["abort_edit"] = _delta.svn_delta_editor_t_abort_edit_get
-    __swig_setmethods__["apply_textdelta_stream"] = _delta.svn_delta_editor_t_apply_textdelta_stream_set
-    __swig_getmethods__["apply_textdelta_stream"] = _delta.svn_delta_editor_t_apply_textdelta_stream_get
+    set_target_revision = _swig_property(_delta.svn_delta_editor_t_set_target_revision_get, _delta.svn_delta_editor_t_set_target_revision_set)
+    open_root = _swig_property(_delta.svn_delta_editor_t_open_root_get, _delta.svn_delta_editor_t_open_root_set)
+    delete_entry = _swig_property(_delta.svn_delta_editor_t_delete_entry_get, _delta.svn_delta_editor_t_delete_entry_set)
+    add_directory = _swig_property(_delta.svn_delta_editor_t_add_directory_get, _delta.svn_delta_editor_t_add_directory_set)
+    open_directory = _swig_property(_delta.svn_delta_editor_t_open_directory_get, _delta.svn_delta_editor_t_open_directory_set)
+    change_dir_prop = _swig_property(_delta.svn_delta_editor_t_change_dir_prop_get, _delta.svn_delta_editor_t_change_dir_prop_set)
+    close_directory = _swig_property(_delta.svn_delta_editor_t_close_directory_get, _delta.svn_delta_editor_t_close_directory_set)
+    absent_directory = _swig_property(_delta.svn_delta_editor_t_absent_directory_get, _delta.svn_delta_editor_t_absent_directory_set)
+    add_file = _swig_property(_delta.svn_delta_editor_t_add_file_get, _delta.svn_delta_editor_t_add_file_set)
+    open_file = _swig_property(_delta.svn_delta_editor_t_open_file_get, _delta.svn_delta_editor_t_open_file_set)
+    apply_textdelta = _swig_property(_delta.svn_delta_editor_t_apply_textdelta_get, _delta.svn_delta_editor_t_apply_textdelta_set)
+    change_file_prop = _swig_property(_delta.svn_delta_editor_t_change_file_prop_get, _delta.svn_delta_editor_t_change_file_prop_set)
+    close_file = _swig_property(_delta.svn_delta_editor_t_close_file_get, _delta.svn_delta_editor_t_close_file_set)
+    absent_file = _swig_property(_delta.svn_delta_editor_t_absent_file_get, _delta.svn_delta_editor_t_absent_file_set)
+    close_edit = _swig_property(_delta.svn_delta_editor_t_close_edit_get, _delta.svn_delta_editor_t_close_edit_set)
+    abort_edit = _swig_property(_delta.svn_delta_editor_t_abort_edit_get, _delta.svn_delta_editor_t_abort_edit_set)
+    apply_textdelta_stream = _swig_property(_delta.svn_delta_editor_t_apply_textdelta_stream_get, _delta.svn_delta_editor_t_apply_textdelta_stream_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -419,23 +490,57 @@ class svn_delta_editor_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -445,7 +550,7 @@ class svn_delta_editor_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def set_target_revision(self, *args):
@@ -529,56 +634,53 @@ svn_delta_editor_t_swigregister = _delta.svn_delta_editor_t_swigregister
 svn_delta_editor_t_swigregister(svn_delta_editor_t)
 
 
-def svn_delta_default_editor(*args):
+def svn_delta_default_editor(*args) -> "svn_delta_editor_t *":
     """svn_delta_default_editor(apr_pool_t pool) -> svn_delta_editor_t"""
     return _delta.svn_delta_default_editor(*args)
 
-def svn_delta_noop_window_handler(window, baton):
+def svn_delta_noop_window_handler(window: 'svn_txdelta_window_t', baton: 'void *') -> "svn_error_t *":
     """svn_delta_noop_window_handler(svn_txdelta_window_t window, void * baton) -> svn_error_t"""
     return _delta.svn_delta_noop_window_handler(window, baton)
 
-def svn_delta_get_cancellation_editor(*args):
+def svn_delta_get_cancellation_editor(*args) -> "svn_delta_editor_t const **, void **":
     """svn_delta_get_cancellation_editor(svn_cancel_func_t cancel_func, svn_delta_editor_t wrapped_editor, void * wrapped_baton, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_delta_get_cancellation_editor(*args)
 
-def svn_delta_depth_filter_editor(*args):
+def svn_delta_depth_filter_editor(*args) -> "svn_delta_editor_t const **, void **":
     """svn_delta_depth_filter_editor(svn_delta_editor_t wrapped_editor, void * wrapped_edit_baton, svn_depth_t requested_depth, svn_boolean_t has_target, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_delta_depth_filter_editor(*args)
 
-def svn_delta_path_driver3(*args):
+def svn_delta_path_driver3(*args) -> "svn_error_t *":
     """svn_delta_path_driver3(svn_delta_editor_t editor, void * edit_baton, apr_array_header_t relpaths, svn_boolean_t sort_paths, svn_delta_path_driver_cb_func2_t callback_func, void * callback_baton, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_delta_path_driver3(*args)
 
-def svn_delta_path_driver2(*args):
+def svn_delta_path_driver2(*args) -> "svn_error_t *":
     """svn_delta_path_driver2(svn_delta_editor_t editor, void * edit_baton, apr_array_header_t paths, svn_boolean_t sort_paths, svn_delta_path_driver_cb_func_t callback_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_path_driver2(*args)
 
-def svn_delta_path_driver(*args):
+def svn_delta_path_driver(*args) -> "svn_error_t *":
     """svn_delta_path_driver(svn_delta_editor_t editor, void * edit_baton, svn_revnum_t revision, apr_array_header_t paths, svn_delta_path_driver_cb_func_t callback_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_path_driver(*args)
 
-def svn_delta_path_driver_start(*args):
+def svn_delta_path_driver_start(*args) -> "SWIGTYPE **":
     """svn_delta_path_driver_start(svn_delta_editor_t editor, void * edit_baton, svn_delta_path_driver_cb_func2_t callback_func, void * callback_baton, apr_pool_t result_pool) -> svn_error_t"""
     return _delta.svn_delta_path_driver_start(*args)
 
-def svn_delta_path_driver_step(*args):
+def svn_delta_path_driver_step(*args) -> "svn_error_t *":
     """svn_delta_path_driver_step(svn_delta_path_driver_state_t * state, char const * relpath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_path_driver_step(*args)
 
-def svn_delta_path_driver_finish(*args):
+def svn_delta_path_driver_finish(*args) -> "svn_error_t *":
     """svn_delta_path_driver_finish(svn_delta_path_driver_state_t * state, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_path_driver_finish(*args)
 
-def svn_compat_wrap_file_rev_handler(*args):
+def svn_compat_wrap_file_rev_handler(*args) -> "svn_file_rev_handler_t *, void **":
     """svn_compat_wrap_file_rev_handler(svn_file_rev_handler_old_t handler, void * handler_baton, apr_pool_t pool)"""
     return _delta.svn_compat_wrap_file_rev_handler(*args)
-class svn_txdelta_stream_t:
+class svn_txdelta_stream_t(object):
     """Proxy of C svn_txdelta_stream_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_txdelta_stream_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_txdelta_stream_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -597,23 +699,57 @@ class svn_txdelta_stream_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -623,18 +759,15 @@ class svn_txdelta_stream_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_txdelta_stream_t_swigregister = _delta.svn_txdelta_stream_t_swigregister
 svn_txdelta_stream_t_swigregister(svn_txdelta_stream_t)
 
-class svn_delta_path_driver_state_t:
+class svn_delta_path_driver_state_t(object):
     """Proxy of C svn_delta_path_driver_state_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_delta_path_driver_state_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_delta_path_driver_state_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -653,23 +786,57 @@ class svn_delta_path_driver_state_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -679,118 +846,115 @@ class svn_delta_path_driver_state_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_delta_path_driver_state_t_swigregister = _delta.svn_delta_path_driver_state_t_swigregister
 svn_delta_path_driver_state_t_swigregister(svn_delta_path_driver_state_t)
 
 
-def svn_delta_editor_invoke_set_target_revision(*args):
+def svn_delta_editor_invoke_set_target_revision(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_set_target_revision(svn_delta_editor_t _obj, void * edit_baton, svn_revnum_t target_revision, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_set_target_revision(*args)
 
-def svn_delta_editor_invoke_open_root(*args):
+def svn_delta_editor_invoke_open_root(*args) -> "void **":
     """svn_delta_editor_invoke_open_root(svn_delta_editor_t _obj, void * edit_baton, svn_revnum_t base_revision, apr_pool_t result_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_open_root(*args)
 
-def svn_delta_editor_invoke_delete_entry(*args):
+def svn_delta_editor_invoke_delete_entry(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_delete_entry(svn_delta_editor_t _obj, char const * path, svn_revnum_t revision, void * parent_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_delete_entry(*args)
 
-def svn_delta_editor_invoke_add_directory(*args):
+def svn_delta_editor_invoke_add_directory(*args) -> "void **":
     """svn_delta_editor_invoke_add_directory(svn_delta_editor_t _obj, char const * path, void * parent_baton, char const * copyfrom_path, svn_revnum_t copyfrom_revision, apr_pool_t result_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_add_directory(*args)
 
-def svn_delta_editor_invoke_open_directory(*args):
+def svn_delta_editor_invoke_open_directory(*args) -> "void **":
     """svn_delta_editor_invoke_open_directory(svn_delta_editor_t _obj, char const * path, void * parent_baton, svn_revnum_t base_revision, apr_pool_t result_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_open_directory(*args)
 
-def svn_delta_editor_invoke_change_dir_prop(*args):
+def svn_delta_editor_invoke_change_dir_prop(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_change_dir_prop(svn_delta_editor_t _obj, void * dir_baton, char const * name, svn_string_t const * value, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_change_dir_prop(*args)
 
-def svn_delta_editor_invoke_close_directory(*args):
+def svn_delta_editor_invoke_close_directory(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_close_directory(svn_delta_editor_t _obj, void * dir_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_close_directory(*args)
 
-def svn_delta_editor_invoke_absent_directory(*args):
+def svn_delta_editor_invoke_absent_directory(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_absent_directory(svn_delta_editor_t _obj, char const * path, void * parent_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_absent_directory(*args)
 
-def svn_delta_editor_invoke_add_file(*args):
+def svn_delta_editor_invoke_add_file(*args) -> "void **":
     """svn_delta_editor_invoke_add_file(svn_delta_editor_t _obj, char const * path, void * parent_baton, char const * copyfrom_path, svn_revnum_t copyfrom_revision, apr_pool_t result_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_add_file(*args)
 
-def svn_delta_editor_invoke_open_file(*args):
+def svn_delta_editor_invoke_open_file(*args) -> "void **":
     """svn_delta_editor_invoke_open_file(svn_delta_editor_t _obj, char const * path, void * parent_baton, svn_revnum_t base_revision, apr_pool_t result_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_open_file(*args)
 
-def svn_delta_editor_invoke_apply_textdelta(*args):
+def svn_delta_editor_invoke_apply_textdelta(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_delta_editor_invoke_apply_textdelta(svn_delta_editor_t _obj, void * file_baton, char const * base_checksum, apr_pool_t result_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_apply_textdelta(*args)
 
-def svn_delta_editor_invoke_change_file_prop(*args):
+def svn_delta_editor_invoke_change_file_prop(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_change_file_prop(svn_delta_editor_t _obj, void * file_baton, char const * name, svn_string_t const * value, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_change_file_prop(*args)
 
-def svn_delta_editor_invoke_close_file(*args):
+def svn_delta_editor_invoke_close_file(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_close_file(svn_delta_editor_t _obj, void * file_baton, char const * text_checksum, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_close_file(*args)
 
-def svn_delta_editor_invoke_absent_file(*args):
+def svn_delta_editor_invoke_absent_file(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_absent_file(svn_delta_editor_t _obj, char const * path, void * parent_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_absent_file(*args)
 
-def svn_delta_editor_invoke_close_edit(*args):
+def svn_delta_editor_invoke_close_edit(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_close_edit(svn_delta_editor_t _obj, void * edit_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_close_edit(*args)
 
-def svn_delta_editor_invoke_abort_edit(*args):
+def svn_delta_editor_invoke_abort_edit(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_abort_edit(svn_delta_editor_t _obj, void * edit_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_abort_edit(*args)
 
-def svn_delta_editor_invoke_apply_textdelta_stream(*args):
+def svn_delta_editor_invoke_apply_textdelta_stream(*args) -> "svn_error_t *":
     """svn_delta_editor_invoke_apply_textdelta_stream(svn_delta_editor_t _obj, svn_delta_editor_t editor, void * file_baton, char const * base_checksum, svn_txdelta_stream_open_func_t open_func, void * open_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_delta_editor_invoke_apply_textdelta_stream(*args)
 
-def svn_txdelta_invoke_window_handler(_obj, window, baton):
+def svn_txdelta_invoke_window_handler(_obj: 'svn_txdelta_window_handler_t', window: 'svn_txdelta_window_t', baton: 'void *') -> "svn_error_t *":
     """svn_txdelta_invoke_window_handler(svn_txdelta_window_handler_t _obj, svn_txdelta_window_t window, void * baton) -> svn_error_t"""
     return _delta.svn_txdelta_invoke_window_handler(_obj, window, baton)
 
-def svn_txdelta_invoke_next_window_fn(*args):
+def svn_txdelta_invoke_next_window_fn(*args) -> "svn_txdelta_window_t **":
     """svn_txdelta_invoke_next_window_fn(svn_txdelta_next_window_fn_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_txdelta_invoke_next_window_fn(*args)
 
-def svn_txdelta_invoke_md5_digest_fn(_obj, baton):
+def svn_txdelta_invoke_md5_digest_fn(_obj: 'svn_txdelta_md5_digest_fn_t', baton: 'void *') -> "unsigned char const *":
     """svn_txdelta_invoke_md5_digest_fn(svn_txdelta_md5_digest_fn_t _obj, void * baton) -> unsigned char const *"""
     return _delta.svn_txdelta_invoke_md5_digest_fn(_obj, baton)
 
-def svn_txdelta_invoke_stream_open_func(*args):
+def svn_txdelta_invoke_stream_open_func(*args) -> "svn_txdelta_stream_t **":
     """svn_txdelta_invoke_stream_open_func(svn_txdelta_stream_open_func_t _obj, void * baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _delta.svn_txdelta_invoke_stream_open_func(*args)
 
-def svn_delta_invoke_path_driver_cb_func2(*args):
+def svn_delta_invoke_path_driver_cb_func2(*args) -> "void **":
     """svn_delta_invoke_path_driver_cb_func2(svn_delta_path_driver_cb_func2_t _obj, svn_delta_editor_t editor, void * edit_baton, void * parent_baton, void * callback_baton, char const * relpath, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_delta_invoke_path_driver_cb_func2(*args)
 
-def svn_delta_invoke_path_driver_cb_func(*args):
+def svn_delta_invoke_path_driver_cb_func(*args) -> "void **":
     """svn_delta_invoke_path_driver_cb_func(svn_delta_path_driver_cb_func_t _obj, void * parent_baton, void * callback_baton, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_delta_invoke_path_driver_cb_func(*args)
 
-def svn_file_invoke_rev_handler(*args):
+def svn_file_invoke_rev_handler(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_file_invoke_rev_handler(svn_file_rev_handler_t _obj, void * baton, char const * path, svn_revnum_t rev, apr_hash_t rev_props, svn_boolean_t result_of_merge, apr_array_header_t prop_diffs, apr_pool_t pool) -> svn_error_t"""
     return _delta.svn_file_invoke_rev_handler(*args)
 
-def svn_file_invoke_rev_handler_old(*args):
+def svn_file_invoke_rev_handler_old(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_file_invoke_rev_handler_old(svn_file_rev_handler_old_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 _delta.svn_file_invoke_rev_handler_old(*args)
-class svn_txdelta_window_handler_t:
+class svn_txdelta_window_handler_t(object):
     """Proxy of C svn_txdelta_window_handler_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_txdelta_window_handler_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_txdelta_window_handler_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -809,23 +973,57 @@ class svn_txdelta_window_handler_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -835,7 +1033,7 @@ class svn_txdelta_window_handler_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -844,13 +1042,10 @@ class svn_txdelta_window_handler_t:
 svn_txdelta_window_handler_t_swigregister = _delta.svn_txdelta_window_handler_t_swigregister
 svn_txdelta_window_handler_t_swigregister(svn_txdelta_window_handler_t)
 
-class svn_txdelta_next_window_fn_t:
+class svn_txdelta_next_window_fn_t(object):
     """Proxy of C svn_txdelta_next_window_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_txdelta_next_window_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_txdelta_next_window_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -869,23 +1064,57 @@ class svn_txdelta_next_window_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -895,7 +1124,7 @@ class svn_txdelta_next_window_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -904,13 +1133,10 @@ class svn_txdelta_next_window_fn_t:
 svn_txdelta_next_window_fn_t_swigregister = _delta.svn_txdelta_next_window_fn_t_swigregister
 svn_txdelta_next_window_fn_t_swigregister(svn_txdelta_next_window_fn_t)
 
-class svn_txdelta_md5_digest_fn_t:
+class svn_txdelta_md5_digest_fn_t(object):
     """Proxy of C svn_txdelta_md5_digest_fn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_txdelta_md5_digest_fn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_txdelta_md5_digest_fn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -929,23 +1155,57 @@ class svn_txdelta_md5_digest_fn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -955,7 +1215,7 @@ class svn_txdelta_md5_digest_fn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -964,13 +1224,10 @@ class svn_txdelta_md5_digest_fn_t:
 svn_txdelta_md5_digest_fn_t_swigregister = _delta.svn_txdelta_md5_digest_fn_t_swigregister
 svn_txdelta_md5_digest_fn_t_swigregister(svn_txdelta_md5_digest_fn_t)
 
-class svn_txdelta_stream_open_func_t:
+class svn_txdelta_stream_open_func_t(object):
     """Proxy of C svn_txdelta_stream_open_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_txdelta_stream_open_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_txdelta_stream_open_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -989,23 +1246,57 @@ class svn_txdelta_stream_open_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1015,7 +1306,7 @@ class svn_txdelta_stream_open_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1024,13 +1315,10 @@ class svn_txdelta_stream_open_func_t:
 svn_txdelta_stream_open_func_t_swigregister = _delta.svn_txdelta_stream_open_func_t_swigregister
 svn_txdelta_stream_open_func_t_swigregister(svn_txdelta_stream_open_func_t)
 
-class svn_delta_path_driver_cb_func2_t:
+class svn_delta_path_driver_cb_func2_t(object):
     """Proxy of C svn_delta_path_driver_cb_func2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_delta_path_driver_cb_func2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_delta_path_driver_cb_func2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1049,23 +1337,57 @@ class svn_delta_path_driver_cb_func2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1075,7 +1397,7 @@ class svn_delta_path_driver_cb_func2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1084,13 +1406,10 @@ class svn_delta_path_driver_cb_func2_t:
 svn_delta_path_driver_cb_func2_t_swigregister = _delta.svn_delta_path_driver_cb_func2_t_swigregister
 svn_delta_path_driver_cb_func2_t_swigregister(svn_delta_path_driver_cb_func2_t)
 
-class svn_delta_path_driver_cb_func_t:
+class svn_delta_path_driver_cb_func_t(object):
     """Proxy of C svn_delta_path_driver_cb_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_delta_path_driver_cb_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_delta_path_driver_cb_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1109,23 +1428,57 @@ class svn_delta_path_driver_cb_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1135,7 +1488,7 @@ class svn_delta_path_driver_cb_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1144,13 +1497,10 @@ class svn_delta_path_driver_cb_func_t:
 svn_delta_path_driver_cb_func_t_swigregister = _delta.svn_delta_path_driver_cb_func_t_swigregister
 svn_delta_path_driver_cb_func_t_swigregister(svn_delta_path_driver_cb_func_t)
 
-class svn_file_rev_handler_t:
+class svn_file_rev_handler_t(object):
     """Proxy of C svn_file_rev_handler_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_file_rev_handler_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_file_rev_handler_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1169,23 +1519,57 @@ class svn_file_rev_handler_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1195,7 +1579,7 @@ class svn_file_rev_handler_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1204,13 +1588,10 @@ class svn_file_rev_handler_t:
 svn_file_rev_handler_t_swigregister = _delta.svn_file_rev_handler_t_swigregister
 svn_file_rev_handler_t_swigregister(svn_file_rev_handler_t)
 
-class svn_file_rev_handler_old_t:
+class svn_file_rev_handler_old_t(object):
     """Proxy of C svn_file_rev_handler_old_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_file_rev_handler_old_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_file_rev_handler_old_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1229,23 +1610,57 @@ class svn_file_rev_handler_old_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1255,7 +1670,7 @@ class svn_file_rev_handler_old_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
diff --git a/subversion/bindings/swig/python/diff.py b/subversion/bindings/swig/python/diff.py
index b63e070..34203cb 100644
--- a/subversion/bindings/swig/python/diff.py
+++ b/subversion/bindings/swig/python/diff.py
@@ -39,6 +39,11 @@ else:
 del _swig_python_version_info
 
 try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
@@ -54,7 +59,7 @@ def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
     if method:
         return method(self, value)
     if (not static):
-        self.__dict__[name] = value
+        object.__setattr__(self, name, value)
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
 
@@ -80,14 +85,26 @@ def _swig_repr(self):
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self, name, value):
+        if (name == "thisown"):
+            return self.this.own(value)
+        if hasattr(self, name) or (name == "this"):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
+
 def _copy_metadata_deep(value, old_value):
   """Copy all attributes of old_value into value, recursively traversing
   lists and dicts if needed."""
   if value is None or old_value is None or value is old_value: return
 
   if isinstance(value, dict):
-    for k, v in value.iteritems():
-      _copy_metadata_deep(v, old_value[k])
+    for k in value:
+      _copy_metadata_deep(value[k], old_value[k])
   elif isinstance(value, list):
     for v, old_v in zip(value, old_value):
       _copy_metadata_deep(v, old_v)
@@ -100,44 +117,55 @@ def _copy_metadata_deep(value, old_value):
 def _assert_valid_deep(value):
   """Assert value's validity, recursively traversing lists and dicts."""
   if isinstance(value, dict):
-    for v in value.itervalues():
-      _assert_valid_deep(v)
+    for k in value:
+      _assert_valid_deep(value[k])
   elif isinstance(value, list):
     for v in value:
       _assert_valid_deep(v)
-  else:
-    if hasattr(value, "assert_valid"):
-      value.assert_valid()
+# Ensure that the passed in value isn't a type, which could have an
+# assert_valid attribute, but it can not be called without an instance.
+  elif type(value) != type:
+    try:
+      fn = value.assert_valid
+    except AttributeError:
+      pass
+    else:
+      fn()
+
+
+
+  # SWIG classes generated with -modern do not define this variable
+try:
+  _newclass
+except NameError:
+  _newclass = 1
+else:
+  raise RuntimeError("Require -modern option, but _newclass is defined")
+
+_get_instance_attr = object.__getattribute__
+_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 
 import libsvn.core
 
-def svn_diff_version():
+def svn_diff_version() -> "svn_version_t const *":
     """svn_diff_version() -> svn_version_t const *"""
     return _diff.svn_diff_version()
 svn_diff_datasource_original = _diff.svn_diff_datasource_original
 svn_diff_datasource_modified = _diff.svn_diff_datasource_modified
 svn_diff_datasource_latest = _diff.svn_diff_datasource_latest
 svn_diff_datasource_ancestor = _diff.svn_diff_datasource_ancestor
-class svn_diff_fns2_t:
+class svn_diff_fns2_t(object):
     """Proxy of C svn_diff_fns2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_diff_fns2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_diff_fns2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["datasources_open"] = _diff.svn_diff_fns2_t_datasources_open_set
-    __swig_getmethods__["datasources_open"] = _diff.svn_diff_fns2_t_datasources_open_get
-    __swig_setmethods__["datasource_close"] = _diff.svn_diff_fns2_t_datasource_close_set
-    __swig_getmethods__["datasource_close"] = _diff.svn_diff_fns2_t_datasource_close_get
-    __swig_setmethods__["datasource_get_next_token"] = _diff.svn_diff_fns2_t_datasource_get_next_token_set
-    __swig_getmethods__["datasource_get_next_token"] = _diff.svn_diff_fns2_t_datasource_get_next_token_get
-    __swig_setmethods__["token_compare"] = _diff.svn_diff_fns2_t_token_compare_set
-    __swig_getmethods__["token_compare"] = _diff.svn_diff_fns2_t_token_compare_get
-    __swig_setmethods__["token_discard"] = _diff.svn_diff_fns2_t_token_discard_set
-    __swig_getmethods__["token_discard"] = _diff.svn_diff_fns2_t_token_discard_get
-    __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
+    datasources_open = _swig_property(_diff.svn_diff_fns2_t_datasources_open_get, _diff.svn_diff_fns2_t_datasources_open_set)
+    datasource_close = _swig_property(_diff.svn_diff_fns2_t_datasource_close_get, _diff.svn_diff_fns2_t_datasource_close_set)
+    datasource_get_next_token = _swig_property(_diff.svn_diff_fns2_t_datasource_get_next_token_get, _diff.svn_diff_fns2_t_datasource_get_next_token_set)
+    token_compare = _swig_property(_diff.svn_diff_fns2_t_token_compare_get, _diff.svn_diff_fns2_t_token_compare_set)
+    token_discard = _swig_property(_diff.svn_diff_fns2_t_token_discard_get, _diff.svn_diff_fns2_t_token_discard_set)
+    token_discard_all = _swig_property(_diff.svn_diff_fns2_t_token_discard_all_get, _diff.svn_diff_fns2_t_token_discard_all_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -152,23 +180,57 @@ class svn_diff_fns2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -178,7 +240,7 @@ class svn_diff_fns2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def datasources_open(self, *args):
@@ -217,26 +279,17 @@ class svn_diff_fns2_t:
 svn_diff_fns2_t_swigregister = _diff.svn_diff_fns2_t_swigregister
 svn_diff_fns2_t_swigregister(svn_diff_fns2_t)
 
-class svn_diff_fns_t:
+class svn_diff_fns_t(object):
     """Proxy of C svn_diff_fns_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_diff_fns_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_diff_fns_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["datasource_open"] = _diff.svn_diff_fns_t_datasource_open_set
-    __swig_getmethods__["datasource_open"] = _diff.svn_diff_fns_t_datasource_open_get
-    __swig_setmethods__["datasource_close"] = _diff.svn_diff_fns_t_datasource_close_set
-    __swig_getmethods__["datasource_close"] = _diff.svn_diff_fns_t_datasource_close_get
-    __swig_setmethods__["datasource_get_next_token"] = _diff.svn_diff_fns_t_datasource_get_next_token_set
-    __swig_getmethods__["datasource_get_next_token"] = _diff.svn_diff_fns_t_datasource_get_next_token_get
-    __swig_setmethods__["token_compare"] = _diff.svn_diff_fns_t_token_compare_set
-    __swig_getmethods__["token_compare"] = _diff.svn_diff_fns_t_token_compare_get
-    __swig_setmethods__["token_discard"] = _diff.svn_diff_fns_t_token_discard_set
-    __swig_getmethods__["token_discard"] = _diff.svn_diff_fns_t_token_discard_get
-    __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
+    datasource_open = _swig_property(_diff.svn_diff_fns_t_datasource_open_get, _diff.svn_diff_fns_t_datasource_open_set)
+    datasource_close = _swig_property(_diff.svn_diff_fns_t_datasource_close_get, _diff.svn_diff_fns_t_datasource_close_set)
+    datasource_get_next_token = _swig_property(_diff.svn_diff_fns_t_datasource_get_next_token_get, _diff.svn_diff_fns_t_datasource_get_next_token_set)
+    token_compare = _swig_property(_diff.svn_diff_fns_t_token_compare_get, _diff.svn_diff_fns_t_token_compare_set)
+    token_discard = _swig_property(_diff.svn_diff_fns_t_token_discard_get, _diff.svn_diff_fns_t_token_discard_set)
+    token_discard_all = _swig_property(_diff.svn_diff_fns_t_token_discard_all_get, _diff.svn_diff_fns_t_token_discard_all_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -251,23 +304,57 @@ class svn_diff_fns_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -277,7 +364,7 @@ class svn_diff_fns_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def datasource_open(self, *args):
@@ -317,55 +404,47 @@ svn_diff_fns_t_swigregister = _diff.svn_diff_fns_t_swigregister
 svn_diff_fns_t_swigregister(svn_diff_fns_t)
 
 
-def svn_diff_diff_2(*args):
+def svn_diff_diff_2(*args) -> "svn_diff_t **":
     """svn_diff_diff_2(void * diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_diff_2(*args)
 
-def svn_diff_diff(*args):
+def svn_diff_diff(*args) -> "svn_diff_t **":
     """svn_diff_diff(void * diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_diff(*args)
 
-def svn_diff_diff3_2(*args):
+def svn_diff_diff3_2(*args) -> "svn_diff_t **":
     """svn_diff_diff3_2(void * diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_diff3_2(*args)
 
-def svn_diff_diff3(*args):
+def svn_diff_diff3(*args) -> "svn_diff_t **":
     """svn_diff_diff3(void * diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_diff3(*args)
 
-def svn_diff_diff4_2(*args):
+def svn_diff_diff4_2(*args) -> "svn_diff_t **":
     """svn_diff_diff4_2(void * diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_diff4_2(*args)
 
-def svn_diff_diff4(*args):
+def svn_diff_diff4(*args) -> "svn_diff_t **":
     """svn_diff_diff4(void * diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_diff4(*args)
 
-def svn_diff_contains_conflicts(diff):
+def svn_diff_contains_conflicts(diff: 'svn_diff_t *') -> "svn_boolean_t":
     """svn_diff_contains_conflicts(svn_diff_t * diff) -> svn_boolean_t"""
     return _diff.svn_diff_contains_conflicts(diff)
 
-def svn_diff_contains_diffs(diff):
+def svn_diff_contains_diffs(diff: 'svn_diff_t *') -> "svn_boolean_t":
     """svn_diff_contains_diffs(svn_diff_t * diff) -> svn_boolean_t"""
     return _diff.svn_diff_contains_diffs(diff)
-class svn_diff_output_fns_t:
+class svn_diff_output_fns_t(object):
     """Proxy of C svn_diff_output_fns_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_diff_output_fns_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_diff_output_fns_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["output_common"] = _diff.svn_diff_output_fns_t_output_common_set
-    __swig_getmethods__["output_common"] = _diff.svn_diff_output_fns_t_output_common_get
-    __swig_setmethods__["output_diff_modified"] = _diff.svn_diff_output_fns_t_output_diff_modified_set
-    __swig_getmethods__["output_diff_modified"] = _diff.svn_diff_output_fns_t_output_diff_modified_get
-    __swig_setmethods__["output_diff_latest"] = _diff.svn_diff_output_fns_t_output_diff_latest_set
-    __swig_getmethods__["output_diff_latest"] = _diff.svn_diff_output_fns_t_output_diff_latest_get
-    __swig_setmethods__["output_diff_common"] = _diff.svn_diff_output_fns_t_output_diff_common_set
-    __swig_getmethods__["output_diff_common"] = _diff.svn_diff_output_fns_t_output_diff_common_get
-    __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
+    output_common = _swig_property(_diff.svn_diff_output_fns_t_output_common_get, _diff.svn_diff_output_fns_t_output_common_set)
+    output_diff_modified = _swig_property(_diff.svn_diff_output_fns_t_output_diff_modified_get, _diff.svn_diff_output_fns_t_output_diff_modified_set)
+    output_diff_latest = _swig_property(_diff.svn_diff_output_fns_t_output_diff_latest_get, _diff.svn_diff_output_fns_t_output_diff_latest_set)
+    output_diff_common = _swig_property(_diff.svn_diff_output_fns_t_output_diff_common_get, _diff.svn_diff_output_fns_t_output_diff_common_set)
+    output_conflict = _swig_property(_diff.svn_diff_output_fns_t_output_conflict_get, _diff.svn_diff_output_fns_t_output_conflict_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -380,23 +459,57 @@ class svn_diff_output_fns_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -406,7 +519,7 @@ class svn_diff_output_fns_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def output_common(self, *args):
@@ -448,32 +561,25 @@ 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(diff, output_baton, output_fns, cancel_func):
+def svn_diff_output2(diff: 'svn_diff_t *', output_baton: 'void *', output_fns: 'svn_diff_output_fns_t', cancel_func: 'svn_cancel_func_t') -> "svn_error_t *":
     """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(diff, output_baton, output_fns, cancel_func)
 
-def svn_diff_output(diff, output_baton, output_fns):
+def svn_diff_output(diff: 'svn_diff_t *', output_baton: 'void *', output_fns: 'svn_diff_output_fns_t') -> "svn_error_t *":
     """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(diff, output_baton, output_fns)
 svn_diff_file_ignore_space_none = _diff.svn_diff_file_ignore_space_none
 svn_diff_file_ignore_space_change = _diff.svn_diff_file_ignore_space_change
 svn_diff_file_ignore_space_all = _diff.svn_diff_file_ignore_space_all
-class svn_diff_file_options_t:
+class svn_diff_file_options_t(object):
     """Proxy of C svn_diff_file_options_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_diff_file_options_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_diff_file_options_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["ignore_space"] = _diff.svn_diff_file_options_t_ignore_space_set
-    __swig_getmethods__["ignore_space"] = _diff.svn_diff_file_options_t_ignore_space_get
-    __swig_setmethods__["ignore_eol_style"] = _diff.svn_diff_file_options_t_ignore_eol_style_set
-    __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
+    ignore_space = _swig_property(_diff.svn_diff_file_options_t_ignore_space_get, _diff.svn_diff_file_options_t_ignore_space_set)
+    ignore_eol_style = _swig_property(_diff.svn_diff_file_options_t_ignore_eol_style_get, _diff.svn_diff_file_options_t_ignore_eol_style_set)
+    show_c_function = _swig_property(_diff.svn_diff_file_options_t_show_c_function_get, _diff.svn_diff_file_options_t_show_c_function_set)
+    context_size = _swig_property(_diff.svn_diff_file_options_t_context_size_get, _diff.svn_diff_file_options_t_context_size_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -488,23 +594,57 @@ class svn_diff_file_options_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -514,7 +654,7 @@ class svn_diff_file_options_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -530,103 +670,103 @@ svn_diff_file_options_t_swigregister = _diff.svn_diff_file_options_t_swigregiste
 svn_diff_file_options_t_swigregister(svn_diff_file_options_t)
 
 
-def svn_diff_file_options_create(*args):
+def svn_diff_file_options_create(*args) -> "svn_diff_file_options_t *":
     """svn_diff_file_options_create(apr_pool_t pool) -> svn_diff_file_options_t"""
     return _diff.svn_diff_file_options_create(*args)
 
-def svn_diff_file_options_parse(*args):
+def svn_diff_file_options_parse(*args) -> "svn_error_t *":
     """svn_diff_file_options_parse(svn_diff_file_options_t options, apr_array_header_t args, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_options_parse(*args)
 
-def svn_diff_file_diff_2(*args):
+def svn_diff_file_diff_2(*args) -> "svn_diff_t **":
     """svn_diff_file_diff_2(char const * original, char const * modified, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_diff_2(*args)
 
-def svn_diff_file_diff(*args):
+def svn_diff_file_diff(*args) -> "svn_diff_t **":
     """svn_diff_file_diff(char const * original, char const * modified, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_diff(*args)
 
-def svn_diff_file_diff3_2(*args):
+def svn_diff_file_diff3_2(*args) -> "svn_diff_t **":
     """svn_diff_file_diff3_2(char const * original, char const * modified, char const * latest, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_diff3_2(*args)
 
-def svn_diff_file_diff3(*args):
+def svn_diff_file_diff3(*args) -> "svn_diff_t **":
     """svn_diff_file_diff3(char const * original, char const * modified, char const * latest, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_diff3(*args)
 
-def svn_diff_file_diff4_2(*args):
+def svn_diff_file_diff4_2(*args) -> "svn_diff_t **":
     """svn_diff_file_diff4_2(char const * original, char const * modified, char const * latest, char const * ancestor, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_diff4_2(*args)
 
-def svn_diff_file_diff4(*args):
+def svn_diff_file_diff4(*args) -> "svn_diff_t **":
     """svn_diff_file_diff4(char const * original, char const * modified, char const * latest, char const * ancestor, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_diff4(*args)
 
-def svn_diff_file_output_unified4(*args):
+def svn_diff_file_output_unified4(*args) -> "svn_error_t *":
     """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):
+def svn_diff_file_output_unified3(*args) -> "svn_error_t *":
     """svn_diff_file_output_unified3(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, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_output_unified3(*args)
 
-def svn_diff_file_output_unified2(*args):
+def svn_diff_file_output_unified2(*args) -> "svn_error_t *":
     """svn_diff_file_output_unified2(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, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_output_unified2(*args)
 
-def svn_diff_file_output_unified(*args):
+def svn_diff_file_output_unified(*args) -> "svn_error_t *":
     """svn_diff_file_output_unified(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, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_output_unified(*args)
 
-def svn_diff_file_output_merge3(*args):
+def svn_diff_file_output_merge3(*args) -> "svn_error_t *":
     """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):
+def svn_diff_file_output_merge2(*args) -> "svn_error_t *":
     """svn_diff_file_output_merge2(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, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_output_merge2(*args)
 
-def svn_diff_file_output_merge(*args):
+def svn_diff_file_output_merge(*args) -> "svn_error_t *":
     """svn_diff_file_output_merge(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_boolean_t display_original_in_conflict, svn_boolean_t display_resolved_conflicts, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_file_output_merge(*args)
 
-def svn_diff_output_binary(*args):
+def svn_diff_output_binary(*args) -> "svn_error_t *":
     """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):
+def svn_diff_mem_string_diff(*args) -> "svn_diff_t **":
     """svn_diff_mem_string_diff(svn_string_t const * original, svn_string_t const * modified, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_mem_string_diff(*args)
 
-def svn_diff_mem_string_diff3(*args):
+def svn_diff_mem_string_diff3(*args) -> "svn_diff_t **":
     """svn_diff_mem_string_diff3(svn_string_t const * original, svn_string_t const * modified, svn_string_t const * latest, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_mem_string_diff3(*args)
 
-def svn_diff_mem_string_diff4(*args):
+def svn_diff_mem_string_diff4(*args) -> "svn_diff_t **":
     """svn_diff_mem_string_diff4(svn_string_t const * original, svn_string_t const * modified, svn_string_t const * latest, svn_string_t const * ancestor, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_mem_string_diff4(*args)
 
-def svn_diff_mem_string_output_unified3(*args):
+def svn_diff_mem_string_output_unified3(*args) -> "svn_error_t *":
     """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):
+def svn_diff_mem_string_output_unified2(*args) -> "svn_error_t *":
     """svn_diff_mem_string_output_unified2(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, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_mem_string_output_unified2(*args)
 
-def svn_diff_mem_string_output_unified(*args):
+def svn_diff_mem_string_output_unified(*args) -> "svn_error_t *":
     """svn_diff_mem_string_output_unified(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_header, char const * modified_header, char const * header_encoding, svn_string_t const * original, svn_string_t const * modified, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_mem_string_output_unified(*args)
 
-def svn_diff_mem_string_output_merge3(*args):
+def svn_diff_mem_string_output_merge3(*args) -> "svn_error_t *":
     """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):
+def svn_diff_mem_string_output_merge2(*args) -> "svn_error_t *":
     """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, 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, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_mem_string_output_merge2(*args)
 
-def svn_diff_mem_string_output_merge(*args):
+def svn_diff_mem_string_output_merge(*args) -> "svn_error_t *":
     """svn_diff_mem_string_output_merge(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_boolean_t display_original_in_conflict, svn_boolean_t display_resolved_conflicts, apr_pool_t pool) -> svn_error_t"""
     return _diff.svn_diff_mem_string_output_merge(*args)
 svn_diff_op_unchanged = _diff.svn_diff_op_unchanged
@@ -636,67 +776,61 @@ svn_diff_op_copied = _diff.svn_diff_op_copied
 svn_diff_op_moved = _diff.svn_diff_op_moved
 svn_diff_op_modified = _diff.svn_diff_op_modified
 
-def svn_diff_hunk_readline_diff_text(*args):
+def svn_diff_hunk_readline_diff_text(*args) -> "svn_stringbuf_t **, char const **, svn_boolean_t *":
     """svn_diff_hunk_readline_diff_text(svn_diff_hunk_t * hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _diff.svn_diff_hunk_readline_diff_text(*args)
 
-def svn_diff_hunk_readline_original_text(*args):
+def svn_diff_hunk_readline_original_text(*args) -> "svn_stringbuf_t **, char const **, svn_boolean_t *":
     """svn_diff_hunk_readline_original_text(svn_diff_hunk_t * hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _diff.svn_diff_hunk_readline_original_text(*args)
 
-def svn_diff_hunk_readline_modified_text(*args):
+def svn_diff_hunk_readline_modified_text(*args) -> "svn_stringbuf_t **, char const **, svn_boolean_t *":
     """svn_diff_hunk_readline_modified_text(svn_diff_hunk_t * hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _diff.svn_diff_hunk_readline_modified_text(*args)
 
-def svn_diff_hunk_reset_diff_text(hunk):
+def svn_diff_hunk_reset_diff_text(hunk: 'svn_diff_hunk_t *') -> "void":
     """svn_diff_hunk_reset_diff_text(svn_diff_hunk_t * hunk)"""
     return _diff.svn_diff_hunk_reset_diff_text(hunk)
 
-def svn_diff_hunk_reset_original_text(hunk):
+def svn_diff_hunk_reset_original_text(hunk: 'svn_diff_hunk_t *') -> "void":
     """svn_diff_hunk_reset_original_text(svn_diff_hunk_t * hunk)"""
     return _diff.svn_diff_hunk_reset_original_text(hunk)
 
-def svn_diff_hunk_reset_modified_text(hunk):
+def svn_diff_hunk_reset_modified_text(hunk: 'svn_diff_hunk_t *') -> "void":
     """svn_diff_hunk_reset_modified_text(svn_diff_hunk_t * hunk)"""
     return _diff.svn_diff_hunk_reset_modified_text(hunk)
 
-def svn_diff_hunk_get_original_start(hunk):
+def svn_diff_hunk_get_original_start(hunk: 'svn_diff_hunk_t const *') -> "svn_linenum_t":
     """svn_diff_hunk_get_original_start(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
     return _diff.svn_diff_hunk_get_original_start(hunk)
 
-def svn_diff_hunk_get_original_length(hunk):
+def svn_diff_hunk_get_original_length(hunk: 'svn_diff_hunk_t const *') -> "svn_linenum_t":
     """svn_diff_hunk_get_original_length(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
     return _diff.svn_diff_hunk_get_original_length(hunk)
 
-def svn_diff_hunk_get_modified_start(hunk):
+def svn_diff_hunk_get_modified_start(hunk: 'svn_diff_hunk_t const *') -> "svn_linenum_t":
     """svn_diff_hunk_get_modified_start(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
     return _diff.svn_diff_hunk_get_modified_start(hunk)
 
-def svn_diff_hunk_get_modified_length(hunk):
+def svn_diff_hunk_get_modified_length(hunk: 'svn_diff_hunk_t const *') -> "svn_linenum_t":
     """svn_diff_hunk_get_modified_length(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
     return _diff.svn_diff_hunk_get_modified_length(hunk)
 
-def svn_diff_hunk_get_leading_context(hunk):
+def svn_diff_hunk_get_leading_context(hunk: 'svn_diff_hunk_t const *') -> "svn_linenum_t":
     """svn_diff_hunk_get_leading_context(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
     return _diff.svn_diff_hunk_get_leading_context(hunk)
 
-def svn_diff_hunk_get_trailing_context(hunk):
+def svn_diff_hunk_get_trailing_context(hunk: 'svn_diff_hunk_t const *') -> "svn_linenum_t":
     """svn_diff_hunk_get_trailing_context(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
     return _diff.svn_diff_hunk_get_trailing_context(hunk)
-class svn_prop_patch_t:
+class svn_prop_patch_t(object):
     """Proxy of C svn_prop_patch_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_prop_patch_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_prop_patch_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _diff.svn_prop_patch_t_name_set
-    __swig_getmethods__["name"] = _diff.svn_prop_patch_t_name_get
-    __swig_setmethods__["operation"] = _diff.svn_prop_patch_t_operation_set
-    __swig_getmethods__["operation"] = _diff.svn_prop_patch_t_operation_get
-    __swig_setmethods__["hunks"] = _diff.svn_prop_patch_t_hunks_set
-    __swig_getmethods__["hunks"] = _diff.svn_prop_patch_t_hunks_get
+    name = _swig_property(_diff.svn_prop_patch_t_name_get, _diff.svn_prop_patch_t_name_set)
+    operation = _swig_property(_diff.svn_prop_patch_t_operation_get, _diff.svn_prop_patch_t_operation_set)
+    hunks = _swig_property(_diff.svn_prop_patch_t_hunks_get, _diff.svn_prop_patch_t_hunks_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -711,23 +845,57 @@ class svn_prop_patch_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -737,7 +905,7 @@ class svn_prop_patch_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -753,47 +921,31 @@ svn_prop_patch_t_swigregister = _diff.svn_prop_patch_t_swigregister
 svn_prop_patch_t_swigregister(svn_prop_patch_t)
 
 
-def svn_diff_get_binary_diff_original_stream(*args):
+def svn_diff_get_binary_diff_original_stream(*args) -> "svn_stream_t *":
     """svn_diff_get_binary_diff_original_stream(svn_diff_binary_patch_t const * bpatch, apr_pool_t result_pool) -> svn_stream_t *"""
     return _diff.svn_diff_get_binary_diff_original_stream(*args)
 
-def svn_diff_get_binary_diff_result_stream(*args):
+def svn_diff_get_binary_diff_result_stream(*args) -> "svn_stream_t *":
     """svn_diff_get_binary_diff_result_stream(svn_diff_binary_patch_t const * bpatch, apr_pool_t result_pool) -> svn_stream_t *"""
     return _diff.svn_diff_get_binary_diff_result_stream(*args)
-class svn_patch_t:
+class svn_patch_t(object):
     """Proxy of C svn_patch_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_patch_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_patch_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["old_filename"] = _diff.svn_patch_t_old_filename_set
-    __swig_getmethods__["old_filename"] = _diff.svn_patch_t_old_filename_get
-    __swig_setmethods__["new_filename"] = _diff.svn_patch_t_new_filename_set
-    __swig_getmethods__["new_filename"] = _diff.svn_patch_t_new_filename_get
-    __swig_setmethods__["hunks"] = _diff.svn_patch_t_hunks_set
-    __swig_getmethods__["hunks"] = _diff.svn_patch_t_hunks_get
-    __swig_setmethods__["prop_patches"] = _diff.svn_patch_t_prop_patches_set
-    __swig_getmethods__["prop_patches"] = _diff.svn_patch_t_prop_patches_get
-    __swig_setmethods__["operation"] = _diff.svn_patch_t_operation_set
-    __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
-    __swig_setmethods__["binary_patch"] = _diff.svn_patch_t_binary_patch_set
-    __swig_getmethods__["binary_patch"] = _diff.svn_patch_t_binary_patch_get
-    __swig_setmethods__["old_executable_bit"] = _diff.svn_patch_t_old_executable_bit_set
-    __swig_getmethods__["old_executable_bit"] = _diff.svn_patch_t_old_executable_bit_get
-    __swig_setmethods__["new_executable_bit"] = _diff.svn_patch_t_new_executable_bit_set
-    __swig_getmethods__["new_executable_bit"] = _diff.svn_patch_t_new_executable_bit_get
-    __swig_setmethods__["old_symlink_bit"] = _diff.svn_patch_t_old_symlink_bit_set
-    __swig_getmethods__["old_symlink_bit"] = _diff.svn_patch_t_old_symlink_bit_get
-    __swig_setmethods__["new_symlink_bit"] = _diff.svn_patch_t_new_symlink_bit_set
-    __swig_getmethods__["new_symlink_bit"] = _diff.svn_patch_t_new_symlink_bit_get
+    old_filename = _swig_property(_diff.svn_patch_t_old_filename_get, _diff.svn_patch_t_old_filename_set)
+    new_filename = _swig_property(_diff.svn_patch_t_new_filename_get, _diff.svn_patch_t_new_filename_set)
+    hunks = _swig_property(_diff.svn_patch_t_hunks_get, _diff.svn_patch_t_hunks_set)
+    prop_patches = _swig_property(_diff.svn_patch_t_prop_patches_get, _diff.svn_patch_t_prop_patches_set)
+    operation = _swig_property(_diff.svn_patch_t_operation_get, _diff.svn_patch_t_operation_set)
+    reverse = _swig_property(_diff.svn_patch_t_reverse_get, _diff.svn_patch_t_reverse_set)
+    mergeinfo = _swig_property(_diff.svn_patch_t_mergeinfo_get, _diff.svn_patch_t_mergeinfo_set)
+    reverse_mergeinfo = _swig_property(_diff.svn_patch_t_reverse_mergeinfo_get, _diff.svn_patch_t_reverse_mergeinfo_set)
+    binary_patch = _swig_property(_diff.svn_patch_t_binary_patch_get, _diff.svn_patch_t_binary_patch_set)
+    old_executable_bit = _swig_property(_diff.svn_patch_t_old_executable_bit_get, _diff.svn_patch_t_old_executable_bit_set)
+    new_executable_bit = _swig_property(_diff.svn_patch_t_new_executable_bit_get, _diff.svn_patch_t_new_executable_bit_set)
+    old_symlink_bit = _swig_property(_diff.svn_patch_t_old_symlink_bit_get, _diff.svn_patch_t_old_symlink_bit_set)
+    new_symlink_bit = _swig_property(_diff.svn_patch_t_new_symlink_bit_get, _diff.svn_patch_t_new_symlink_bit_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -808,23 +960,57 @@ class svn_patch_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -834,7 +1020,7 @@ class svn_patch_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -850,24 +1036,21 @@ svn_patch_t_swigregister = _diff.svn_patch_t_swigregister
 svn_patch_t_swigregister(svn_patch_t)
 
 
-def svn_diff_open_patch_file(*args):
+def svn_diff_open_patch_file(*args) -> "svn_patch_file_t **":
     """svn_diff_open_patch_file(char const * local_abspath, apr_pool_t result_pool) -> svn_error_t"""
     return _diff.svn_diff_open_patch_file(*args)
 
-def svn_diff_parse_next_patch(*args):
+def svn_diff_parse_next_patch(*args) -> "svn_patch_t **":
     """svn_diff_parse_next_patch(svn_patch_file_t * patch_file, svn_boolean_t reverse, svn_boolean_t ignore_whitespace, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _diff.svn_diff_parse_next_patch(*args)
 
-def svn_diff_close_patch_file(*args):
+def svn_diff_close_patch_file(*args) -> "svn_error_t *":
     """svn_diff_close_patch_file(svn_patch_file_t * patch_file, apr_pool_t scratch_pool) -> svn_error_t"""
     return _diff.svn_diff_close_patch_file(*args)
-class svn_diff_t:
+class svn_diff_t(object):
     """Proxy of C svn_diff_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_diff_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_diff_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -886,23 +1069,57 @@ class svn_diff_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -912,18 +1129,15 @@ class svn_diff_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_diff_t_swigregister = _diff.svn_diff_t_swigregister
 svn_diff_t_swigregister(svn_diff_t)
 
-class svn_diff_hunk_t:
+class svn_diff_hunk_t(object):
     """Proxy of C svn_diff_hunk_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_diff_hunk_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_diff_hunk_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -942,23 +1156,57 @@ class svn_diff_hunk_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -968,18 +1216,15 @@ class svn_diff_hunk_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_diff_hunk_t_swigregister = _diff.svn_diff_hunk_t_swigregister
 svn_diff_hunk_t_swigregister(svn_diff_hunk_t)
 
-class svn_diff_binary_patch_t:
+class svn_diff_binary_patch_t(object):
     """Proxy of C svn_diff_binary_patch_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_diff_binary_patch_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_diff_binary_patch_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -998,23 +1243,57 @@ class svn_diff_binary_patch_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1024,18 +1303,15 @@ class svn_diff_binary_patch_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_diff_binary_patch_t_swigregister = _diff.svn_diff_binary_patch_t_swigregister
 svn_diff_binary_patch_t_swigregister(svn_diff_binary_patch_t)
 
-class svn_patch_file_t:
+class svn_patch_file_t(object):
     """Proxy of C svn_patch_file_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_patch_file_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_patch_file_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1054,23 +1330,57 @@ class svn_patch_file_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1080,77 +1390,77 @@ class svn_patch_file_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_patch_file_t_swigregister = _diff.svn_patch_file_t_swigregister
 svn_patch_file_t_swigregister(svn_patch_file_t)
 
 
-def svn_diff_fns2_invoke_datasources_open(_obj, diff_baton, prefix_lines, suffix_lines, datasources, datasources_len):
+def svn_diff_fns2_invoke_datasources_open(_obj: 'svn_diff_fns2_t', diff_baton: 'void *', prefix_lines: 'apr_off_t *', suffix_lines: 'apr_off_t *', datasources: 'svn_diff_datasource_e const *', datasources_len: 'apr_size_t') -> "svn_error_t *":
     """svn_diff_fns2_invoke_datasources_open(svn_diff_fns2_t _obj, void * diff_baton, apr_off_t * prefix_lines, apr_off_t * suffix_lines, svn_diff_datasource_e const * datasources, apr_size_t datasources_len) -> svn_error_t"""
     return _diff.svn_diff_fns2_invoke_datasources_open(_obj, diff_baton, prefix_lines, suffix_lines, datasources, datasources_len)
 
-def svn_diff_fns2_invoke_datasource_close(_obj, diff_baton, datasource):
+def svn_diff_fns2_invoke_datasource_close(_obj: 'svn_diff_fns2_t', diff_baton: 'void *', datasource: 'svn_diff_datasource_e') -> "svn_error_t *":
     """svn_diff_fns2_invoke_datasource_close(svn_diff_fns2_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
     return _diff.svn_diff_fns2_invoke_datasource_close(_obj, diff_baton, datasource)
 
-def svn_diff_fns2_invoke_datasource_get_next_token(_obj, diff_baton, datasource):
+def svn_diff_fns2_invoke_datasource_get_next_token(_obj: 'svn_diff_fns2_t', diff_baton: 'void *', datasource: 'svn_diff_datasource_e') -> "apr_uint32_t *, void **":
     """svn_diff_fns2_invoke_datasource_get_next_token(svn_diff_fns2_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
     return _diff.svn_diff_fns2_invoke_datasource_get_next_token(_obj, diff_baton, datasource)
 
-def svn_diff_fns2_invoke_token_compare(_obj, diff_baton, ltoken, rtoken):
+def svn_diff_fns2_invoke_token_compare(_obj: 'svn_diff_fns2_t', diff_baton: 'void *', ltoken: 'void *', rtoken: 'void *') -> "int *":
     """svn_diff_fns2_invoke_token_compare(svn_diff_fns2_t _obj, void * diff_baton, void * ltoken, void * rtoken) -> svn_error_t"""
     return _diff.svn_diff_fns2_invoke_token_compare(_obj, diff_baton, ltoken, rtoken)
 
-def svn_diff_fns2_invoke_token_discard(_obj, diff_baton, token):
+def svn_diff_fns2_invoke_token_discard(_obj: 'svn_diff_fns2_t', diff_baton: 'void *', token: 'void *') -> "void":
     """svn_diff_fns2_invoke_token_discard(svn_diff_fns2_t _obj, void * diff_baton, void * token)"""
     return _diff.svn_diff_fns2_invoke_token_discard(_obj, diff_baton, token)
 
-def svn_diff_fns2_invoke_token_discard_all(_obj, diff_baton):
+def svn_diff_fns2_invoke_token_discard_all(_obj: 'svn_diff_fns2_t', diff_baton: 'void *') -> "void":
     """svn_diff_fns2_invoke_token_discard_all(svn_diff_fns2_t _obj, void * diff_baton)"""
     return _diff.svn_diff_fns2_invoke_token_discard_all(_obj, diff_baton)
 
-def svn_diff_fns_invoke_datasource_open(_obj, diff_baton, datasource):
+def svn_diff_fns_invoke_datasource_open(_obj: 'svn_diff_fns_t', diff_baton: 'void *', datasource: 'svn_diff_datasource_e') -> "svn_error_t *":
     """svn_diff_fns_invoke_datasource_open(svn_diff_fns_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
     return _diff.svn_diff_fns_invoke_datasource_open(_obj, diff_baton, datasource)
 
-def svn_diff_fns_invoke_datasource_close(_obj, diff_baton, datasource):
+def svn_diff_fns_invoke_datasource_close(_obj: 'svn_diff_fns_t', diff_baton: 'void *', datasource: 'svn_diff_datasource_e') -> "svn_error_t *":
     """svn_diff_fns_invoke_datasource_close(svn_diff_fns_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
     return _diff.svn_diff_fns_invoke_datasource_close(_obj, diff_baton, datasource)
 
-def svn_diff_fns_invoke_datasource_get_next_token(_obj, diff_baton, datasource):
+def svn_diff_fns_invoke_datasource_get_next_token(_obj: 'svn_diff_fns_t', diff_baton: 'void *', datasource: 'svn_diff_datasource_e') -> "apr_uint32_t *, void **":
     """svn_diff_fns_invoke_datasource_get_next_token(svn_diff_fns_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
     return _diff.svn_diff_fns_invoke_datasource_get_next_token(_obj, diff_baton, datasource)
 
-def svn_diff_fns_invoke_token_compare(_obj, diff_baton, ltoken, rtoken):
+def svn_diff_fns_invoke_token_compare(_obj: 'svn_diff_fns_t', diff_baton: 'void *', ltoken: 'void *', rtoken: 'void *') -> "int *":
     """svn_diff_fns_invoke_token_compare(svn_diff_fns_t _obj, void * diff_baton, void * ltoken, void * rtoken) -> svn_error_t"""
     return _diff.svn_diff_fns_invoke_token_compare(_obj, diff_baton, ltoken, rtoken)
 
-def svn_diff_fns_invoke_token_discard(_obj, diff_baton, token):
+def svn_diff_fns_invoke_token_discard(_obj: 'svn_diff_fns_t', diff_baton: 'void *', token: 'void *') -> "void":
     """svn_diff_fns_invoke_token_discard(svn_diff_fns_t _obj, void * diff_baton, void * token)"""
     return _diff.svn_diff_fns_invoke_token_discard(_obj, diff_baton, token)
 
-def svn_diff_fns_invoke_token_discard_all(_obj, diff_baton):
+def svn_diff_fns_invoke_token_discard_all(_obj: 'svn_diff_fns_t', diff_baton: 'void *') -> "void":
     """svn_diff_fns_invoke_token_discard_all(svn_diff_fns_t _obj, void * diff_baton)"""
     return _diff.svn_diff_fns_invoke_token_discard_all(_obj, diff_baton)
 
-def svn_diff_output_fns_invoke_output_common(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length):
+def svn_diff_output_fns_invoke_output_common(_obj: 'svn_diff_output_fns_t', output_baton: 'void *', original_start: 'apr_off_t', original_length: 'apr_off_t', modified_start: 'apr_off_t', modified_length: 'apr_off_t', latest_start: 'apr_off_t', latest_length: 'apr_off_t') -> "svn_error_t *":
     """svn_diff_output_fns_invoke_output_common(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, apr_off_t latest_length) -> svn_error_t"""
     return _diff.svn_diff_output_fns_invoke_output_common(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length)
 
-def svn_diff_output_fns_invoke_output_diff_modified(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length):
+def svn_diff_output_fns_invoke_output_diff_modified(_obj: 'svn_diff_output_fns_t', output_baton: 'void *', original_start: 'apr_off_t', original_length: 'apr_off_t', modified_start: 'apr_off_t', modified_length: 'apr_off_t', latest_start: 'apr_off_t', latest_length: 'apr_off_t') -> "svn_error_t *":
     """svn_diff_output_fns_invoke_output_diff_modified(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, apr_off_t latest_length) -> svn_error_t"""
     return _diff.svn_diff_output_fns_invoke_output_diff_modified(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length)
 
-def svn_diff_output_fns_invoke_output_diff_latest(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length):
+def svn_diff_output_fns_invoke_output_diff_latest(_obj: 'svn_diff_output_fns_t', output_baton: 'void *', original_start: 'apr_off_t', original_length: 'apr_off_t', modified_start: 'apr_off_t', modified_length: 'apr_off_t', latest_start: 'apr_off_t', latest_length: 'apr_off_t') -> "svn_error_t *":
     """svn_diff_output_fns_invoke_output_diff_latest(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, apr_off_t latest_length) -> svn_error_t"""
     return _diff.svn_diff_output_fns_invoke_output_diff_latest(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length)
 
-def svn_diff_output_fns_invoke_output_diff_common(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length):
+def svn_diff_output_fns_invoke_output_diff_common(_obj: 'svn_diff_output_fns_t', output_baton: 'void *', original_start: 'apr_off_t', original_length: 'apr_off_t', modified_start: 'apr_off_t', modified_length: 'apr_off_t', latest_start: 'apr_off_t', latest_length: 'apr_off_t') -> "svn_error_t *":
     """svn_diff_output_fns_invoke_output_diff_common(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, apr_off_t latest_length) -> svn_error_t"""
     return _diff.svn_diff_output_fns_invoke_output_diff_common(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length)
 
-def svn_diff_output_fns_invoke_output_conflict(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length, resolved_diff):
+def svn_diff_output_fns_invoke_output_conflict(_obj: 'svn_diff_output_fns_t', output_baton: 'void *', original_start: 'apr_off_t', original_length: 'apr_off_t', modified_start: 'apr_off_t', modified_length: 'apr_off_t', latest_start: 'apr_off_t', latest_length: 'apr_off_t', resolved_diff: 'svn_diff_t *') -> "svn_error_t *":
     """svn_diff_output_fns_invoke_output_conflict(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, apr_off_t latest_length, svn_diff_t * resolved_diff) -> svn_error_t"""
     return _diff.svn_diff_output_fns_invoke_output_conflict(_obj, output_baton, original_start, original_length, modified_start, modified_length, latest_start, latest_length, resolved_diff)
 
diff --git a/subversion/bindings/swig/python/fs.py b/subversion/bindings/swig/python/fs.py
index 5280a83..7c868bd 100644
--- a/subversion/bindings/swig/python/fs.py
+++ b/subversion/bindings/swig/python/fs.py
@@ -39,6 +39,11 @@ else:
 del _swig_python_version_info
 
 try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
@@ -54,7 +59,7 @@ def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
     if method:
         return method(self, value)
     if (not static):
-        self.__dict__[name] = value
+        object.__setattr__(self, name, value)
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
 
@@ -80,14 +85,26 @@ def _swig_repr(self):
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self, name, value):
+        if (name == "thisown"):
+            return self.this.own(value)
+        if hasattr(self, name) or (name == "this"):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
+
 def _copy_metadata_deep(value, old_value):
   """Copy all attributes of old_value into value, recursively traversing
   lists and dicts if needed."""
   if value is None or old_value is None or value is old_value: return
 
   if isinstance(value, dict):
-    for k, v in value.iteritems():
-      _copy_metadata_deep(v, old_value[k])
+    for k in value:
+      _copy_metadata_deep(value[k], old_value[k])
   elif isinstance(value, list):
     for v, old_v in zip(value, old_value):
       _copy_metadata_deep(v, old_v)
@@ -100,19 +117,39 @@ def _copy_metadata_deep(value, old_value):
 def _assert_valid_deep(value):
   """Assert value's validity, recursively traversing lists and dicts."""
   if isinstance(value, dict):
-    for v in value.itervalues():
-      _assert_valid_deep(v)
+    for k in value:
+      _assert_valid_deep(value[k])
   elif isinstance(value, list):
     for v in value:
       _assert_valid_deep(v)
-  else:
-    if hasattr(value, "assert_valid"):
-      value.assert_valid()
+# Ensure that the passed in value isn't a type, which could have an
+# assert_valid attribute, but it can not be called without an instance.
+  elif type(value) != type:
+    try:
+      fn = value.assert_valid
+    except AttributeError:
+      pass
+    else:
+      fn()
+
+
+
+  # SWIG classes generated with -modern do not define this variable
+try:
+  _newclass
+except NameError:
+  _newclass = 1
+else:
+  raise RuntimeError("Require -modern option, but _newclass is defined")
+
+_get_instance_attr = object.__getattribute__
+_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 
 import libsvn.core
 import libsvn.delta
 
-def svn_fs_version():
+def svn_fs_version() -> "svn_version_t const *":
     """svn_fs_version() -> svn_version_t const *"""
     return _fs.svn_fs_version()
 SVN_FS_TYPE_BDB = _fs.SVN_FS_TYPE_BDB
@@ -136,236 +173,236 @@ 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
 SVN_FS_CONFIG_NO_FLUSH_TO_DISK = _fs.SVN_FS_CONFIG_NO_FLUSH_TO_DISK
 
-def svn_fs_initialize(*args):
+def svn_fs_initialize(*args) -> "svn_error_t *":
     """svn_fs_initialize(apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_initialize(*args)
 
-def svn_fs_create2(*args):
+def svn_fs_create2(*args) -> "svn_fs_t **":
     """svn_fs_create2(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_create2(*args)
 
-def svn_fs_create(*args):
+def svn_fs_create(*args) -> "svn_fs_t **":
     """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):
+def svn_fs_open2(*args) -> "svn_fs_t **":
     """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):
+def svn_fs_open(*args) -> "svn_fs_t **":
     """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):
+def svn_fs_upgrade2(*args) -> "svn_error_t *":
     """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):
+def svn_fs_upgrade(*args) -> "svn_error_t *":
     """svn_fs_upgrade(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_upgrade(*args)
 
-def svn_fs_type(*args):
+def svn_fs_type(*args) -> "char const **":
     """svn_fs_type(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_type(*args)
 
-def svn_fs_path(*args):
+def svn_fs_path(*args) -> "char const *":
     """svn_fs_path(svn_fs_t * fs, apr_pool_t pool) -> char const *"""
     return _fs.svn_fs_path(*args)
 
-def svn_fs_config(*args):
+def svn_fs_config(*args) -> "apr_hash_t *":
     """svn_fs_config(svn_fs_t * fs, apr_pool_t pool) -> apr_hash_t"""
     return _fs.svn_fs_config(*args)
 
-def svn_fs_delete_fs(*args):
+def svn_fs_delete_fs(*args) -> "svn_error_t *":
     """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):
+def svn_fs_hotcopy3(*args) -> "svn_error_t *":
     """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):
+def svn_fs_hotcopy2(*args) -> "svn_error_t *":
     """svn_fs_hotcopy2(char const * src_path, char const * dest_path, svn_boolean_t clean, svn_boolean_t incremental, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_hotcopy2(*args)
 
-def svn_fs_hotcopy(*args):
+def svn_fs_hotcopy(*args) -> "svn_error_t *":
     """svn_fs_hotcopy(char const * src_path, char const * dest_path, svn_boolean_t clean, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_hotcopy(*args)
 
-def svn_fs_recover(*args):
+def svn_fs_recover(*args) -> "svn_error_t *":
     """svn_fs_recover(char const * path, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_recover(*args)
 
-def svn_fs_freeze(*args):
+def svn_fs_freeze(*args) -> "svn_error_t *":
     """svn_fs_freeze(svn_fs_t * fs, svn_fs_freeze_func_t freeze_func, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_freeze(*args)
 
-def svn_fs_berkeley_logfiles(*args):
+def svn_fs_berkeley_logfiles(*args) -> "apr_array_header_t **":
     """svn_fs_berkeley_logfiles(char const * path, svn_boolean_t only_unused, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_berkeley_logfiles(*args)
 
-def svn_fs_new(*args):
+def svn_fs_new(*args) -> "svn_fs_t *":
     """svn_fs_new(apr_hash_t fs_config, apr_pool_t pool) -> svn_fs_t *"""
     return _fs.svn_fs_new(*args)
 
-def svn_fs_create_berkeley(fs, path):
+def svn_fs_create_berkeley(fs: 'svn_fs_t *', path: 'char const *') -> "svn_error_t *":
     """svn_fs_create_berkeley(svn_fs_t * fs, char const * path) -> svn_error_t"""
     return _fs.svn_fs_create_berkeley(fs, path)
 
-def svn_fs_open_berkeley(fs, path):
+def svn_fs_open_berkeley(fs: 'svn_fs_t *', path: 'char const *') -> "svn_error_t *":
     """svn_fs_open_berkeley(svn_fs_t * fs, char const * path) -> svn_error_t"""
     return _fs.svn_fs_open_berkeley(fs, path)
 
-def svn_fs_berkeley_path(*args):
+def svn_fs_berkeley_path(*args) -> "char const *":
     """svn_fs_berkeley_path(svn_fs_t * fs, apr_pool_t pool) -> char const *"""
     return _fs.svn_fs_berkeley_path(*args)
 
-def svn_fs_delete_berkeley(*args):
+def svn_fs_delete_berkeley(*args) -> "svn_error_t *":
     """svn_fs_delete_berkeley(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_delete_berkeley(*args)
 
-def svn_fs_hotcopy_berkeley(*args):
+def svn_fs_hotcopy_berkeley(*args) -> "svn_error_t *":
     """svn_fs_hotcopy_berkeley(char const * src_path, char const * dest_path, svn_boolean_t clean_logs, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_hotcopy_berkeley(*args)
 
-def svn_fs_berkeley_recover(*args):
+def svn_fs_berkeley_recover(*args) -> "svn_error_t *":
     """svn_fs_berkeley_recover(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_berkeley_recover(*args)
 
-def svn_fs_create_access(*args):
+def svn_fs_create_access(*args) -> "svn_fs_access_t **":
     """svn_fs_create_access(char const * username, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_create_access(*args)
 
-def svn_fs_set_access(fs, access_ctx):
+def svn_fs_set_access(fs: 'svn_fs_t *', access_ctx: 'svn_fs_access_t *') -> "svn_error_t *":
     """svn_fs_set_access(svn_fs_t * fs, svn_fs_access_t * access_ctx) -> svn_error_t"""
     return _fs.svn_fs_set_access(fs, access_ctx)
 
-def svn_fs_get_access(fs):
+def svn_fs_get_access(fs: 'svn_fs_t *') -> "svn_fs_access_t **":
     """svn_fs_get_access(svn_fs_t * fs) -> svn_error_t"""
     return _fs.svn_fs_get_access(fs)
 
-def svn_fs_access_get_username(access_ctx):
+def svn_fs_access_get_username(access_ctx: 'svn_fs_access_t *') -> "char const **":
     """svn_fs_access_get_username(svn_fs_access_t * access_ctx) -> svn_error_t"""
     return _fs.svn_fs_access_get_username(access_ctx)
 
-def svn_fs_access_add_lock_token2(access_ctx, path, token):
+def svn_fs_access_add_lock_token2(access_ctx: 'svn_fs_access_t *', path: 'char const *', token: 'char const *') -> "svn_error_t *":
     """svn_fs_access_add_lock_token2(svn_fs_access_t * access_ctx, char const * path, char const * token) -> svn_error_t"""
     return _fs.svn_fs_access_add_lock_token2(access_ctx, path, token)
 
-def svn_fs_access_add_lock_token(access_ctx, token):
+def svn_fs_access_add_lock_token(access_ctx: 'svn_fs_access_t *', token: 'char const *') -> "svn_error_t *":
     """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(access_ctx, token)
 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(a, b):
+def svn_fs_compare_ids(a: 'svn_fs_id_t const *', b: 'svn_fs_id_t const *') -> "int":
     """svn_fs_compare_ids(svn_fs_id_t const * a, svn_fs_id_t const * b) -> int"""
     return _fs.svn_fs_compare_ids(a, b)
 
-def svn_fs_check_related(id1, id2):
+def svn_fs_check_related(id1: 'svn_fs_id_t const *', id2: 'svn_fs_id_t const *') -> "svn_boolean_t":
     """svn_fs_check_related(svn_fs_id_t const * id1, svn_fs_id_t const * id2) -> svn_boolean_t"""
     return _fs.svn_fs_check_related(id1, id2)
 
-def svn_fs_parse_id(*args):
+def svn_fs_parse_id(*args) -> "svn_fs_id_t *":
     """svn_fs_parse_id(char const * data, apr_pool_t pool) -> svn_fs_id_t *"""
     return _fs.svn_fs_parse_id(*args)
 
-def svn_fs_unparse_id(*args):
+def svn_fs_unparse_id(*args) -> "svn_string_t *":
     """svn_fs_unparse_id(svn_fs_id_t const * id, apr_pool_t pool) -> svn_string_t *"""
     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):
+def svn_fs_begin_txn2(*args) -> "svn_fs_txn_t **":
     """svn_fs_begin_txn2(svn_fs_t * fs, svn_revnum_t rev, apr_uint32_t flags, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_begin_txn2(*args)
 
-def svn_fs_begin_txn(*args):
+def svn_fs_begin_txn(*args) -> "svn_fs_txn_t **":
     """svn_fs_begin_txn(svn_fs_t * fs, svn_revnum_t rev, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_begin_txn(*args)
 
-def svn_fs_commit_txn(*args):
+def svn_fs_commit_txn(*args) -> "svn_revnum_t *":
     """svn_fs_commit_txn(svn_fs_txn_t * txn, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_commit_txn(*args)
 
-def svn_fs_abort_txn(*args):
+def svn_fs_abort_txn(*args) -> "svn_error_t *":
     """svn_fs_abort_txn(svn_fs_txn_t * txn, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_abort_txn(*args)
 
-def svn_fs_purge_txn(*args):
+def svn_fs_purge_txn(*args) -> "svn_error_t *":
     """svn_fs_purge_txn(svn_fs_t * fs, char const * txn_id, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_purge_txn(*args)
 
-def svn_fs_txn_name(*args):
+def svn_fs_txn_name(*args) -> "char const **":
     """svn_fs_txn_name(svn_fs_txn_t * txn, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_txn_name(*args)
 
-def svn_fs_txn_base_revision(txn):
+def svn_fs_txn_base_revision(txn: 'svn_fs_txn_t *') -> "svn_revnum_t":
     """svn_fs_txn_base_revision(svn_fs_txn_t * txn) -> svn_revnum_t"""
     return _fs.svn_fs_txn_base_revision(txn)
 
-def svn_fs_open_txn(*args):
+def svn_fs_open_txn(*args) -> "svn_fs_txn_t **":
     """svn_fs_open_txn(svn_fs_t * fs, char const * name, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_open_txn(*args)
 
-def svn_fs_list_transactions(*args):
+def svn_fs_list_transactions(*args) -> "apr_array_header_t **":
     """svn_fs_list_transactions(svn_fs_t * fs, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_list_transactions(*args)
 
-def svn_fs_txn_prop(*args):
+def svn_fs_txn_prop(*args) -> "svn_string_t **":
     """svn_fs_txn_prop(svn_fs_txn_t * txn, char const * propname, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_txn_prop(*args)
 
-def svn_fs_txn_proplist(*args):
+def svn_fs_txn_proplist(*args) -> "apr_hash_t **":
     """svn_fs_txn_proplist(svn_fs_txn_t * txn, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_txn_proplist(*args)
 
-def svn_fs_change_txn_prop(*args):
+def svn_fs_change_txn_prop(*args) -> "svn_error_t *":
     """svn_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 _fs.svn_fs_change_txn_prop(*args)
 
-def svn_fs_change_txn_props(*args):
+def svn_fs_change_txn_props(*args) -> "svn_error_t *":
     """svn_fs_change_txn_props(svn_fs_txn_t * txn, apr_array_header_t props, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_change_txn_props(*args)
 
-def svn_fs_revision_root(*args):
+def svn_fs_revision_root(*args) -> "svn_fs_root_t **":
     """svn_fs_revision_root(svn_fs_t * fs, svn_revnum_t rev, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_revision_root(*args)
 
-def svn_fs_txn_root(*args):
+def svn_fs_txn_root(*args) -> "svn_fs_root_t **":
     """svn_fs_txn_root(svn_fs_txn_t * txn, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_txn_root(*args)
 
-def svn_fs_close_root(root):
+def svn_fs_close_root(root: 'svn_fs_root_t *') -> "void":
     """svn_fs_close_root(svn_fs_root_t * root)"""
     return _fs.svn_fs_close_root(root)
 
-def svn_fs_root_fs(root):
+def svn_fs_root_fs(root: 'svn_fs_root_t *') -> "svn_fs_t *":
     """svn_fs_root_fs(svn_fs_root_t * root) -> svn_fs_t *"""
     return _fs.svn_fs_root_fs(root)
 
-def svn_fs_is_txn_root(root):
+def svn_fs_is_txn_root(root: 'svn_fs_root_t *') -> "svn_boolean_t":
     """svn_fs_is_txn_root(svn_fs_root_t * root) -> svn_boolean_t"""
     return _fs.svn_fs_is_txn_root(root)
 
-def svn_fs_is_revision_root(root):
+def svn_fs_is_revision_root(root: 'svn_fs_root_t *') -> "svn_boolean_t":
     """svn_fs_is_revision_root(svn_fs_root_t * root) -> svn_boolean_t"""
     return _fs.svn_fs_is_revision_root(root)
 
-def svn_fs_txn_root_name(*args):
+def svn_fs_txn_root_name(*args) -> "char const *":
     """svn_fs_txn_root_name(svn_fs_root_t * root, apr_pool_t pool) -> char const *"""
     return _fs.svn_fs_txn_root_name(*args)
 
-def svn_fs_txn_root_base_revision(root):
+def svn_fs_txn_root_base_revision(root: 'svn_fs_root_t *') -> "svn_revnum_t":
     """svn_fs_txn_root_base_revision(svn_fs_root_t * root) -> svn_revnum_t"""
     return _fs.svn_fs_txn_root_base_revision(root)
 
-def svn_fs_revision_root_revision(root):
+def svn_fs_revision_root_revision(root: 'svn_fs_root_t *') -> "svn_revnum_t":
     """svn_fs_revision_root_revision(svn_fs_root_t * root) -> svn_revnum_t"""
     return _fs.svn_fs_revision_root_revision(root)
 svn_fs_path_change_modify = _fs.svn_fs_path_change_modify
@@ -373,35 +410,23 @@ svn_fs_path_change_add = _fs.svn_fs_path_change_add
 svn_fs_path_change_delete = _fs.svn_fs_path_change_delete
 svn_fs_path_change_replace = _fs.svn_fs_path_change_replace
 svn_fs_path_change_reset = _fs.svn_fs_path_change_reset
-class svn_fs_path_change3_t:
+class svn_fs_path_change3_t(object):
     """Proxy of C svn_fs_path_change3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_path_change3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_path_change3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _fs.svn_fs_path_change3_t_path_set
-    __swig_getmethods__["path"] = _fs.svn_fs_path_change3_t_path_get
-    __swig_setmethods__["change_kind"] = _fs.svn_fs_path_change3_t_change_kind_set
-    __swig_getmethods__["change_kind"] = _fs.svn_fs_path_change3_t_change_kind_get
-    __swig_setmethods__["node_kind"] = _fs.svn_fs_path_change3_t_node_kind_set
-    __swig_getmethods__["node_kind"] = _fs.svn_fs_path_change3_t_node_kind_get
-    __swig_setmethods__["text_mod"] = _fs.svn_fs_path_change3_t_text_mod_set
-    __swig_getmethods__["text_mod"] = _fs.svn_fs_path_change3_t_text_mod_get
-    __swig_setmethods__["prop_mod"] = _fs.svn_fs_path_change3_t_prop_mod_set
-    __swig_getmethods__["prop_mod"] = _fs.svn_fs_path_change3_t_prop_mod_get
-    __swig_setmethods__["mergeinfo_mod"] = _fs.svn_fs_path_change3_t_mergeinfo_mod_set
-    __swig_getmethods__["mergeinfo_mod"] = _fs.svn_fs_path_change3_t_mergeinfo_mod_get
-    __swig_setmethods__["copyfrom_known"] = _fs.svn_fs_path_change3_t_copyfrom_known_set
-    __swig_getmethods__["copyfrom_known"] = _fs.svn_fs_path_change3_t_copyfrom_known_get
-    __swig_setmethods__["copyfrom_rev"] = _fs.svn_fs_path_change3_t_copyfrom_rev_set
-    __swig_getmethods__["copyfrom_rev"] = _fs.svn_fs_path_change3_t_copyfrom_rev_get
-    __swig_setmethods__["copyfrom_path"] = _fs.svn_fs_path_change3_t_copyfrom_path_set
-    __swig_getmethods__["copyfrom_path"] = _fs.svn_fs_path_change3_t_copyfrom_path_get
+    path = _swig_property(_fs.svn_fs_path_change3_t_path_get, _fs.svn_fs_path_change3_t_path_set)
+    change_kind = _swig_property(_fs.svn_fs_path_change3_t_change_kind_get, _fs.svn_fs_path_change3_t_change_kind_set)
+    node_kind = _swig_property(_fs.svn_fs_path_change3_t_node_kind_get, _fs.svn_fs_path_change3_t_node_kind_set)
+    text_mod = _swig_property(_fs.svn_fs_path_change3_t_text_mod_get, _fs.svn_fs_path_change3_t_text_mod_set)
+    prop_mod = _swig_property(_fs.svn_fs_path_change3_t_prop_mod_get, _fs.svn_fs_path_change3_t_prop_mod_set)
+    mergeinfo_mod = _swig_property(_fs.svn_fs_path_change3_t_mergeinfo_mod_get, _fs.svn_fs_path_change3_t_mergeinfo_mod_set)
+    copyfrom_known = _swig_property(_fs.svn_fs_path_change3_t_copyfrom_known_get, _fs.svn_fs_path_change3_t_copyfrom_known_set)
+    copyfrom_rev = _swig_property(_fs.svn_fs_path_change3_t_copyfrom_rev_get, _fs.svn_fs_path_change3_t_copyfrom_rev_set)
+    copyfrom_path = _swig_property(_fs.svn_fs_path_change3_t_copyfrom_path_get, _fs.svn_fs_path_change3_t_copyfrom_path_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -416,23 +441,57 @@ class svn_fs_path_change3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -442,40 +501,28 @@ class svn_fs_path_change3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_path_change3_t_swigregister = _fs.svn_fs_path_change3_t_swigregister
 svn_fs_path_change3_t_swigregister(svn_fs_path_change3_t)
 
-class svn_fs_path_change2_t:
+class svn_fs_path_change2_t(object):
     """Proxy of C svn_fs_path_change2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_path_change2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_path_change2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["node_rev_id"] = _fs.svn_fs_path_change2_t_node_rev_id_set
-    __swig_getmethods__["node_rev_id"] = _fs.svn_fs_path_change2_t_node_rev_id_get
-    __swig_setmethods__["change_kind"] = _fs.svn_fs_path_change2_t_change_kind_set
-    __swig_getmethods__["change_kind"] = _fs.svn_fs_path_change2_t_change_kind_get
-    __swig_setmethods__["text_mod"] = _fs.svn_fs_path_change2_t_text_mod_set
-    __swig_getmethods__["text_mod"] = _fs.svn_fs_path_change2_t_text_mod_get
-    __swig_setmethods__["prop_mod"] = _fs.svn_fs_path_change2_t_prop_mod_set
-    __swig_getmethods__["prop_mod"] = _fs.svn_fs_path_change2_t_prop_mod_get
-    __swig_setmethods__["node_kind"] = _fs.svn_fs_path_change2_t_node_kind_set
-    __swig_getmethods__["node_kind"] = _fs.svn_fs_path_change2_t_node_kind_get
-    __swig_setmethods__["copyfrom_known"] = _fs.svn_fs_path_change2_t_copyfrom_known_set
-    __swig_getmethods__["copyfrom_known"] = _fs.svn_fs_path_change2_t_copyfrom_known_get
-    __swig_setmethods__["copyfrom_rev"] = _fs.svn_fs_path_change2_t_copyfrom_rev_set
-    __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
+    node_rev_id = _swig_property(_fs.svn_fs_path_change2_t_node_rev_id_get, _fs.svn_fs_path_change2_t_node_rev_id_set)
+    change_kind = _swig_property(_fs.svn_fs_path_change2_t_change_kind_get, _fs.svn_fs_path_change2_t_change_kind_set)
+    text_mod = _swig_property(_fs.svn_fs_path_change2_t_text_mod_get, _fs.svn_fs_path_change2_t_text_mod_set)
+    prop_mod = _swig_property(_fs.svn_fs_path_change2_t_prop_mod_get, _fs.svn_fs_path_change2_t_prop_mod_set)
+    node_kind = _swig_property(_fs.svn_fs_path_change2_t_node_kind_get, _fs.svn_fs_path_change2_t_node_kind_set)
+    copyfrom_known = _swig_property(_fs.svn_fs_path_change2_t_copyfrom_known_get, _fs.svn_fs_path_change2_t_copyfrom_known_set)
+    copyfrom_rev = _swig_property(_fs.svn_fs_path_change2_t_copyfrom_rev_get, _fs.svn_fs_path_change2_t_copyfrom_rev_set)
+    copyfrom_path = _swig_property(_fs.svn_fs_path_change2_t_copyfrom_path_get, _fs.svn_fs_path_change2_t_copyfrom_path_set)
+    mergeinfo_mod = _swig_property(_fs.svn_fs_path_change2_t_mergeinfo_mod_get, _fs.svn_fs_path_change2_t_mergeinfo_mod_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -490,23 +537,57 @@ class svn_fs_path_change2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -516,30 +597,23 @@ class svn_fs_path_change2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_path_change2_t_swigregister = _fs.svn_fs_path_change2_t_swigregister
 svn_fs_path_change2_t_swigregister(svn_fs_path_change2_t)
 
-class svn_fs_path_change_t:
+class svn_fs_path_change_t(object):
     """Proxy of C svn_fs_path_change_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_path_change_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_path_change_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["node_rev_id"] = _fs.svn_fs_path_change_t_node_rev_id_set
-    __swig_getmethods__["node_rev_id"] = _fs.svn_fs_path_change_t_node_rev_id_get
-    __swig_setmethods__["change_kind"] = _fs.svn_fs_path_change_t_change_kind_set
-    __swig_getmethods__["change_kind"] = _fs.svn_fs_path_change_t_change_kind_get
-    __swig_setmethods__["text_mod"] = _fs.svn_fs_path_change_t_text_mod_set
-    __swig_getmethods__["text_mod"] = _fs.svn_fs_path_change_t_text_mod_get
-    __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
+    node_rev_id = _swig_property(_fs.svn_fs_path_change_t_node_rev_id_get, _fs.svn_fs_path_change_t_node_rev_id_set)
+    change_kind = _swig_property(_fs.svn_fs_path_change_t_change_kind_get, _fs.svn_fs_path_change_t_change_kind_set)
+    text_mod = _swig_property(_fs.svn_fs_path_change_t_text_mod_get, _fs.svn_fs_path_change_t_text_mod_set)
+    prop_mod = _swig_property(_fs.svn_fs_path_change_t_prop_mod_get, _fs.svn_fs_path_change_t_prop_mod_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -554,23 +628,57 @@ class svn_fs_path_change_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -580,156 +688,150 @@ class svn_fs_path_change_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_path_change_t_swigregister = _fs.svn_fs_path_change_t_swigregister
 svn_fs_path_change_t_swigregister(svn_fs_path_change_t)
 
 
-def svn_fs_path_change2_create(*args):
+def svn_fs_path_change2_create(*args) -> "svn_fs_path_change2_t *":
     """svn_fs_path_change2_create(svn_fs_id_t const * node_rev_id, svn_fs_path_change_kind_t change_kind, apr_pool_t pool) -> svn_fs_path_change2_t"""
     return _fs.svn_fs_path_change2_create(*args)
 
-def svn_fs_path_change3_create(*args):
+def svn_fs_path_change3_create(*args) -> "svn_fs_path_change3_t *":
     """svn_fs_path_change3_create(svn_fs_path_change_kind_t change_kind, apr_pool_t result_pool) -> svn_fs_path_change3_t"""
     return _fs.svn_fs_path_change3_create(*args)
 
-def svn_fs_path_change3_dup(*args):
+def svn_fs_path_change3_dup(*args) -> "svn_fs_path_change3_t *":
     """svn_fs_path_change3_dup(svn_fs_path_change3_t change, apr_pool_t result_pool) -> svn_fs_path_change3_t"""
     return _fs.svn_fs_path_change3_dup(*args)
 
-def svn_fs_path_change_get(iterator):
+def svn_fs_path_change_get(iterator: 'svn_fs_path_change_iterator_t *') -> "SWIGTYPE **":
     """svn_fs_path_change_get(svn_fs_path_change_iterator_t * iterator) -> svn_error_t"""
     return _fs.svn_fs_path_change_get(iterator)
 
-def svn_fs_paths_changed3(*args):
+def svn_fs_paths_changed3(*args) -> "SWIGTYPE **":
     """svn_fs_paths_changed3(svn_fs_root_t * root, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_paths_changed3(*args)
 
-def svn_fs_paths_changed2(*args):
+def svn_fs_paths_changed2(*args) -> "apr_hash_t **":
     """svn_fs_paths_changed2(svn_fs_root_t * root, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_paths_changed2(*args)
 
-def svn_fs_paths_changed(*args):
+def svn_fs_paths_changed(*args) -> "apr_hash_t **":
     """svn_fs_paths_changed(svn_fs_root_t * root, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_paths_changed(*args)
 
-def svn_fs_check_path(*args):
+def svn_fs_check_path(*args) -> "svn_node_kind_t *":
     """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):
+def svn_fs_node_history2(*args) -> "svn_fs_history_t **":
     """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):
+def svn_fs_node_history(*args) -> "svn_fs_history_t **":
     """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):
+def svn_fs_history_prev2(*args) -> "svn_fs_history_t **":
     """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):
+def svn_fs_history_prev(*args) -> "svn_fs_history_t **":
     """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)
 
-def svn_fs_history_location(*args):
+def svn_fs_history_location(*args) -> "char const **, svn_revnum_t *":
     """svn_fs_history_location(svn_fs_history_t * history, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_history_location(*args)
 
-def svn_fs_is_dir(*args):
+def svn_fs_is_dir(*args) -> "svn_boolean_t *":
     """svn_fs_is_dir(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_is_dir(*args)
 
-def svn_fs_is_file(*args):
+def svn_fs_is_file(*args) -> "svn_boolean_t *":
     """svn_fs_is_file(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_is_file(*args)
 
-def svn_fs_node_id(*args):
+def svn_fs_node_id(*args) -> "svn_fs_id_t **":
     """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):
+def svn_fs_node_relation(*args) -> "svn_error_t *":
     """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):
+def svn_fs_node_created_rev(*args) -> "svn_revnum_t *":
     """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)
 
-def svn_fs_node_origin_rev(*args):
+def svn_fs_node_origin_rev(*args) -> "svn_revnum_t *":
     """svn_fs_node_origin_rev(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_node_origin_rev(*args)
 
-def svn_fs_node_created_path(*args):
+def svn_fs_node_created_path(*args) -> "char const **":
     """svn_fs_node_created_path(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_node_created_path(*args)
 
-def svn_fs_node_prop(*args):
+def svn_fs_node_prop(*args) -> "svn_string_t **":
     """svn_fs_node_prop(svn_fs_root_t * root, char const * path, char const * propname, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_node_prop(*args)
 
-def svn_fs_node_proplist(*args):
+def svn_fs_node_proplist(*args) -> "apr_hash_t **":
     """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):
+def svn_fs_node_has_props(*args) -> "svn_boolean_t *":
     """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):
+def svn_fs_change_node_prop(*args) -> "svn_error_t *":
     """svn_fs_change_node_prop(svn_fs_root_t * root, char const * path, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_change_node_prop(*args)
 
-def svn_fs_props_different(*args):
+def svn_fs_props_different(*args) -> "svn_boolean_t *":
     """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):
+def svn_fs_props_changed(*args) -> "svn_boolean_t *":
     """svn_fs_props_changed(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_props_changed(*args)
 
-def svn_fs_copied_from(*args):
+def svn_fs_copied_from(*args) -> "svn_revnum_t *, char const **":
     """svn_fs_copied_from(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_copied_from(*args)
 
-def svn_fs_closest_copy(*args):
+def svn_fs_closest_copy(*args) -> "svn_fs_root_t **, char const **":
     """svn_fs_closest_copy(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_closest_copy(*args)
 
-def svn_fs_get_mergeinfo3(*args):
+def svn_fs_get_mergeinfo3(*args) -> "svn_error_t *":
     """svn_fs_get_mergeinfo3(svn_fs_root_t * root, apr_array_header_t paths, svn_mergeinfo_inheritance_t inherit, svn_boolean_t include_descendants, svn_boolean_t adjust_inherited_mergeinfo, svn_fs_mergeinfo_receiver_t receiver, void * baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_get_mergeinfo3(*args)
 
-def svn_fs_get_mergeinfo2(*args):
+def svn_fs_get_mergeinfo2(*args) -> "apr_hash_t **":
     """svn_fs_get_mergeinfo2(svn_fs_root_t * root, apr_array_header_t paths, svn_mergeinfo_inheritance_t inherit, svn_boolean_t include_descendants, svn_boolean_t adjust_inherited_mergeinfo, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_get_mergeinfo2(*args)
 
-def svn_fs_get_mergeinfo(*args):
+def svn_fs_get_mergeinfo(*args) -> "apr_hash_t **":
     """svn_fs_get_mergeinfo(svn_fs_root_t * root, apr_array_header_t paths, svn_mergeinfo_inheritance_t inherit, svn_boolean_t include_descendants, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_get_mergeinfo(*args)
 
-def svn_fs_merge(*args):
+def svn_fs_merge(*args) -> "char const **":
     """svn_fs_merge(svn_fs_root_t * source_root, char const * source_path, svn_fs_root_t * target_root, char const * target_path, svn_fs_root_t * ancestor_root, char const * ancestor_path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_merge(*args)
-class svn_fs_dirent_t:
+class svn_fs_dirent_t(object):
     """Proxy of C svn_fs_dirent_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_dirent_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_dirent_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _fs.svn_fs_dirent_t_name_set
-    __swig_getmethods__["name"] = _fs.svn_fs_dirent_t_name_get
-    __swig_setmethods__["id"] = _fs.svn_fs_dirent_t_id_set
-    __swig_getmethods__["id"] = _fs.svn_fs_dirent_t_id_get
-    __swig_setmethods__["kind"] = _fs.svn_fs_dirent_t_kind_set
-    __swig_getmethods__["kind"] = _fs.svn_fs_dirent_t_kind_get
+    name = _swig_property(_fs.svn_fs_dirent_t_name_get, _fs.svn_fs_dirent_t_name_set)
+    id = _swig_property(_fs.svn_fs_dirent_t_id_get, _fs.svn_fs_dirent_t_id_set)
+    kind = _swig_property(_fs.svn_fs_dirent_t_kind_get, _fs.svn_fs_dirent_t_kind_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -744,23 +846,57 @@ class svn_fs_dirent_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -770,173 +906,173 @@ class svn_fs_dirent_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_dirent_t_swigregister = _fs.svn_fs_dirent_t_swigregister
 svn_fs_dirent_t_swigregister(svn_fs_dirent_t)
 
 
-def svn_fs_dir_entries(*args):
+def svn_fs_dir_entries(*args) -> "apr_hash_t **":
     """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):
+def svn_fs_dir_optimal_order(*args) -> "SWIGTYPE **":
     """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):
+def svn_fs_make_dir(*args) -> "svn_error_t *":
     """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)
 
-def svn_fs_delete(*args):
+def svn_fs_delete(*args) -> "svn_error_t *":
     """svn_fs_delete(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_delete(*args)
 
-def svn_fs_copy(*args):
+def svn_fs_copy(*args) -> "svn_error_t *":
     """svn_fs_copy(svn_fs_root_t * from_root, char const * from_path, svn_fs_root_t * to_root, char const * to_path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_copy(*args)
 
-def svn_fs_revision_link(*args):
+def svn_fs_revision_link(*args) -> "svn_error_t *":
     """svn_fs_revision_link(svn_fs_root_t * from_root, svn_fs_root_t * to_root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_revision_link(*args)
 
-def svn_fs_file_length(*args):
+def svn_fs_file_length(*args) -> "svn_filesize_t *":
     """svn_fs_file_length(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_file_length(*args)
 
-def svn_fs_file_checksum(*args):
+def svn_fs_file_checksum(*args) -> "svn_checksum_t **":
     """svn_fs_file_checksum(svn_checksum_kind_t kind, svn_fs_root_t * root, char const * path, svn_boolean_t force, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_file_checksum(*args)
 
-def svn_fs_file_md5_checksum(*args):
+def svn_fs_file_md5_checksum(*args) -> "unsigned char [ANY]":
     """svn_fs_file_md5_checksum(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_file_md5_checksum(*args)
 
-def svn_fs_file_contents(*args):
+def svn_fs_file_contents(*args) -> "svn_stream_t **":
     """svn_fs_file_contents(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_file_contents(*args)
 
-def svn_fs_try_process_file_contents(*args):
+def svn_fs_try_process_file_contents(*args) -> "svn_boolean_t *":
     """svn_fs_try_process_file_contents(svn_fs_root_t * root, char const * path, svn_fs_process_contents_func_t processor, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_try_process_file_contents(*args)
 
-def svn_fs_make_file(*args):
+def svn_fs_make_file(*args) -> "svn_error_t *":
     """svn_fs_make_file(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_make_file(*args)
 
-def svn_fs_apply_textdelta(*args):
+def svn_fs_apply_textdelta(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_fs_apply_textdelta(svn_fs_root_t * root, char const * path, char const * base_checksum, char const * result_checksum, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_apply_textdelta(*args)
 
-def svn_fs_apply_text(*args):
+def svn_fs_apply_text(*args) -> "svn_stream_t **":
     """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):
+def svn_fs_contents_different(*args) -> "svn_boolean_t *":
     """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):
+def svn_fs_contents_changed(*args) -> "svn_boolean_t *":
     """svn_fs_contents_changed(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_contents_changed(*args)
 
-def svn_fs_youngest_rev(*args):
+def svn_fs_youngest_rev(*args) -> "svn_revnum_t *":
     """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):
+def svn_fs_info_format(*args) -> "int *, SWIGTYPE **":
     """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):
+def svn_fs_info_config_files(*args) -> "SWIGTYPE **":
     """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):
+def svn_fs_deltify_revision(*args) -> "svn_error_t *":
     """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)
 
-def svn_fs_refresh_revision_props(*args):
+def svn_fs_refresh_revision_props(*args) -> "svn_error_t *":
     """svn_fs_refresh_revision_props(svn_fs_t * fs, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_refresh_revision_props(*args)
 
-def svn_fs_revision_prop2(*args):
+def svn_fs_revision_prop2(*args) -> "svn_string_t **":
     """svn_fs_revision_prop2(svn_fs_t * fs, svn_revnum_t rev, char const * propname, svn_boolean_t refresh, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_revision_prop2(*args)
 
-def svn_fs_revision_prop(*args):
+def svn_fs_revision_prop(*args) -> "svn_string_t **":
     """svn_fs_revision_prop(svn_fs_t * fs, svn_revnum_t rev, char const * propname, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_revision_prop(*args)
 
-def svn_fs_revision_proplist2(*args):
+def svn_fs_revision_proplist2(*args) -> "apr_hash_t **":
     """svn_fs_revision_proplist2(svn_fs_t * fs, svn_revnum_t rev, svn_boolean_t refresh, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_revision_proplist2(*args)
 
-def svn_fs_revision_proplist(*args):
+def svn_fs_revision_proplist(*args) -> "apr_hash_t **":
     """svn_fs_revision_proplist(svn_fs_t * fs, svn_revnum_t rev, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_revision_proplist(*args)
 
-def svn_fs_change_rev_prop2(*args):
+def svn_fs_change_rev_prop2(*args) -> "svn_string_t **":
     """svn_fs_change_rev_prop2(svn_fs_t * fs, svn_revnum_t rev, char const * name, svn_string_t const *const * old_value_p, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_change_rev_prop2(*args)
 
-def svn_fs_change_rev_prop(*args):
+def svn_fs_change_rev_prop(*args) -> "svn_error_t *":
     """svn_fs_change_rev_prop(svn_fs_t * fs, svn_revnum_t rev, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_change_rev_prop(*args)
 
-def svn_fs_get_file_delta_stream(*args):
+def svn_fs_get_file_delta_stream(*args) -> "svn_txdelta_stream_t **":
     """svn_fs_get_file_delta_stream(svn_fs_root_t * source_root, char const * source_path, svn_fs_root_t * target_root, char const * target_path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_get_file_delta_stream(*args)
 
-def svn_fs_get_uuid(*args):
+def svn_fs_get_uuid(*args) -> "char const **":
     """svn_fs_get_uuid(svn_fs_t * fs, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_get_uuid(*args)
 
-def svn_fs_set_uuid(*args):
+def svn_fs_set_uuid(*args) -> "svn_error_t *":
     """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):
+def svn_fs_lock_target_create(*args) -> "svn_fs_lock_target_t *":
     """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(target, token):
+def svn_fs_lock_target_set_token(target: 'svn_fs_lock_target_t *', token: 'char const *') -> "void":
     """svn_fs_lock_target_set_token(svn_fs_lock_target_t * target, char const * token)"""
     return _fs.svn_fs_lock_target_set_token(target, token)
 
-def svn_fs_lock_many(*args):
+def svn_fs_lock_many(*args) -> "svn_error_t *":
     """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):
+def svn_fs_lock(*args) -> "svn_lock_t **":
     """svn_fs_lock(svn_fs_t * fs, char const * path, char const * token, char const * comment, svn_boolean_t is_dav_comment, apr_time_t expiration_date, svn_revnum_t current_rev, svn_boolean_t steal_lock, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_lock(*args)
 
-def svn_fs_generate_lock_token(*args):
+def svn_fs_generate_lock_token(*args) -> "char const **":
     """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):
+def svn_fs_unlock_many(*args) -> "svn_error_t *":
     """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):
+def svn_fs_unlock(*args) -> "svn_error_t *":
     """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)
 
-def svn_fs_get_lock(*args):
+def svn_fs_get_lock(*args) -> "svn_lock_t **":
     """svn_fs_get_lock(svn_fs_t * fs, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_get_lock(*args)
 
-def svn_fs_get_locks2(*args):
+def svn_fs_get_locks2(*args) -> "svn_error_t *":
     """svn_fs_get_locks2(svn_fs_t * fs, char const * path, svn_depth_t depth, svn_fs_get_locks_callback_t get_locks_func, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_get_locks2(*args)
 
-def svn_fs_get_locks(*args):
+def svn_fs_get_locks(*args) -> "svn_error_t *":
     """svn_fs_get_locks(svn_fs_t * fs, char const * path, svn_fs_get_locks_callback_t get_locks_func, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_get_locks(*args)
 
-def svn_fs_print_modules(*args):
+def svn_fs_print_modules(*args) -> "svn_error_t *":
     """svn_fs_print_modules(svn_stringbuf_t * output, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_print_modules(*args)
 svn_fs_pack_notify_start = _fs.svn_fs_pack_notify_start
@@ -945,36 +1081,29 @@ svn_fs_pack_notify_start_revprop = _fs.svn_fs_pack_notify_start_revprop
 svn_fs_pack_notify_end_revprop = _fs.svn_fs_pack_notify_end_revprop
 svn_fs_pack_notify_noop = _fs.svn_fs_pack_notify_noop
 
-def svn_fs_pack(*args):
+def svn_fs_pack(*args) -> "svn_error_t *":
     """svn_fs_pack(char const * db_path, svn_fs_pack_notify_t notify_func, void * notify_baton, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_pack(*args)
 
-def svn_fs_verify(*args):
+def svn_fs_verify(*args) -> "svn_error_t *":
     """svn_fs_verify(char const * path, apr_hash_t fs_config, svn_revnum_t start, svn_revnum_t end, svn_fs_progress_notify_func_t notify_func, void * notify_baton, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_verify(*args)
 
-def svn_fs_verify_root(*args):
+def svn_fs_verify_root(*args) -> "svn_error_t *":
     """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_fsfs_info_t:
+class svn_fs_fsfs_info_t(object):
     """Proxy of C svn_fs_fsfs_info_t struct."""
 
-    __swig_setmethods__ = {}
-    __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_fsfs_info_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     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
+    fs_type = _swig_property(_fs.svn_fs_fsfs_info_t_fs_type_get, _fs.svn_fs_fsfs_info_t_fs_type_set)
+    shard_size = _swig_property(_fs.svn_fs_fsfs_info_t_shard_size_get, _fs.svn_fs_fsfs_info_t_shard_size_set)
+    min_unpacked_rev = _swig_property(_fs.svn_fs_fsfs_info_t_min_unpacked_rev_get, _fs.svn_fs_fsfs_info_t_min_unpacked_rev_set)
+    log_addressing = _swig_property(_fs.svn_fs_fsfs_info_t_log_addressing_get, _fs.svn_fs_fsfs_info_t_log_addressing_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -989,23 +1118,57 @@ class svn_fs_fsfs_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1015,28 +1178,22 @@ class svn_fs_fsfs_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, 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:
+class svn_fs_fsx_info_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     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
+    fs_type = _swig_property(_fs.svn_fs_fsx_info_t_fs_type_get, _fs.svn_fs_fsx_info_t_fs_type_set)
+    shard_size = _swig_property(_fs.svn_fs_fsx_info_t_shard_size_get, _fs.svn_fs_fsx_info_t_shard_size_set)
+    min_unpacked_rev = _swig_property(_fs.svn_fs_fsx_info_t_min_unpacked_rev_get, _fs.svn_fs_fsx_info_t_min_unpacked_rev_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1051,23 +1208,57 @@ class svn_fs_fsx_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1077,24 +1268,20 @@ class svn_fs_fsx_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, 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:
+class svn_fs_info_placeholder_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     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
+    fs_type = _swig_property(_fs.svn_fs_info_placeholder_t_fs_type_get, _fs.svn_fs_info_placeholder_t_fs_type_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1109,23 +1296,57 @@ class svn_fs_info_placeholder_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1135,34 +1356,29 @@ class svn_fs_info_placeholder_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, 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):
+def svn_fs_info(*args) -> "SWIGTYPE **":
     """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):
+def svn_fs_info_dup(*args) -> "void *":
     """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_ioctl_code_t:
+class svn_fs_ioctl_code_t(object):
     """Proxy of C svn_fs_ioctl_code_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_ioctl_code_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_ioctl_code_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["fs_type"] = _fs.svn_fs_ioctl_code_t_fs_type_set
-    __swig_getmethods__["fs_type"] = _fs.svn_fs_ioctl_code_t_fs_type_get
-    __swig_setmethods__["code"] = _fs.svn_fs_ioctl_code_t_code_set
-    __swig_getmethods__["code"] = _fs.svn_fs_ioctl_code_t_code_get
+    fs_type = _swig_property(_fs.svn_fs_ioctl_code_t_fs_type_get, _fs.svn_fs_ioctl_code_t_fs_type_set)
+    code = _swig_property(_fs.svn_fs_ioctl_code_t_code_get, _fs.svn_fs_ioctl_code_t_code_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1177,23 +1393,57 @@ class svn_fs_ioctl_code_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1203,22 +1453,19 @@ class svn_fs_ioctl_code_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_ioctl_code_t_swigregister = _fs.svn_fs_ioctl_code_t_swigregister
 svn_fs_ioctl_code_t_swigregister(svn_fs_ioctl_code_t)
 
 
-def svn_fs_ioctl(*args):
+def svn_fs_ioctl(*args) -> "SWIGTYPE **":
     """svn_fs_ioctl(svn_fs_t * fs, svn_fs_ioctl_code_t ctlcode, void * input, svn_cancel_func_t cancel_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_ioctl(*args)
-class svn_fs_t:
+class svn_fs_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1237,23 +1484,57 @@ class svn_fs_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1263,18 +1544,15 @@ class svn_fs_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_t_swigregister = _fs.svn_fs_t_swigregister
 svn_fs_t_swigregister(svn_fs_t)
 
-class svn_fs_access_t:
+class svn_fs_access_t(object):
     """Proxy of C svn_fs_access_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_access_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_access_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1293,23 +1571,57 @@ class svn_fs_access_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1319,18 +1631,15 @@ class svn_fs_access_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_access_t_swigregister = _fs.svn_fs_access_t_swigregister
 svn_fs_access_t_swigregister(svn_fs_access_t)
 
-class svn_fs_id_t:
+class svn_fs_id_t(object):
     """Proxy of C svn_fs_id_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_id_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_id_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1349,23 +1658,57 @@ class svn_fs_id_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1375,18 +1718,15 @@ class svn_fs_id_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_id_t_swigregister = _fs.svn_fs_id_t_swigregister
 svn_fs_id_t_swigregister(svn_fs_id_t)
 
-class svn_fs_txn_t:
+class svn_fs_txn_t(object):
     """Proxy of C svn_fs_txn_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_txn_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_txn_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1405,23 +1745,57 @@ class svn_fs_txn_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1431,18 +1805,15 @@ class svn_fs_txn_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_txn_t_swigregister = _fs.svn_fs_txn_t_swigregister
 svn_fs_txn_t_swigregister(svn_fs_txn_t)
 
-class svn_fs_root_t:
+class svn_fs_root_t(object):
     """Proxy of C svn_fs_root_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_root_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_root_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1461,23 +1832,57 @@ class svn_fs_root_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1487,18 +1892,15 @@ class svn_fs_root_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_root_t_swigregister = _fs.svn_fs_root_t_swigregister
 svn_fs_root_t_swigregister(svn_fs_root_t)
 
-class svn_fs_path_change_iterator_t:
+class svn_fs_path_change_iterator_t(object):
     """Proxy of C svn_fs_path_change_iterator_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_path_change_iterator_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_path_change_iterator_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1517,23 +1919,57 @@ class svn_fs_path_change_iterator_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1543,18 +1979,15 @@ class svn_fs_path_change_iterator_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_fs_path_change_iterator_t_swigregister = _fs.svn_fs_path_change_iterator_t_swigregister
 svn_fs_path_change_iterator_t_swigregister(svn_fs_path_change_iterator_t)
 
-class svn_fs_history_t:
+class svn_fs_history_t(object):
     """Proxy of C svn_fs_history_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_history_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_history_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1573,23 +2006,57 @@ class svn_fs_history_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1599,18 +2066,15 @@ class svn_fs_history_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, 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:
+class svn_fs_lock_target_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1629,23 +2093,57 @@ class svn_fs_lock_target_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1655,58 +2153,55 @@ class svn_fs_lock_target_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 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(_obj, baton, err):
+def svn_fs_invoke_warning_callback(_obj: 'svn_fs_warning_callback_t', baton: 'void *', err: 'svn_error_t') -> "void":
     """svn_fs_invoke_warning_callback(svn_fs_warning_callback_t _obj, void * baton, svn_error_t err)"""
     return _fs.svn_fs_invoke_warning_callback(_obj, baton, err)
 
-def svn_fs_invoke_upgrade_notify(*args):
+def svn_fs_invoke_upgrade_notify(*args) -> "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) -> svn_error_t"""
     return _fs.svn_fs_invoke_upgrade_notify(*args)
 
-def svn_fs_invoke_progress_notify_func(*args):
+def svn_fs_invoke_progress_notify_func(*args) -> "void":
     """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):
+def svn_fs_invoke_hotcopy_notify(*args) -> "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)"""
     return _fs.svn_fs_invoke_hotcopy_notify(*args)
 
-def svn_fs_invoke_freeze_func(*args):
+def svn_fs_invoke_freeze_func(*args) -> "svn_error_t *":
     """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)
 
-def svn_fs_invoke_mergeinfo_receiver(*args):
+def svn_fs_invoke_mergeinfo_receiver(*args) -> "svn_error_t *":
     """svn_fs_invoke_mergeinfo_receiver(svn_fs_mergeinfo_receiver_t _obj, char const * path, apr_hash_t mergeinfo, void * baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_invoke_mergeinfo_receiver(*args)
 
-def svn_fs_invoke_process_contents_func(*args):
+def svn_fs_invoke_process_contents_func(*args) -> "svn_error_t *":
     """svn_fs_invoke_process_contents_func(svn_fs_process_contents_func_t _obj, unsigned char const * contents, apr_size_t len, void * baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _fs.svn_fs_invoke_process_contents_func(*args)
 
-def svn_fs_invoke_lock_callback(*args):
+def svn_fs_invoke_lock_callback(*args) -> "svn_error_t *":
     """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):
+def svn_fs_invoke_get_locks_callback(*args) -> "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) -> svn_error_t"""
     return _fs.svn_fs_invoke_get_locks_callback(*args)
 
-def svn_fs_invoke_pack_notify(*args):
+def svn_fs_invoke_pack_notify(*args) -> "svn_error_t *":
     """svn_fs_invoke_pack_notify(svn_fs_pack_notify_t _obj, void * baton, apr_int64_t shard, svn_fs_pack_notify_action_t action, apr_pool_t pool) -> svn_error_t"""
     return _fs.svn_fs_invoke_pack_notify(*args)
-class svn_fs_warning_callback_t:
+class svn_fs_warning_callback_t(object):
     """Proxy of C svn_fs_warning_callback_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_warning_callback_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_warning_callback_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1725,23 +2220,57 @@ class svn_fs_warning_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1751,7 +2280,7 @@ class svn_fs_warning_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1760,13 +2289,10 @@ 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:
+class svn_fs_upgrade_notify_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1785,23 +2311,57 @@ class svn_fs_upgrade_notify_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1811,7 +2371,7 @@ class svn_fs_upgrade_notify_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1820,13 +2380,10 @@ class svn_fs_upgrade_notify_t:
 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:
+class svn_fs_progress_notify_func_t(object):
     """Proxy of C svn_fs_progress_notify_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_progress_notify_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_progress_notify_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1845,23 +2402,57 @@ class svn_fs_progress_notify_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1871,7 +2462,7 @@ class svn_fs_progress_notify_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1880,13 +2471,10 @@ 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:
+class svn_fs_hotcopy_notify_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1905,23 +2493,57 @@ class svn_fs_hotcopy_notify_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1931,7 +2553,7 @@ class svn_fs_hotcopy_notify_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1940,13 +2562,10 @@ class svn_fs_hotcopy_notify_t:
 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:
+class svn_fs_freeze_func_t(object):
     """Proxy of C svn_fs_freeze_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_freeze_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_freeze_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1965,23 +2584,57 @@ class svn_fs_freeze_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1991,7 +2644,7 @@ class svn_fs_freeze_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2000,13 +2653,10 @@ class svn_fs_freeze_func_t:
 svn_fs_freeze_func_t_swigregister = _fs.svn_fs_freeze_func_t_swigregister
 svn_fs_freeze_func_t_swigregister(svn_fs_freeze_func_t)
 
-class svn_fs_mergeinfo_receiver_t:
+class svn_fs_mergeinfo_receiver_t(object):
     """Proxy of C svn_fs_mergeinfo_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_mergeinfo_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_mergeinfo_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2025,23 +2675,57 @@ class svn_fs_mergeinfo_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2051,7 +2735,7 @@ class svn_fs_mergeinfo_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2060,13 +2744,10 @@ class svn_fs_mergeinfo_receiver_t:
 svn_fs_mergeinfo_receiver_t_swigregister = _fs.svn_fs_mergeinfo_receiver_t_swigregister
 svn_fs_mergeinfo_receiver_t_swigregister(svn_fs_mergeinfo_receiver_t)
 
-class svn_fs_process_contents_func_t:
+class svn_fs_process_contents_func_t(object):
     """Proxy of C svn_fs_process_contents_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_process_contents_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_process_contents_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2085,23 +2766,57 @@ class svn_fs_process_contents_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2111,7 +2826,7 @@ class svn_fs_process_contents_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2120,13 +2835,10 @@ 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:
+class svn_fs_lock_callback_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2145,23 +2857,57 @@ class svn_fs_lock_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2171,7 +2917,7 @@ class svn_fs_lock_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2180,13 +2926,10 @@ class svn_fs_lock_callback_t:
 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:
+class svn_fs_get_locks_callback_t(object):
     """Proxy of C svn_fs_get_locks_callback_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_get_locks_callback_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_get_locks_callback_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2205,23 +2948,57 @@ class svn_fs_get_locks_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2231,7 +3008,7 @@ class svn_fs_get_locks_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2240,13 +3017,10 @@ class svn_fs_get_locks_callback_t:
 svn_fs_get_locks_callback_t_swigregister = _fs.svn_fs_get_locks_callback_t_swigregister
 svn_fs_get_locks_callback_t_swigregister(svn_fs_get_locks_callback_t)
 
-class svn_fs_pack_notify_t:
+class svn_fs_pack_notify_t(object):
     """Proxy of C svn_fs_pack_notify_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_pack_notify_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_pack_notify_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2265,23 +3039,57 @@ class svn_fs_pack_notify_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2291,7 +3099,7 @@ class svn_fs_pack_notify_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
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 abe5a2a..346041f 100644
--- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
@@ -23,9 +23,12 @@
 
 /* Tell swigutil_py.h that we're inside the implementation */
 #define SVN_SWIG_SWIGUTIL_PY_C
+/* Avoid deprecation warnings about PY_SSIZE_T_CLEAN since Python 3.8 */
+#define PY_SSIZE_T_CLEAN
 
 #include <Python.h>
 
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -50,6 +53,19 @@
 
 #include "swig_python_external_runtime.swg"
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
+
+#if IS_PY3
+
+/* In Python 3 use the bytes format character for raw data */
+#define SVN_SWIG_BYTES_FMT "y"
+
+#else
+
+/* In Python 2 use the string format character for raw data */
+#define SVN_SWIG_BYTES_FMT "s"
+
+#endif
 
 /* Py_ssize_t for old Pythons */
 /* This code is as recommended by: */
@@ -142,6 +158,35 @@ apr_status_t svn_swig_py_initialize(void)
   return APR_SUCCESS;
 }
 
+FILE *svn_swig_py_as_file(PyObject *pyfile)
+{
+#if IS_PY3
+  FILE *fp = NULL;
+  int fd = PyObject_AsFileDescriptor(pyfile);
+  if (fd >= 0)
+    {
+      PyObject *mode_obj;
+      PyObject *mode_byte_obj = NULL;
+      char *mode = NULL;
+
+      /* If any Python API returns NULL, then the Python exception is set and
+         this function will return NULL signifying to the caller that an error
+         occurred. */
+      if (   NULL != (mode_obj = PyObject_GetAttrString(pyfile, "mode"))
+          && NULL != (mode_byte_obj = PyUnicode_AsUTF8String(mode_obj))
+          && NULL != (mode = PyBytes_AsString(mode_byte_obj)))
+        fp = fdopen(fd, mode);
+
+      Py_XDECREF(mode_obj);
+      Py_XDECREF(mode_byte_obj);
+    }
+
+  return fp;
+#else
+  return PyFile_AsFile(pyfile);
+#endif
+}
+
 int svn_swig_py_get_pool_arg(PyObject *args, swig_type_info *type,
     PyObject **py_pool, apr_pool_t **pool)
 {
@@ -150,14 +195,25 @@ int svn_swig_py_get_pool_arg(PyObject *args, swig_type_info *type,
   if (argnum >= 0)
     {
       PyObject *input = PyTuple_GET_ITEM(args, argnum);
-      if (input != Py_None && PyObject_HasAttrString(input, markValid))
+      if (input != Py_None)
         {
-          *pool = svn_swig_py_must_get_ptr(input, type, argnum+1);
-          if (*pool == NULL)
-            return 1;
-          *py_pool = input;
-          Py_INCREF(input);
-          return 0;
+          PyObject *fn;
+          if (NULL != (fn = PyObject_GetAttrString(input, markValid)))
+            {
+              Py_DECREF(fn);
+
+              *pool = svn_swig_py_must_get_ptr(input, type, argnum+1);
+              if (*pool == NULL)
+                return 1;
+              *py_pool = input;
+              Py_INCREF(input);
+              return 0;
+            }
+          else
+            {
+              /* Clear any getattr() error, it isn't needed. */
+              PyErr_Clear();
+            }
         }
     }
 
@@ -221,13 +277,20 @@ static int proxy_set_pool(PyObject **proxy, PyObject *pool)
     {
       if (pool == NULL)
         {
-          if (PyObject_HasAttrString(*proxy, setParentPool))
+          PyObject *setFn;
+          if (NULL != (setFn = PyObject_GetAttrString(*proxy, setParentPool)))
             {
-              result = PyObject_CallMethod(*proxy, setParentPool, emptyTuple);
+              result = PyObject_CallObject(setFn, NULL);
+              Py_DECREF(setFn);
               if (result == NULL)
                 return 1;
               Py_DECREF(result);
             }
+          else
+            {
+              /* Clear any getattr() error, it isn't needed. */
+              PyErr_Clear();
+            }
         }
       else
         {
@@ -285,23 +348,45 @@ static PyObject *svn_swig_NewPointerObjString(void *ptr, const char *type,
   return svn_swig_py_new_pointer_obj(ptr, typeinfo, py_pool, NULL);
 }
 
-/** Wrapper for SWIG_ConvertPtr */
-int svn_swig_py_convert_ptr(PyObject *input, void **obj, swig_type_info *type)
+static int svn_swig_ensure_valid_swig_wrapper(PyObject *input)
 {
-  if (PyObject_HasAttrString(input, assertValid))
+  PyObject *assertFn;
+  PyObject *unwrapFn;
+  if (NULL != (assertFn = PyObject_GetAttrString(input, assertValid)))
     {
-      PyObject *result = PyObject_CallMethod(input, assertValid, emptyTuple);
+      PyObject *result = PyObject_CallObject(assertFn, NULL);
+      Py_DECREF(assertFn);
       if (result == NULL)
         return 1;
       Py_DECREF(result);
     }
-  if (PyObject_HasAttrString(input, unwrap))
+  else
     {
-      input = PyObject_CallMethod(input, unwrap, emptyTuple);
+      /* Clear any getattr() error, it isn't needed. */
+      PyErr_Clear();
+    }
+  if (NULL != (unwrapFn = PyObject_GetAttrString(input, unwrap)))
+    {
+      input = PyObject_CallObject(unwrapFn, NULL);
+      Py_DECREF(unwrapFn);
       if (input == NULL)
         return 1;
       Py_DECREF(input);
     }
+  else
+    {
+      /* Clear any getattr() error, it isn't needed. */
+      PyErr_Clear();
+    }
+
+  return 0;
+}
+
+/** Wrapper for SWIG_ConvertPtr */
+int svn_swig_py_convert_ptr(PyObject *input, void **obj, swig_type_info *type)
+{
+  if (svn_swig_ensure_valid_swig_wrapper(input))
+    return 1;
 
   return SWIG_ConvertPtr(input, obj, type, SWIG_POINTER_EXCEPTION | 0);
 }
@@ -316,21 +401,8 @@ static int svn_swig_ConvertPtrString(PyObject *input,
 /** Wrapper for SWIG_MustGetPtr */
 void *svn_swig_py_must_get_ptr(void *input, swig_type_info *type, int argnum)
 {
-  if (PyObject_HasAttrString(input, assertValid))
-    {
-      PyObject *result = PyObject_CallMethod(input, assertValid, emptyTuple);
-      if (result == NULL)
-        return NULL;
-      Py_DECREF(result);
-    }
-
-  if (PyObject_HasAttrString(input, unwrap))
-    {
-      input = PyObject_CallMethod(input, unwrap, emptyTuple);
-      if (input == NULL)
-        return NULL;
-      Py_DECREF((PyObject *) input);
-    }
+  if (svn_swig_ensure_valid_swig_wrapper(input))
+    return NULL;
 
   return SWIG_MustGetPtr(input, type, argnum, SWIG_POINTER_EXCEPTION | 0);
 }
@@ -370,14 +442,14 @@ void svn_swig_py_svn_exception(svn_error_t *error_chain)
           Py_INCREF(Py_None);
           message_ob = Py_None;
         }
-      else if ((message_ob = PyString_FromString(err->message)) == NULL)
+      else if ((message_ob = PyStr_FromString(err->message)) == NULL)
         goto finished;
       if (err->file == NULL)
         {
           Py_INCREF(Py_None);
           file_ob = Py_None;
         }
-      else if ((file_ob = PyString_FromString(err->file)) == NULL)
+      else if ((file_ob = PyStr_FromString(err->file)) == NULL)
         goto finished;
       if ((line_ob = PyInt_FromLong(err->line)) == NULL)
         goto finished;
@@ -436,6 +508,36 @@ void svn_swig_py_svn_exception(svn_error_t *error_chain)
 
 /*** Helper/Conversion Routines ***/
 
+/* Function to get char * representation of bytes/str object. This is
+   the replacement of typemap(in, parse="s") and typemap(in, parse="z")
+   to accept both of bytes object and str object, and it assumes to be
+   used from those typemaps only.
+   Note: type of return value should be char const *, however, as SWIG
+   produces variables for C function without 'const' modifier, to avoid
+   ton of cast in SWIG produced C code we drop it from return value
+   types as well  */
+char *svn_swig_py_string_to_cstring(PyObject *input, int maybe_null,
+                                    const char * funcsym, const char * argsym)
+{
+    char *retval = NULL;
+    if (PyBytes_Check(input))
+      {
+        retval = PyBytes_AsString(input);
+      }
+    else if (PyUnicode_Check(input))
+      {
+        retval = (char *)PyStr_AsUTF8(input);
+      }
+    else if (input != Py_None || ! maybe_null)
+      {
+        PyErr_Format(PyExc_TypeError,
+                     "%s() argument %s must be bytes or str%s, not %s",
+                     funcsym, argsym, maybe_null?" or None":"",
+                     Py_TYPE(input)->tp_name);
+      }
+    return retval;
+}
+
 /* Functions for making Python wrappers around Subversion structs */
 static PyObject *make_ob_pool(void *pool)
 {
@@ -470,32 +572,89 @@ static PyObject *make_ob_error(svn_error_t *err)
 
 /***/
 
+static void svn_swig_py_string_type_exception(int maybe_null)
+{
+  PyErr_Format(PyExc_TypeError, "not a bytes or a str%s",
+               maybe_null?" or None":"");
+}
+
 /* Conversion from Python single objects (not hashes/lists/etc.) to
    Subversion types. */
 static char *make_string_from_ob(PyObject *ob, apr_pool_t *pool)
 {
+  /* caller should not expect to raise TypeError: check return value
+     whether it is NULL or not, if needed */
+  if (PyBytes_Check(ob))
+    {
+      return apr_pstrdup(pool, PyBytes_AsString(ob));
+    }
+  if (PyUnicode_Check(ob))
+    {
+      /* PyStr_AsUTF8() may cause UnicodeEncodeError,
+         but apr_pstrdup() allows NULL for s */
+      return apr_pstrdup(pool, PyStr_AsUTF8(ob));
+    }
+  return NULL;
+}
+
+static char *make_string_from_ob_maybe_null(PyObject *ob, apr_pool_t *pool)
+{
+  char * retval;
   if (ob == Py_None)
-    return NULL;
-  if (! PyString_Check(ob))
     {
-      PyErr_SetString(PyExc_TypeError, "not a string");
       return NULL;
     }
-  return apr_pstrdup(pool, PyString_AS_STRING(ob));
+  retval = make_string_from_ob(ob, pool);
+  if (!retval)
+    {
+      if (!PyErr_Occurred())
+        {
+          svn_swig_py_string_type_exception(TRUE);
+        }
+    }
+  return retval;
 }
+
 static svn_string_t *make_svn_string_from_ob(PyObject *ob, apr_pool_t *pool)
 {
+  /* caller should not expect to raise TypeError: check return value
+     whether it is NULL or not, if needed */
+  if (PyBytes_Check(ob))
+    {
+      return svn_string_create(PyBytes_AsString(ob), pool);
+    }
+  if (PyUnicode_Check(ob))
+    {
+      /* PyStr_AsUTF8() may cause UnicodeEncodeError,
+         and svn_string_create() does not allows NULL for cstring */
+      const char *obstr = PyStr_AsUTF8(ob);
+      if (obstr)
+        {
+          return svn_string_create(obstr, pool);
+        }
+    }
+  return NULL;
+}
+
+static svn_string_t *make_svn_string_from_ob_maybe_null(PyObject *ob,
+                                                        apr_pool_t *pool)
+{
+  svn_string_t * retval;
   if (ob == Py_None)
-    return NULL;
-  if (! PyString_Check(ob))
     {
-      PyErr_SetString(PyExc_TypeError, "not a string");
       return NULL;
     }
-  return svn_string_create(PyString_AS_STRING(ob), pool);
+  retval = make_svn_string_from_ob(ob, pool);
+  if (!retval)
+    {
+      if (!PyErr_Occurred())
+        {
+          svn_swig_py_string_type_exception(TRUE);
+        }
+    }
+  return retval;
 }
 
-
 /***/
 
 static PyObject *convert_hash(apr_hash_t *hash,
@@ -527,7 +686,7 @@ static PyObject *convert_hash(apr_hash_t *hash,
             return NULL;
           }
         /* ### gotta cast this thing cuz Python doesn't use "const" */
-        if (PyDict_SetItemString(dict, (char *)key, value) == -1)
+        if (PyDict_SetItem(dict, PyBytes_FromString((char *)key), value) == -1)
           {
             Py_DECREF(value);
             Py_DECREF(dict);
@@ -552,11 +711,10 @@ static PyObject *convert_svn_string_t(void *value, void *ctx,
 
   const svn_string_t *s = value;
 
-  /* ### gotta cast this thing cuz Python doesn't use "const" */
-  return PyString_FromStringAndSize((void *)s->data, s->len);
+  return PyBytes_FromStringAndSize(s->data, s->len);
 }
 
-/* Convert a C string into a Python String object (or a reference to
+/* Convert a C string into a Python Bytes object (or a reference to
    Py_None if CSTRING is NULL). */
 static PyObject *cstring_to_pystring(const char *cstring)
 {
@@ -566,7 +724,7 @@ static PyObject *cstring_to_pystring(const char *cstring)
       Py_INCREF(Py_None);
       return retval;
     }
-  return PyString_FromString(cstring);
+  return PyBytes_FromString(cstring);
 }
 
 static PyObject *convert_svn_client_commit_item3_t(void *value, void *ctx)
@@ -642,8 +800,7 @@ PyObject *svn_swig_py_prophash_to_dict(apr_hash_t *hash)
 static PyObject *convert_string(void *value, void *ctx,
                                 PyObject *py_pool)
 {
-  /* ### gotta cast this thing cuz Python doesn't use "const" */
-  return PyString_FromString((const char *)value);
+  return PyBytes_FromString((const char *)value);
 }
 
 PyObject *svn_swig_py_stringhash_to_dict(apr_hash_t *hash)
@@ -725,7 +882,7 @@ svn_swig_py_propinheriteditemarray_to_dict(const apr_array_header_t *array)
         apr_hash_t *prop_hash = prop_inherited_item->prop_hash;
         PyObject *py_key, *py_value;
 
-        py_key = PyString_FromString(prop_inherited_item->path_or_url);
+        py_key = PyBytes_FromString(prop_inherited_item->path_or_url);
         if (py_key == NULL)
           goto error;
 
@@ -769,7 +926,7 @@ PyObject *svn_swig_py_proparray_to_dict(const apr_array_header_t *array)
 
         prop = APR_ARRAY_IDX(array, i, svn_prop_t);
 
-        py_key = PyString_FromString(prop.name);
+        py_key = PyBytes_FromString(prop.name);
         if (py_key == NULL)
           goto error;
 
@@ -780,8 +937,8 @@ PyObject *svn_swig_py_proparray_to_dict(const apr_array_header_t *array)
           }
         else
           {
-             py_value = PyString_FromStringAndSize((void *)prop.value->data,
-                                                   prop.value->len);
+             py_value = PyBytes_FromStringAndSize(prop.value->data,
+                                                  prop.value->len);
              if (py_value == NULL)
                {
                  Py_DECREF(py_key);
@@ -831,7 +988,7 @@ PyObject *svn_swig_py_locationhash_to_dict(apr_hash_t *hash)
             Py_DECREF(dict);
             return NULL;
           }
-        value = PyString_FromString((char *)v);
+        value = PyBytes_FromString((const char *)v);
         if (value == NULL)
           {
             Py_DECREF(key);
@@ -881,6 +1038,7 @@ DECLARE_SWIG_CONSTRUCTOR(info, svn_info_dup)
 DECLARE_SWIG_CONSTRUCTOR(location_segment, svn_location_segment_dup)
 DECLARE_SWIG_CONSTRUCTOR(commit_info, svn_commit_info_dup)
 DECLARE_SWIG_CONSTRUCTOR(wc_notify, svn_wc_dup_notify)
+DECLARE_SWIG_CONSTRUCTOR(client_status, svn_client_status_dup)
 
 static PyObject *convert_log_changed_path(void *value, void *ctx,
                                           PyObject *py_pool)
@@ -895,7 +1053,7 @@ PyObject *svn_swig_py_c_strings_to_list(char **strings)
 
     while ((s = *strings++) != NULL)
       {
-        PyObject *ob = PyString_FromString(s);
+        PyObject *ob = PyBytes_FromString(s);
 
         if (ob == NULL)
             goto error;
@@ -938,7 +1096,7 @@ PyObject *svn_swig_py_changed_path_hash_to_dict(apr_hash_t *hash)
             Py_DECREF(dict);
             return NULL;
         }
-      if (PyDict_SetItemString(dict, (char *)key, value) == -1)
+      if (PyDict_SetItem(dict, PyBytes_FromString((char *)key), value) == -1)
         {
           Py_DECREF(value);
           Py_DECREF(dict);
@@ -974,7 +1132,7 @@ PyObject *svn_swig_py_changed_path2_hash_to_dict(apr_hash_t *hash)
             Py_DECREF(dict);
             return NULL;
         }
-      if (PyDict_SetItemString(dict, (char *)key, value) == -1)
+      if (PyDict_SetItem(dict, PyBytes_FromString((char *)key), value) == -1)
         {
           Py_DECREF(value);
           Py_DECREF(dict);
@@ -986,6 +1144,9 @@ PyObject *svn_swig_py_changed_path2_hash_to_dict(apr_hash_t *hash)
   return dict;
 }
 
+#define TYPE_ERROR_DICT_STRING_KEY \
+        "dictionary keys aren't bytes or str objects"
+
 apr_hash_t *svn_swig_py_stringhash_from_dict(PyObject *dict,
                                              apr_pool_t *pool)
 {
@@ -1010,11 +1171,18 @@ apr_hash_t *svn_swig_py_stringhash_from_dict(PyObject *dict,
       PyObject *key = PyList_GetItem(keys, i);
       PyObject *value = PyDict_GetItem(dict, key);
       const char *propname = make_string_from_ob(key, pool);
-      const char *propval = make_string_from_ob(value, pool);
-      if (! (propname && propval))
+      if (!propname)
+        {
+          if (!PyErr_Occurred())
+            {
+              PyErr_SetString(PyExc_TypeError, TYPE_ERROR_DICT_STRING_KEY);
+            }
+          Py_DECREF(keys);
+          return NULL;
+        }
+      const char *propval = make_string_from_ob_maybe_null(value, pool);
+      if (PyErr_Occurred())
         {
-          PyErr_SetString(PyExc_TypeError,
-                          "dictionary keys/values aren't strings");
           Py_DECREF(keys);
           return NULL;
         }
@@ -1047,6 +1215,15 @@ apr_hash_t *svn_swig_py_mergeinfo_from_dict(PyObject *dict,
       PyObject *key = PyList_GetItem(keys, i);
       PyObject *value = PyDict_GetItem(dict, key);
       const char *pathname = make_string_from_ob(key, pool);
+      if (!pathname)
+        {
+          if (!PyErr_Occurred())
+            {
+              PyErr_SetString(PyExc_TypeError, TYPE_ERROR_DICT_STRING_KEY);
+            }
+          Py_DECREF(keys);
+          return NULL;
+        }
       const svn_rangelist_t *ranges = svn_swig_py_seq_to_array(value,
         sizeof(const svn_merge_range_t *),
         svn_swig_py_unwrap_struct_ptr,
@@ -1054,10 +1231,10 @@ apr_hash_t *svn_swig_py_mergeinfo_from_dict(PyObject *dict,
         pool
       );
 
-      if (! (pathname && ranges))
+      if (!ranges)
         {
           PyErr_SetString(PyExc_TypeError,
-                          "dictionary keys aren't strings or values aren't svn_merge_range_t *'s");
+                          "dictionary values aren't svn_merge_range_t *'s");
           Py_DECREF(keys);
           return NULL;
         }
@@ -1092,11 +1269,18 @@ apr_array_header_t *svn_swig_py_proparray_from_dict(PyObject *dict,
       PyObject *value = PyDict_GetItem(dict, key);
       svn_prop_t *prop = apr_palloc(pool, sizeof(*prop));
       prop->name = make_string_from_ob(key, pool);
-      prop->value = make_svn_string_from_ob(value, pool);
-      if (! (prop->name && prop->value))
+      if (! prop->name)
+        {
+          if (!PyErr_Occurred())
+            {
+              PyErr_SetString(PyExc_TypeError, TYPE_ERROR_DICT_STRING_KEY);
+            }
+          Py_DECREF(keys);
+          return NULL;
+        }
+      prop->value = make_svn_string_from_ob_maybe_null(value, pool);
+      if (PyErr_Occurred())
         {
-          PyErr_SetString(PyExc_TypeError,
-                          "dictionary keys/values aren't strings");
           Py_DECREF(keys);
           return NULL;
         }
@@ -1130,11 +1314,18 @@ apr_hash_t *svn_swig_py_prophash_from_dict(PyObject *dict,
       PyObject *key = PyList_GetItem(keys, i);
       PyObject *value = PyDict_GetItem(dict, key);
       const char *propname = make_string_from_ob(key, pool);
-      svn_string_t *propval = make_svn_string_from_ob(value, pool);
-      if (! (propname && propval))
+      if (!propname)
+        {
+          if (!PyErr_Occurred())
+            {
+              PyErr_SetString(PyExc_TypeError, TYPE_ERROR_DICT_STRING_KEY);
+            }
+          Py_DECREF(keys);
+          return NULL;
+        }
+      svn_string_t *propval = make_svn_string_from_ob_maybe_null(value, pool);
+      if (PyErr_Occurred())
         {
-          PyErr_SetString(PyExc_TypeError,
-                          "dictionary keys/values aren't strings");
           Py_DECREF(keys);
           return NULL;
         }
@@ -1172,8 +1363,10 @@ apr_hash_t *svn_swig_py_path_revs_hash_from_dict(PyObject *dict,
 
       if (!(path))
         {
-          PyErr_SetString(PyExc_TypeError,
-                          "dictionary keys aren't strings");
+          if (!PyErr_Occurred())
+            {
+              PyErr_SetString(PyExc_TypeError, TYPE_ERROR_DICT_STRING_KEY);
+            }
           Py_DECREF(keys);
           return NULL;
         }
@@ -1227,8 +1420,10 @@ apr_hash_t *svn_swig_py_struct_ptr_hash_from_dict(PyObject *dict,
 
       if (!c_key)
         {
-          PyErr_SetString(PyExc_TypeError,
-                          "dictionary keys aren't strings");
+          if (!PyErr_Occurred())
+            {
+              PyErr_SetString(PyExc_TypeError, TYPE_ERROR_DICT_STRING_KEY);
+            }
           Py_DECREF(keys);
           return NULL;
         }
@@ -1252,8 +1447,21 @@ svn_swig_py_unwrap_string(PyObject *source,
                           void *baton)
 {
     const char **ptr_dest = destination;
-    *ptr_dest = PyString_AsString(source);
-
+    if (PyBytes_Check(source))
+      {
+        *ptr_dest = PyBytes_AsString(source);
+      }
+    else if (PyUnicode_Check(source))
+      {
+        *ptr_dest = PyStr_AsUTF8(source);
+      }
+    else
+      {
+        PyErr_Format(PyExc_TypeError,
+                        "Expected bytes or str object, %s found",
+                        Py_TYPE(source)->tp_name);
+        *ptr_dest = NULL;
+      }
     if (*ptr_dest != NULL)
         return 0;
     else
@@ -1371,7 +1579,7 @@ PyObject *svn_swig_py_array_to_list(const apr_array_header_t *array)
     for (i = 0; i < array->nelts; ++i)
       {
         PyObject *ob =
-          PyString_FromString(APR_ARRAY_IDX(array, i, const char *));
+          PyBytes_FromString(APR_ARRAY_IDX(array, i, const char *));
         if (ob == NULL)
           goto error;
         PyList_SET_ITEM(list, i, ob);
@@ -1425,7 +1633,7 @@ commit_item_array_to_list(const apr_array_header_t *array)
 }
 
 
- 
+
 /*** Errors ***/
 
 /* Convert a given SubversionException to an svn_error_t. On failure returns
@@ -1446,13 +1654,13 @@ static svn_error_t *exception_to_error(PyObject * exc)
 
     if ((message_ob = PyObject_GetAttrString(exc, "message")) == NULL)
         goto finished;
-    message = PyString_AsString(message_ob);
+    message = PyStr_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);
+        file = PyStr_AsString(file_ob);
     if (PyErr_Occurred()) goto finished;
 
     if ((line_ob = PyObject_GetAttrString(exc, "line")) == NULL)
@@ -1679,7 +1887,8 @@ static svn_error_t *delete_entry(const char *path,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"delete_entry",
-                                    (char *)"slOO&", path, revision, ib->baton,
+                                    (char *)SVN_SWIG_BYTES_FMT "lOO&",
+                                    path, revision, ib->baton,
                                     make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
@@ -1710,7 +1919,12 @@ static svn_error_t *add_directory(const char *path,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"add_directory",
-                                    (char *)"sOslO&", path, ib->baton,
+#if IS_PY3
+                                    (char *)"yOylO&",
+#else
+                                    (char *)"sOslO&",
+#endif
+                                    path, ib->baton,
                                     copyfrom_path, copyfrom_revision,
                                     make_ob_pool, dir_pool)) == NULL)
     {
@@ -1741,8 +1955,8 @@ static svn_error_t *open_directory(const char *path,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"open_directory",
-                                    (char *)"sOlO&", path, ib->baton,
-                                    base_revision,
+                                    (char *)SVN_SWIG_BYTES_FMT "OlO&",
+                                    path, ib->baton, base_revision,
                                     make_ob_pool, dir_pool)) == NULL)
     {
       err = callback_exception_error();
@@ -1771,9 +1985,14 @@ static svn_error_t *change_dir_prop(void *dir_baton,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"change_dir_prop",
-                                    (char *)"Oss#O&", ib->baton, name,
+#if IS_PY3
+                                    (char *)"Oyy#O&",
+#else
+                                    (char *)"Oss#O&",
+#endif
+                                    ib->baton, name,
                                     value ? value->data : NULL,
-                                    value ? value->len : 0,
+                                    (Py_ssize_t) (value ? value->len : 0),
                                     make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
@@ -1810,7 +2029,12 @@ static svn_error_t *add_file(const char *path,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"add_file",
-                                    (char *)"sOslO&", path, ib->baton,
+#if IS_PY3
+                                    (char *)"yOylO&",
+#else
+                                    (char *)"sOslO&",
+#endif
+                                    path, ib->baton,
                                     copyfrom_path, copyfrom_revision,
                                     make_ob_pool, file_pool)) == NULL)
     {
@@ -1842,8 +2066,8 @@ static svn_error_t *open_file(const char *path,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"open_file",
-                                    (char *)"sOlO&", path, ib->baton,
-                                    base_revision,
+                                    (char *)SVN_SWIG_BYTES_FMT "OlO&",
+                                    path, ib->baton, base_revision,
                                     make_ob_pool, file_pool)) == NULL)
     {
       err = callback_exception_error();
@@ -1916,7 +2140,12 @@ static svn_error_t *apply_textdelta(void *file_baton,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"apply_textdelta",
-                                    (char *)"(Os)", ib->baton,
+#if IS_PY3
+                                    (char *)"(Oy)",
+#else
+                                    (char *)"(Os)",
+#endif
+                                    ib->baton,
                                     base_checksum)) == NULL)
     {
       err = callback_exception_error();
@@ -1961,9 +2190,14 @@ static svn_error_t *change_file_prop(void *file_baton,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"change_file_prop",
-                                    (char *)"Oss#O&", ib->baton, name,
+#if IS_PY3
+                                    (char *)"Oyy#O&",
+#else
+                                    (char *)"Oss#O&",
+#endif
+                                    ib->baton, name,
                                     value ? value->data : NULL,
-                                    value ? value->len : 0,
+                                    (Py_ssize_t) (value ? value->len : 0),
                                     make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
@@ -1991,7 +2225,12 @@ static svn_error_t *close_file(void *file_baton,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"close_file",
-                                    (char *)"(Os)", ib->baton,
+#if IS_PY3
+                                    (char *)"(Oy)",
+#else
+                                    (char *)"(Os)",
+#endif
+                                    ib->baton,
                                     text_checksum)) == NULL)
     {
       err = callback_exception_error();
@@ -2099,7 +2338,7 @@ static svn_error_t *parse_fn3_uuid_record(const char *uuid,
 
   /* ### python doesn't have 'const' on the method name and format */
   if ((result = PyObject_CallMethod(ib->editor, (char *)"uuid_record",
-                                    (char *)"sO&", uuid,
+                                    (char *)SVN_SWIG_BYTES_FMT "O&", uuid,
                                     make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
@@ -2188,9 +2427,15 @@ static svn_error_t *parse_fn3_set_revision_property(void *revision_baton,
 
   /* ### 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,
+#if IS_PY3
+                                    (char *)"Oyy#",
+#else
+                                    (char *)"Oss#",
+#endif
+                                    ib->baton, name,
                                     value ? value->data : NULL,
-                                    value ? value->len : 0)) == NULL)
+                                    (Py_ssize_t) (value ? value->len : 0)))
+      == NULL)
     {
       err = callback_exception_error();
       goto finished;
@@ -2218,9 +2463,15 @@ static svn_error_t *parse_fn3_set_node_property(void *node_baton,
 
   /* ### 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,
+#if IS_PY3
+                                    (char *)"Oyy#",
+#else
+                                    (char *)"Oss#",
+#endif
+                                    ib->baton, name,
                                     value ? value->data : NULL,
-                                    value ? value->len : 0)) == NULL)
+                                    (Py_ssize_t) (value ? value->len : 0)))
+      == NULL)
     {
       err = callback_exception_error();
       goto finished;
@@ -2247,7 +2498,8 @@ static svn_error_t *parse_fn3_delete_node_property(void *node_baton,
 
   /* ### 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)
+                                    (char *)"O" SVN_SWIG_BYTES_FMT,
+                                    ib->baton, name)) == NULL)
     {
       err = callback_exception_error();
       goto finished;
@@ -2435,14 +2687,23 @@ apr_file_t *svn_swig_py_make_file(PyObject *py_file,
 {
   apr_file_t *apr_file = NULL;
   apr_status_t apr_err;
+  const char* fname = NULL;
 
   if (py_file == NULL || py_file == Py_None)
     return NULL;
 
-  if (PyString_Check(py_file))
+  /* check if input is a path  */
+  if (PyBytes_Check(py_file))
+    {
+      fname = PyBytes_AsString(py_file);
+    }
+  else if (PyUnicode_Check(py_file))
+    {
+      fname = PyStr_AsUTF8(py_file);
+    }
+  if (fname)
     {
       /* input is a path -- just open an apr_file_t */
-      char* fname = PyString_AS_STRING(py_file);
       apr_err = apr_file_open(&apr_file, fname,
                               APR_CREATE | APR_READ | APR_WRITE,
                               APR_OS_DEFAULT, pool);
@@ -2455,25 +2716,26 @@ apr_file_t *svn_swig_py_make_file(PyObject *py_file,
           return NULL;
         }
     }
-  else if (PyFile_Check(py_file))
+  else
     {
-      FILE *file;
-      apr_os_file_t osfile;
+      FILE *file = svn_swig_py_as_file(py_file);
 
       /* input is a file object -- convert to apr_file_t */
-      file = PyFile_AsFile(py_file);
+      if (file != NULL)
+        {
 #ifdef WIN32
-      osfile = (apr_os_file_t)_get_osfhandle(_fileno(file));
+          apr_os_file_t osfile = (apr_os_file_t)_get_osfhandle(_fileno(file));
 #else
-      osfile = (apr_os_file_t)fileno(file);
+          apr_os_file_t osfile = (apr_os_file_t)fileno(file);
 #endif
-      apr_err = apr_os_file_put(&apr_file, &osfile, O_CREAT | O_WRONLY, pool);
-      if (apr_err)
-        {
-          char buf[256];
-          apr_strerror(apr_err, buf, sizeof(buf));
-          PyErr_Format(PyExc_IOError, "apr_os_file_put failed: %s", buf);
-          return NULL;
+          apr_err = apr_os_file_put(&apr_file, &osfile, O_CREAT | O_WRONLY, pool);
+          if (apr_err)
+            {
+              char buf[256];
+              apr_strerror(apr_err, buf, sizeof(buf));
+              PyErr_Format(PyExc_IOError, "apr_os_file_put failed: %s", buf);
+              return NULL;
+            }
         }
     }
   return apr_file;
@@ -2485,7 +2747,6 @@ read_handler_pyio(void *baton, char *buffer, apr_size_t *len)
 {
   PyObject *result;
   PyObject *py_io = baton;
-  apr_size_t bytes;
   svn_error_t *err = SVN_NO_ERROR;
 
   if (py_io == Py_None)
@@ -2502,10 +2763,17 @@ read_handler_pyio(void *baton, char *buffer, apr_size_t *len)
     {
       err = callback_exception_error();
     }
-  else if (PyString_Check(result))
+  else if (PyBytes_Check(result))
     {
-      bytes = PyString_GET_SIZE(result);
-      if (bytes > *len)
+      Py_ssize_t bytes;
+      char *result_str;
+
+      if (   -1 == PyBytes_AsStringAndSize(result, &result_str, &bytes)
+          || result_str == NULL)
+        {
+          err = callback_exception_error();
+        }
+      else if (bytes > *len)
         {
           err = callback_bad_return_error("Too many bytes");
         }
@@ -2513,12 +2781,12 @@ read_handler_pyio(void *baton, char *buffer, apr_size_t *len)
         {
           /* Writeback, in case this was a short read, indicating EOF */
           *len = bytes;
-          memcpy(buffer, PyString_AS_STRING(result), *len);
+          memcpy(buffer, result_str, *len);
         }
     }
   else
     {
-      err = callback_bad_return_error("Not a string");
+      err = callback_bad_return_error("Not a bytes object");
     }
   Py_XDECREF(result);
   svn_swig_py_release_py_lock();
@@ -2537,7 +2805,8 @@ write_handler_pyio(void *baton, const char *data, apr_size_t *len)
     {
       svn_swig_py_acquire_py_lock();
       if ((result = PyObject_CallMethod(py_io, (char *)"write",
-                                        (char *)"s#", data, *len)) == NULL)
+                                       (char *) SVN_SWIG_BYTES_FMT "#",
+                                       data, (Py_ssize_t) *len)) == NULL)
         {
           err = callback_exception_error();
         }
@@ -2644,13 +2913,24 @@ void svn_swig_py_notify_func(void *baton,
   PyObject *function = baton;
   PyObject *result;
   svn_error_t *err = SVN_NO_ERROR;
+  PyObject *exc, *exc_type, *exc_traceback;
 
   if (function == NULL || function == Py_None)
     return;
 
   svn_swig_py_acquire_py_lock();
+
+  /* As caller can't understand Python context and we can't notify if
+     Python call back function raise exception to caller, we must catch it
+     if it is occurred, and restore error indicator */
+  PyErr_Fetch(&exc_type, &exc, &exc_traceback);
+
   if ((result = PyObject_CallFunction(function,
+#if IS_PY3
+                                      (char *)"(yiiyiii)",
+#else
                                       (char *)"(siisiii)",
+#endif
                                       path, action, kind,
                                       mime_type,
                                       content_state, prop_state,
@@ -2669,6 +2949,9 @@ void svn_swig_py_notify_func(void *baton,
   /* Our error has no place to go. :-( */
   svn_error_clear(err);
 
+  /* Also, restore error indicator */
+  PyErr_Restore(exc_type, exc, exc_traceback);
+
   svn_swig_py_release_py_lock();
 }
 
@@ -2680,12 +2963,18 @@ void svn_swig_py_notify_func2(void *baton,
   PyObject *function = baton;
   PyObject *result;
   svn_error_t *err = SVN_NO_ERROR;
+  PyObject *exc, *exc_type, *exc_traceback;
 
   if (function == NULL || function == Py_None)
     return;
 
   svn_swig_py_acquire_py_lock();
 
+  /* As caller can't understand Python context and we can't notify if
+     Python call back function raise exception to caller, we must catch it
+     if it is occurred, and restore error indicator */
+  PyErr_Fetch(&exc_type, &exc, &exc_traceback);
+
   if ((result = PyObject_CallFunction(function,
                                       (char *)"(O&O&)",
                                       make_ob_wc_notify, notify,
@@ -2704,6 +2993,9 @@ void svn_swig_py_notify_func2(void *baton,
   /* Our error has no place to go. :-( */
   svn_error_clear(err);
 
+  /* Also, restore error indicator */
+  PyErr_Restore(exc_type, exc, exc_traceback);
+
   svn_swig_py_release_py_lock();
 }
 
@@ -2714,12 +3006,20 @@ void svn_swig_py_status_func(void *baton,
   PyObject *function = baton;
   PyObject *result;
   svn_error_t *err = SVN_NO_ERROR;
+  PyObject *exc, *exc_type, *exc_traceback;
 
   if (function == NULL || function == Py_None)
     return;
 
   svn_swig_py_acquire_py_lock();
-  if ((result = PyObject_CallFunction(function, (char *)"sO&", path,
+
+  /* As caller can't understand Python context and we can't notify if
+     Python call back function raise exception to caller, we must catch it
+     if it is occurred, and restore error indicator */
+  PyErr_Fetch(&exc_type, &exc, &exc_traceback);
+
+  if ((result = PyObject_CallFunction(function,
+                                      (char *)SVN_SWIG_BYTES_FMT "O&", path,
                                       make_ob_wc_status, status)) == NULL)
     {
       err = callback_exception_error();
@@ -2735,9 +3035,66 @@ void svn_swig_py_status_func(void *baton,
   /* Our error has no place to go. :-( */
   svn_error_clear(err);
 
+  /* Also, restore error indicator */
+  PyErr_Restore(exc_type, exc, exc_traceback);
+
   svn_swig_py_release_py_lock();
 }
 
+svn_error_t *svn_swig_py_client_status_func(void *baton,
+                                            const char *path,
+                                            const svn_client_status_t *status,
+                                            apr_pool_t *scratch_pool)
+{
+  PyObject *function = baton;
+  PyObject *result;
+  svn_error_t *err = SVN_NO_ERROR;
+  PyObject *exc, *exc_type, *exc_traceback;
+
+  if (function == NULL || function == Py_None)
+    return err;
+
+  svn_swig_py_acquire_py_lock();
+
+  if (status == NULL)
+    {
+      result = PyObject_CallFunction(function,
+#if IS_PY3
+                                     (char *)"yOO&",
+#else
+                                     (char *)"sOO&",
+#endif
+                                     path, Py_None,
+                                     make_ob_pool, scratch_pool);
+    }
+  else
+    {
+      result = PyObject_CallFunction(function,
+#if IS_PY3
+                                     (char *)"yO&O&",
+#else
+                                     (char *)"sO&O&",
+#endif
+                                     path,
+                                     make_ob_client_status, status,
+                                     make_ob_pool, scratch_pool);
+    }
+  if (result == NULL)
+    {
+      err = callback_exception_error();
+    }
+  else
+    {
+      /* The callback shouldn't be returning anything. */
+      if (result != Py_None)
+        err = callback_bad_return_error("Not None");
+      Py_DECREF(result);
+    }
+
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
 
 svn_error_t *svn_swig_py_delta_path_driver_cb_func(void **dir_baton,
                                                    void *parent_baton,
@@ -2758,7 +3115,12 @@ svn_error_t *svn_swig_py_delta_path_driver_cb_func(void **dir_baton,
                                                  "void *",
                                                  NULL);
 
-  result = PyObject_CallFunction(function, (char *)"OsO&",
+  result = PyObject_CallFunction(function,
+#if IS_PY3
+                                 (char *)"OyO&",
+#else
+                                 (char *)"OsO&",
+#endif
                                  py_parent_baton,
                                  path, make_ob_pool, pool);
 
@@ -2793,12 +3155,20 @@ void svn_swig_py_status_func2(void *baton,
   PyObject *function = baton;
   PyObject *result;
   svn_error_t *err = SVN_NO_ERROR;
+  PyObject *exc, *exc_type, *exc_traceback;
 
   if (function == NULL || function == Py_None)
     return;
 
   svn_swig_py_acquire_py_lock();
-  if ((result = PyObject_CallFunction(function, (char *)"sO&", path,
+
+  /* As caller can't understand Python context and we can't notify if
+     Python call back function raise exception to caller, we must catch it
+     if it is occurred, and restore error indicator */
+  PyErr_Fetch(&exc_type, &exc, &exc_traceback);
+
+  if ((result = PyObject_CallFunction(function,
+                                      (char *)SVN_SWIG_BYTES_FMT "O&", path,
                                       make_ob_wc_status, status)) == NULL)
     {
       err = callback_exception_error();
@@ -2812,8 +3182,10 @@ void svn_swig_py_status_func2(void *baton,
     }
 
   /* Our error has no place to go. :-( */
-  if (err)
-    svn_error_clear(err);
+  svn_error_clear(err);
+
+  /* Also, restore error indicator */
+  PyErr_Restore(exc_type, exc, exc_traceback);
 
   svn_swig_py_release_py_lock();
 }
@@ -2902,7 +3274,7 @@ svn_error_t *svn_swig_py_fs_lock_callback(
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(py_callback,
-                                      (char *)"sO&O&O&",
+                                      (char *)SVN_SWIG_BYTES_FMT "O&O&O&",
                                       path,
                                       make_ob_lock, lock,
                                       make_ob_error, fs_err,
@@ -2968,23 +3340,34 @@ svn_error_t *svn_swig_py_get_commit_log_func(const char **log_msg,
 
   if (result == Py_None)
     {
-      Py_DECREF(result);
       *log_msg = NULL;
       err = SVN_NO_ERROR;
     }
-  else if (PyString_Check(result))
+  else if (PyBytes_Check(result))
     {
-      *log_msg = apr_pstrdup(pool, PyString_AS_STRING(result));
-      Py_DECREF(result);
+      *log_msg = apr_pstrdup(pool, PyBytes_AsString(result));
       err = SVN_NO_ERROR;
     }
+  else if (PyUnicode_Check(result))
+    {
+      /* PyStr_AsUTF8() may cause UnicodeEncodeError,
+         but apr_pstrdup() allows NULL for s */
+      if ((*log_msg = apr_pstrdup(pool, PyStr_AsUTF8(result))) == NULL)
+        {
+          err = callback_exception_error();
+        }
+      else
+        {
+          err = SVN_NO_ERROR;
+        }
+    }
   else
     {
-      Py_DECREF(result);
-      err = callback_bad_return_error("Not a string");
+      err = callback_bad_return_error("Not a bytes or str object");
     }
+  Py_DECREF(result);
 
- finished:
+finished:
   svn_swig_py_release_py_lock();
   return err;
 }
@@ -3023,7 +3406,11 @@ svn_error_t *svn_swig_py_repos_authz_func(svn_boolean_t *allowed,
     }
 
   if ((result = PyObject_CallFunction(function,
+#if IS_PY3
+                                      (char *)"OyO",
+#else
                                       (char *)"OsO",
+#endif
                                       py_root, path, py_pool)) == NULL)
     {
       err = callback_exception_error();
@@ -3060,7 +3447,7 @@ svn_error_t *svn_swig_py_repos_history_func(void *baton,
 
   svn_swig_py_acquire_py_lock();
   if ((result = PyObject_CallFunction(function,
-                                      (char *)"slO&",
+                                      (char *)SVN_SWIG_BYTES_FMT "lO&",
                                       path, revision,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -3187,7 +3574,7 @@ svn_error_t *svn_swig_py_proplist_receiver2(void *baton,
     }
 
   result = PyObject_CallFunction(receiver,
-                                 (char *)"sOOO",
+                                 (char *)SVN_SWIG_BYTES_FMT "OOO",
                                  path, py_props, py_iprops, py_pool);
   if (result == NULL)
     {
@@ -3247,7 +3634,11 @@ svn_error_t *svn_swig_py_log_receiver(void *baton,
     }
 
   if ((result = PyObject_CallFunction(receiver,
+#if IS_PY3
+                                      (char *)"OlyyyO",
+#else
                                       (char *)"OlsssO",
+#endif
                                       chpaths, rev, author, date, msg,
                                       py_pool)) == NULL)
     {
@@ -3325,7 +3716,7 @@ svn_error_t *svn_swig_py_info_receiver_func(void *baton,
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(receiver,
-                                      (char *)"sO&O&",
+                                      (char *)SVN_SWIG_BYTES_FMT "O&O&",
                                       path, make_ob_info, info,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -3394,7 +3785,12 @@ svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton,
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(receiver,
-                                      (char *)"LlsssO&",
+                                      (char *)
+#if IS_PY3
+                                      "LlyyyO&",
+#else
+                                      "LlsssO&",
+#endif
                                       (PY_LONG_LONG)line_no, revision, author,
                                       date, line, make_ob_pool, pool)) == NULL)
     {
@@ -3426,7 +3822,11 @@ svn_error_t *svn_swig_py_changelist_receiver_func(void *baton,
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(receiver,
+#if IS_PY3
+                                      (char *)"yyO&",
+#else
                                       (char *)"ssO&",
+#endif
                                       path, changelist,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -3461,7 +3861,7 @@ svn_swig_py_auth_gnome_keyring_unlock_prompt_func(char **keyring_passwd,
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(function,
-                                      (char *)"sO&",
+                                      (char *)SVN_SWIG_BYTES_FMT "O&",
                                       keyring_name,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -3469,7 +3869,11 @@ svn_swig_py_auth_gnome_keyring_unlock_prompt_func(char **keyring_passwd,
     }
   else
     {
-      *keyring_passwd = make_string_from_ob(result, pool);
+      *keyring_passwd = make_string_from_ob_maybe_null(result, pool);
+      if (PyErr_Occurred())
+        {
+          err = callback_exception_error();
+        }
       Py_DECREF(result);
     }
 
@@ -3497,7 +3901,11 @@ svn_swig_py_auth_simple_prompt_func(svn_auth_cred_simple_t **cred,
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(function,
+#if IS_PY3
+                                      (char *)"yylO&",
+#else
                                       (char *)"sslO&",
+#endif
                                       realm, username, may_save,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -3548,7 +3956,7 @@ svn_swig_py_auth_username_prompt_func(svn_auth_cred_username_t **cred,
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(function,
-                                      (char *)"slO&",
+                                      (char *)SVN_SWIG_BYTES_FMT "lO&",
                                       realm, may_save,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -3600,7 +4008,8 @@ svn_swig_py_auth_ssl_server_trust_prompt_func(
 
   svn_swig_py_acquire_py_lock();
 
-  if ((result = PyObject_CallFunction(function, (char *)"slO&lO&",
+  if ((result = PyObject_CallFunction(function,
+                  (char *)SVN_SWIG_BYTES_FMT "lO&lO&",
                   realm, failures, make_ob_auth_ssl_server_cert_info,
                   cert_info, may_save, make_ob_pool, pool)) == NULL)
     {
@@ -3651,7 +4060,7 @@ svn_swig_py_auth_ssl_client_cert_prompt_func(
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(function,
-                                      (char *)"slO&",
+                                      (char *)SVN_SWIG_BYTES_FMT "lO&",
                                       realm, may_save,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -3702,7 +4111,7 @@ svn_swig_py_auth_ssl_client_cert_pw_prompt_func(
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(function,
-                                      (char *)"slO&",
+                                      (char *)SVN_SWIG_BYTES_FMT "lO&",
                                       realm, may_save,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -3769,7 +4178,12 @@ svn_swig_py_config_auth_walk_func(svn_boolean_t *delete_cred,
       goto finished;
     }
 
-  if ((result = PyObject_CallFunction(function, (char *)"ssOO",
+  if ((result = PyObject_CallFunction(function,
+#if IS_PY3
+                                      (char *)"yyOO",
+#else
+                                      (char *)"ssOO",
+#endif
                                       cred_kind, realmstring,
                                       py_hash, py_scratch_pool)) == NULL)
     {
@@ -3868,16 +4282,21 @@ ra_callbacks_get_wc_prop(void *baton,
     }
 
   if ((result = PyObject_CallFunction(py_callback,
-                                      (char *)"ssO&", path, name,
+#if IS_PY3
+                                      (char *)"yyO&",
+#else
+                                      (char *)"ssO&",
+#endif
+                                      path, name,
                                       make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
     }
   else if (result != Py_None)
     {
-      char *buf;
       Py_ssize_t len;
-      if (PyString_AsStringAndSize(result, &buf, &len) == -1)
+      char *buf;
+      if (PyBytes_AsStringAndSize(result, &buf, &len) == -1)
         {
           err = callback_exception_error();
         }
@@ -3920,14 +4339,19 @@ ra_callbacks_push_or_set_wc_prop(const char *callback,
       goto finished;
     }
 
-  if ((py_value = PyString_FromStringAndSize(value->data, value->len)) == NULL)
+  if ((py_value = PyBytes_FromStringAndSize(value->data, value->len)) == NULL)
     {
       err = callback_exception_error();
       goto finished;
     }
 
   if ((result = PyObject_CallFunction(py_callback,
-                                      (char *)"ssOO&", path, name, py_value,
+#if IS_PY3
+                                      (char *)"yyOO&",
+#else
+                                      (char *)"ssOO&",
+#endif
+                                      path, name, py_value,
                                       make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
@@ -3990,7 +4414,12 @@ ra_callbacks_invalidate_wc_props(void *baton,
     }
 
   if ((result = PyObject_CallFunction(py_callback,
-                                      (char *)"ssO&", path, name,
+#if IS_PY3
+                                      (char *)"yyO&",
+#else
+                                      (char *)"ssO&",
+#endif
+                                      path, name,
                                       make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
@@ -4012,11 +4441,17 @@ ra_callbacks_progress_func(apr_off_t progress,
 {
   PyObject *callbacks = (PyObject *)baton;
   PyObject *py_callback, *py_progress, *py_total, *result;
+  PyObject *exc, *exc_type, *exc_traceback;
 
   py_progress = py_total = NULL;
 
   svn_swig_py_acquire_py_lock();
 
+  /* As caller can't understand Python context and we can't notify if
+     Python call back function raise exception to caller, we must catch it
+     if it is occurred, and restore error indicator */
+  PyErr_Fetch(&exc_type, &exc, &exc_traceback);
+
   py_callback = PyObject_GetAttrString(callbacks,
                                        (char *)"progress_func");
   if (py_callback == NULL)
@@ -4056,6 +4491,9 @@ ra_callbacks_progress_func(apr_off_t progress,
 
   Py_XDECREF(result);
 finished:
+  /* Restore error indicator */
+  PyErr_Restore(exc_type, exc, exc_traceback);
+
   Py_XDECREF(py_callback);
   Py_XDECREF(py_progress);
   Py_XDECREF(py_total);
@@ -4119,7 +4557,7 @@ ra_callbacks_get_client_string(void *baton,
     }
   else if (result != Py_None)
     {
-      if ((*name = PyString_AsString(result)) == NULL)
+      if ((*name = PyBytes_AsString(result)) == NULL)
         {
           err = callback_exception_error();
         }
@@ -4222,7 +4660,11 @@ svn_error_t *svn_swig_py_commit_callback(svn_revnum_t new_revision,
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(receiver,
+#if IS_PY3
+                                      (char *)"lyy",
+#else
                                       (char *)"lss",
+#endif
                                       new_revision, date, author)) == NULL)
     {
       err = callback_exception_error();
@@ -4274,7 +4716,7 @@ svn_error_t *svn_swig_py_ra_file_rev_handler_func(
     }
 
   if ((result = PyObject_CallFunction(handler,
-                                      (char *)"slOOO&",
+                                      (char *)SVN_SWIG_BYTES_FMT "lOOO&",
                                       path, rev, py_rev_props, py_prop_diffs,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -4320,7 +4762,7 @@ svn_error_t *svn_swig_py_ra_lock_callback(
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(py_callback,
-                                     (char *)"sbO&O&O&",
+                                     (char *)SVN_SWIG_BYTES_FMT "bO&O&O&",
                                      path, do_lock,
                                      make_ob_lock, lock,
                                      make_ob_error, ra_err,
@@ -4357,7 +4799,11 @@ static svn_error_t *reporter_set_path(void *report_baton,
 
   if ((result = PyObject_CallMethod(py_reporter,
                                     (char *)"set_path",
+#if IS_PY3
+                                    (char *)"ylbyO&",
+#else
                                     (char *)"slbsO&",
+#endif
                                     path, revision,
                                     start_empty, lock_token,
                                     make_ob_pool, pool)) == NULL)
@@ -4390,7 +4836,7 @@ static svn_error_t *reporter_delete_path(void *report_baton,
 
   if ((result = PyObject_CallMethod(py_reporter,
                                     (char *)"delete_path",
-                                    (char *)"sO&",
+                                    (char *)SVN_SWIG_BYTES_FMT "O&",
                                     path,
                                     make_ob_pool, pool)) == NULL)
     {
@@ -4426,7 +4872,11 @@ static svn_error_t *reporter_link_path(void *report_baton,
 
   if ((result = PyObject_CallMethod(py_reporter,
                                     (char *)"link_path",
+#if IS_PY3
+                                    (char *)"yylbsO&",
+#else
                                     (char *)"sslbsO&",
+#endif
                                     path, url, revision,
                                     start_empty, lock_token,
                                     make_ob_pool, pool)) == NULL)
@@ -4557,7 +5007,11 @@ wc_diff_callbacks2_file_changed_or_added(const char *callback,
     }
 
   result = PyObject_CallFunction(py_callback,
+#if IS_PY3
+                                 (char *)"O&yyyllyyO&O&",
+#else
                                  (char *)"O&sssllssO&O&",
+#endif
                                  make_ob_wc_adm_access, adm_access,
                                  path,
                                  tmpfile1, tmpfile2,
@@ -4680,7 +5134,11 @@ wc_diff_callbacks2_file_deleted(svn_wc_adm_access_t *adm_access,
     }
 
   result = PyObject_CallFunction(py_callback,
+#if IS_PY3
+                                 (char *)"O&yyyyyO&",
+#else
                                  (char *)"O&sssssO&",
+#endif
                                  make_ob_wc_adm_access, adm_access,
                                  path,
                                  tmpfile1, tmpfile2,
@@ -4734,7 +5192,11 @@ wc_diff_callbacks2_dir_added(svn_wc_adm_access_t *adm_access,
     }
 
   result = PyObject_CallFunction(py_callback,
+#if IS_PY3
+                                 (char *)"O&yl",
+#else
                                  (char *)"O&sl",
+#endif
                                  make_ob_wc_adm_access, adm_access,
                                  path, rev);
   if (result == NULL)
@@ -4784,7 +5246,7 @@ wc_diff_callbacks2_dir_deleted(svn_wc_adm_access_t *adm_access,
     }
 
   result = PyObject_CallFunction(py_callback,
-                                 (char *)"O&s",
+                                 (char *)"O&" SVN_SWIG_BYTES_FMT,
                                  make_ob_wc_adm_access, adm_access, path);
   if (result == NULL)
     {
@@ -4836,7 +5298,11 @@ wc_diff_callbacks2_dir_props_changed(svn_wc_adm_access_t *adm_access,
     }
 
   result = PyObject_CallFunction(py_callback,
+#if IS_PY3
+                                 (char *)"O&yO&O&",
+#else
                                  (char *)"O&sO&O&",
+#endif
                                  make_ob_wc_adm_access, adm_access,
                                  path,
                                  svn_swig_py_proparray_to_dict, propchanges,
@@ -4888,11 +5354,21 @@ svn_swig_py_config_enumerator2(const char *name,
   PyObject *result;
   svn_error_t *err = SVN_NO_ERROR;
   svn_boolean_t c_result;
+  PyObject *exc, *exc_type, *exc_traceback;
 
   svn_swig_py_acquire_py_lock();
 
+  /* As caller can't understand Python context and we can't notify if
+     Python call back function raise exception to caller, we must catch it
+     if it is occurred, and restore error indicator */
+  PyErr_Fetch(&exc_type, &exc, &exc_traceback);
+
   if ((result = PyObject_CallFunction(function,
+#if IS_PY3
+                                      (char *)"yyO&",
+#else
                                       (char *)"ssO&",
+#endif
                                       name,
                                       value,
                                       make_ob_pool, pool)) == NULL)
@@ -4908,7 +5384,7 @@ svn_swig_py_config_enumerator2(const char *name,
   /* Any Python exception we might have pending must be cleared,
      because the SWIG wrapper will not check for it, and return a value with
      the exception still set. */
-  PyErr_Clear();
+  PyErr_Restore(exc_type, exc, exc_traceback);
 
   if (err)
     {
@@ -4936,11 +5412,17 @@ svn_swig_py_config_section_enumerator2(const char *name,
   PyObject *result;
   svn_error_t *err = SVN_NO_ERROR;
   svn_boolean_t c_result;
+  PyObject *exc, *exc_type, *exc_traceback;
 
   svn_swig_py_acquire_py_lock();
 
+  /* As caller can't understand Python context and we can't notify if
+     Python call back function raise exception to caller, we must catch it
+     if it is occurred, and restore error indicator */
+  PyErr_Fetch(&exc_type, &exc, &exc_traceback);
+
   if ((result = PyObject_CallFunction(function,
-                                      (char *)"sO&",
+                                      (char *)SVN_SWIG_BYTES_FMT "O&",
                                       name,
                                       make_ob_pool, pool)) == NULL)
     {
@@ -4955,7 +5437,8 @@ svn_swig_py_config_section_enumerator2(const char *name,
   /* Any Python exception we might have pending must be cleared,
      because the SWIG wrapper will not check for it, and return a value with
      the exception still set. */
-  PyErr_Clear();
+  PyErr_Restore(exc_type, exc, exc_traceback);
+
 
   if (err)
     {
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 512da28..7650cec 100644
--- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
@@ -50,6 +50,12 @@ extern "C" {
 apr_status_t svn_swig_py_initialize(void);
 
 
+/* Returns the provided python object as a FILE *object.
+ * Return the underlying FILE or NULL if the object is not a File instance.
+ */
+FILE *svn_swig_py_as_file(PyObject *pyfile);
+
+
 
 /* Functions to manage python's global interpreter lock */
 void svn_swig_py_release_py_lock(void);
@@ -101,6 +107,17 @@ void svn_swig_py_svn_exception(svn_error_t *err);
 
 
 
+/* Function to get char * representation of bytes/str object. This is
+   the replacement of typemap(in, parse="s") and typemap(in, parse="z")
+   to accept both of bytes object and str object, and it assumes to be
+   used from those typemaps only.
+   Note: type of return value should be char const *, however, as SWIG
+   produces variables for C function without 'const' modifier, to avoid
+   ton of cast in SWIG produced C code we drop it from return value
+   types as well  */
+char *svn_swig_py_string_to_cstring(PyObject *input, int maybe_null,
+                                    const char * funcsym, const char * argsym);
+
 /* helper function to convert an apr_hash_t* (char* -> svnstring_t*) to
    a Python dict */
 PyObject *svn_swig_py_prophash_to_dict(apr_hash_t *hash);
@@ -226,7 +243,10 @@ svn_swig_py_seq_to_array(PyObject *seq,
                          apr_pool_t *pool);
 
 /* An svn_swig_py_object_unwrap_t that extracts a char pointer from a Python
-   string. */
+   string.
+
+   Note the lifetime of the returned string is tied to the provided Python
+   object. */
 int
 svn_swig_py_unwrap_string(PyObject *source,
                           void *destination,
@@ -293,6 +313,13 @@ void svn_swig_py_status_func(void *baton,
                              const char *path,
                              svn_wc_status_t *status);
 
+/* a client status function that executes a Python function that is passed in
+   via the baton argument */
+svn_error_t *svn_swig_py_client_status_func(void *baton,
+                                            const char *path,
+                                            const svn_client_status_t *status,
+                                            apr_pool_t *scratch_pool);
+
 /* a svn_delta_path_driver callback that executes a Python function
   that is passed in via the baton argument */
 svn_error_t *svn_swig_py_delta_path_driver_cb_func(void **dir_baton,
diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h
new file mode 100644
index 0000000..8ad182a
--- /dev/null
+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py3c.h
@@ -0,0 +1,49 @@
+/*
+ * swigutil_py3c.c: utility header for the SWIG Python binding interface with
+ * the py3c library
+ *
+ * ====================================================================
+ *    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_PY3C_H
+#define SVN_SWIG_SWIGUTIL_PY3C_H
+
+/* This file needs to be included after any swig includes, as it undefines
+ * certain conflicting items, where the py3c variants are preferred over those
+ * defined within SWIG.
+ */
+
+#include <Python.h>
+
+#if PY_VERSION_HEX >= 0x03000000
+/* SWIG and py3c both define a few Python 3compat defines, so undef here to give
+   preference to the py3c versions. */
+#undef PyLong_FromSize_t
+#undef PyLong_AsLong
+#undef PyInt_FromLong
+#undef PyInt_AsLong
+#undef PyInt_Check
+#undef PyInt_FromSize_t
+
+#endif
+
+#include <py3c.h>
+
+#endif
diff --git a/subversion/bindings/swig/python/ra.py b/subversion/bindings/swig/python/ra.py
index 065aac5..89da30a 100644
--- a/subversion/bindings/swig/python/ra.py
+++ b/subversion/bindings/swig/python/ra.py
@@ -39,6 +39,11 @@ else:
 del _swig_python_version_info
 
 try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
@@ -54,7 +59,7 @@ def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
     if method:
         return method(self, value)
     if (not static):
-        self.__dict__[name] = value
+        object.__setattr__(self, name, value)
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
 
@@ -80,14 +85,26 @@ def _swig_repr(self):
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self, name, value):
+        if (name == "thisown"):
+            return self.this.own(value)
+        if hasattr(self, name) or (name == "this"):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
+
 def _copy_metadata_deep(value, old_value):
   """Copy all attributes of old_value into value, recursively traversing
   lists and dicts if needed."""
   if value is None or old_value is None or value is old_value: return
 
   if isinstance(value, dict):
-    for k, v in value.iteritems():
-      _copy_metadata_deep(v, old_value[k])
+    for k in value:
+      _copy_metadata_deep(value[k], old_value[k])
   elif isinstance(value, list):
     for v, old_v in zip(value, old_value):
       _copy_metadata_deep(v, old_v)
@@ -100,39 +117,51 @@ def _copy_metadata_deep(value, old_value):
 def _assert_valid_deep(value):
   """Assert value's validity, recursively traversing lists and dicts."""
   if isinstance(value, dict):
-    for v in value.itervalues():
-      _assert_valid_deep(v)
+    for k in value:
+      _assert_valid_deep(value[k])
   elif isinstance(value, list):
     for v in value:
       _assert_valid_deep(v)
-  else:
-    if hasattr(value, "assert_valid"):
-      value.assert_valid()
+# Ensure that the passed in value isn't a type, which could have an
+# assert_valid attribute, but it can not be called without an instance.
+  elif type(value) != type:
+    try:
+      fn = value.assert_valid
+    except AttributeError:
+      pass
+    else:
+      fn()
+
+
+
+  # SWIG classes generated with -modern do not define this variable
+try:
+  _newclass
+except NameError:
+  _newclass = 1
+else:
+  raise RuntimeError("Require -modern option, but _newclass is defined")
+
+_get_instance_attr = object.__getattribute__
+_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 
 import libsvn.core
 import libsvn.delta
 
-def svn_ra_version():
+def svn_ra_version() -> "svn_version_t const *":
     """svn_ra_version() -> svn_version_t const *"""
     return _ra.svn_ra_version()
-class svn_ra_reporter3_t:
+class svn_ra_reporter3_t(object):
     """Proxy of C svn_ra_reporter3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_reporter3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_reporter3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["set_path"] = _ra.svn_ra_reporter3_t_set_path_set
-    __swig_getmethods__["set_path"] = _ra.svn_ra_reporter3_t_set_path_get
-    __swig_setmethods__["delete_path"] = _ra.svn_ra_reporter3_t_delete_path_set
-    __swig_getmethods__["delete_path"] = _ra.svn_ra_reporter3_t_delete_path_get
-    __swig_setmethods__["link_path"] = _ra.svn_ra_reporter3_t_link_path_set
-    __swig_getmethods__["link_path"] = _ra.svn_ra_reporter3_t_link_path_get
-    __swig_setmethods__["finish_report"] = _ra.svn_ra_reporter3_t_finish_report_set
-    __swig_getmethods__["finish_report"] = _ra.svn_ra_reporter3_t_finish_report_get
-    __swig_setmethods__["abort_report"] = _ra.svn_ra_reporter3_t_abort_report_set
-    __swig_getmethods__["abort_report"] = _ra.svn_ra_reporter3_t_abort_report_get
+    set_path = _swig_property(_ra.svn_ra_reporter3_t_set_path_get, _ra.svn_ra_reporter3_t_set_path_set)
+    delete_path = _swig_property(_ra.svn_ra_reporter3_t_delete_path_get, _ra.svn_ra_reporter3_t_delete_path_set)
+    link_path = _swig_property(_ra.svn_ra_reporter3_t_link_path_get, _ra.svn_ra_reporter3_t_link_path_set)
+    finish_report = _swig_property(_ra.svn_ra_reporter3_t_finish_report_get, _ra.svn_ra_reporter3_t_finish_report_set)
+    abort_report = _swig_property(_ra.svn_ra_reporter3_t_abort_report_get, _ra.svn_ra_reporter3_t_abort_report_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -147,23 +176,57 @@ class svn_ra_reporter3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -173,7 +236,7 @@ class svn_ra_reporter3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def set_path(self, *args):
@@ -208,24 +271,16 @@ class svn_ra_reporter3_t:
 svn_ra_reporter3_t_swigregister = _ra.svn_ra_reporter3_t_swigregister
 svn_ra_reporter3_t_swigregister(svn_ra_reporter3_t)
 
-class svn_ra_reporter2_t:
+class svn_ra_reporter2_t(object):
     """Proxy of C svn_ra_reporter2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_reporter2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_reporter2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["set_path"] = _ra.svn_ra_reporter2_t_set_path_set
-    __swig_getmethods__["set_path"] = _ra.svn_ra_reporter2_t_set_path_get
-    __swig_setmethods__["delete_path"] = _ra.svn_ra_reporter2_t_delete_path_set
-    __swig_getmethods__["delete_path"] = _ra.svn_ra_reporter2_t_delete_path_get
-    __swig_setmethods__["link_path"] = _ra.svn_ra_reporter2_t_link_path_set
-    __swig_getmethods__["link_path"] = _ra.svn_ra_reporter2_t_link_path_get
-    __swig_setmethods__["finish_report"] = _ra.svn_ra_reporter2_t_finish_report_set
-    __swig_getmethods__["finish_report"] = _ra.svn_ra_reporter2_t_finish_report_get
-    __swig_setmethods__["abort_report"] = _ra.svn_ra_reporter2_t_abort_report_set
-    __swig_getmethods__["abort_report"] = _ra.svn_ra_reporter2_t_abort_report_get
+    set_path = _swig_property(_ra.svn_ra_reporter2_t_set_path_get, _ra.svn_ra_reporter2_t_set_path_set)
+    delete_path = _swig_property(_ra.svn_ra_reporter2_t_delete_path_get, _ra.svn_ra_reporter2_t_delete_path_set)
+    link_path = _swig_property(_ra.svn_ra_reporter2_t_link_path_get, _ra.svn_ra_reporter2_t_link_path_set)
+    finish_report = _swig_property(_ra.svn_ra_reporter2_t_finish_report_get, _ra.svn_ra_reporter2_t_finish_report_set)
+    abort_report = _swig_property(_ra.svn_ra_reporter2_t_abort_report_get, _ra.svn_ra_reporter2_t_abort_report_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -240,23 +295,57 @@ class svn_ra_reporter2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -266,7 +355,7 @@ class svn_ra_reporter2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def set_path(self, *args):
@@ -301,24 +390,16 @@ class svn_ra_reporter2_t:
 svn_ra_reporter2_t_swigregister = _ra.svn_ra_reporter2_t_swigregister
 svn_ra_reporter2_t_swigregister(svn_ra_reporter2_t)
 
-class svn_ra_reporter_t:
+class svn_ra_reporter_t(object):
     """Proxy of C svn_ra_reporter_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_reporter_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_reporter_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["set_path"] = _ra.svn_ra_reporter_t_set_path_set
-    __swig_getmethods__["set_path"] = _ra.svn_ra_reporter_t_set_path_get
-    __swig_setmethods__["delete_path"] = _ra.svn_ra_reporter_t_delete_path_set
-    __swig_getmethods__["delete_path"] = _ra.svn_ra_reporter_t_delete_path_get
-    __swig_setmethods__["link_path"] = _ra.svn_ra_reporter_t_link_path_set
-    __swig_getmethods__["link_path"] = _ra.svn_ra_reporter_t_link_path_get
-    __swig_setmethods__["finish_report"] = _ra.svn_ra_reporter_t_finish_report_set
-    __swig_getmethods__["finish_report"] = _ra.svn_ra_reporter_t_finish_report_get
-    __swig_setmethods__["abort_report"] = _ra.svn_ra_reporter_t_abort_report_set
-    __swig_getmethods__["abort_report"] = _ra.svn_ra_reporter_t_abort_report_get
+    set_path = _swig_property(_ra.svn_ra_reporter_t_set_path_get, _ra.svn_ra_reporter_t_set_path_set)
+    delete_path = _swig_property(_ra.svn_ra_reporter_t_delete_path_get, _ra.svn_ra_reporter_t_delete_path_set)
+    link_path = _swig_property(_ra.svn_ra_reporter_t_link_path_get, _ra.svn_ra_reporter_t_link_path_set)
+    finish_report = _swig_property(_ra.svn_ra_reporter_t_finish_report_get, _ra.svn_ra_reporter_t_finish_report_set)
+    abort_report = _swig_property(_ra.svn_ra_reporter_t_abort_report_get, _ra.svn_ra_reporter_t_abort_report_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -333,23 +414,57 @@ class svn_ra_reporter_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -359,7 +474,7 @@ class svn_ra_reporter_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def set_path(self, *args):
@@ -394,42 +509,25 @@ class svn_ra_reporter_t:
 svn_ra_reporter_t_swigregister = _ra.svn_ra_reporter_t_swigregister
 svn_ra_reporter_t_swigregister(svn_ra_reporter_t)
 
-class svn_ra_callbacks2_t:
+class svn_ra_callbacks2_t(object):
     """Proxy of C svn_ra_callbacks2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_callbacks2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_callbacks2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["open_tmp_file"] = _ra.svn_ra_callbacks2_t_open_tmp_file_set
-    __swig_getmethods__["open_tmp_file"] = _ra.svn_ra_callbacks2_t_open_tmp_file_get
-    __swig_setmethods__["auth_baton"] = _ra.svn_ra_callbacks2_t_auth_baton_set
-    __swig_getmethods__["auth_baton"] = _ra.svn_ra_callbacks2_t_auth_baton_get
-    __swig_setmethods__["get_wc_prop"] = _ra.svn_ra_callbacks2_t_get_wc_prop_set
-    __swig_getmethods__["get_wc_prop"] = _ra.svn_ra_callbacks2_t_get_wc_prop_get
-    __swig_setmethods__["set_wc_prop"] = _ra.svn_ra_callbacks2_t_set_wc_prop_set
-    __swig_getmethods__["set_wc_prop"] = _ra.svn_ra_callbacks2_t_set_wc_prop_get
-    __swig_setmethods__["push_wc_prop"] = _ra.svn_ra_callbacks2_t_push_wc_prop_set
-    __swig_getmethods__["push_wc_prop"] = _ra.svn_ra_callbacks2_t_push_wc_prop_get
-    __swig_setmethods__["invalidate_wc_props"] = _ra.svn_ra_callbacks2_t_invalidate_wc_props_set
-    __swig_getmethods__["invalidate_wc_props"] = _ra.svn_ra_callbacks2_t_invalidate_wc_props_get
-    __swig_setmethods__["progress_func"] = _ra.svn_ra_callbacks2_t_progress_func_set
-    __swig_getmethods__["progress_func"] = _ra.svn_ra_callbacks2_t_progress_func_get
-    __swig_setmethods__["progress_baton"] = _ra.svn_ra_callbacks2_t_progress_baton_set
-    __swig_getmethods__["progress_baton"] = _ra.svn_ra_callbacks2_t_progress_baton_get
-    __swig_setmethods__["cancel_func"] = _ra.svn_ra_callbacks2_t_cancel_func_set
-    __swig_getmethods__["cancel_func"] = _ra.svn_ra_callbacks2_t_cancel_func_get
-    __swig_setmethods__["get_client_string"] = _ra.svn_ra_callbacks2_t_get_client_string_set
-    __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
+    open_tmp_file = _swig_property(_ra.svn_ra_callbacks2_t_open_tmp_file_get, _ra.svn_ra_callbacks2_t_open_tmp_file_set)
+    auth_baton = _swig_property(_ra.svn_ra_callbacks2_t_auth_baton_get, _ra.svn_ra_callbacks2_t_auth_baton_set)
+    get_wc_prop = _swig_property(_ra.svn_ra_callbacks2_t_get_wc_prop_get, _ra.svn_ra_callbacks2_t_get_wc_prop_set)
+    set_wc_prop = _swig_property(_ra.svn_ra_callbacks2_t_set_wc_prop_get, _ra.svn_ra_callbacks2_t_set_wc_prop_set)
+    push_wc_prop = _swig_property(_ra.svn_ra_callbacks2_t_push_wc_prop_get, _ra.svn_ra_callbacks2_t_push_wc_prop_set)
+    invalidate_wc_props = _swig_property(_ra.svn_ra_callbacks2_t_invalidate_wc_props_get, _ra.svn_ra_callbacks2_t_invalidate_wc_props_set)
+    progress_func = _swig_property(_ra.svn_ra_callbacks2_t_progress_func_get, _ra.svn_ra_callbacks2_t_progress_func_set)
+    progress_baton = _swig_property(_ra.svn_ra_callbacks2_t_progress_baton_get, _ra.svn_ra_callbacks2_t_progress_baton_set)
+    cancel_func = _swig_property(_ra.svn_ra_callbacks2_t_cancel_func_get, _ra.svn_ra_callbacks2_t_cancel_func_set)
+    get_client_string = _swig_property(_ra.svn_ra_callbacks2_t_get_client_string_get, _ra.svn_ra_callbacks2_t_get_client_string_set)
+    get_wc_contents = _swig_property(_ra.svn_ra_callbacks2_t_get_wc_contents_get, _ra.svn_ra_callbacks2_t_get_wc_contents_set)
+    check_tunnel_func = _swig_property(_ra.svn_ra_callbacks2_t_check_tunnel_func_get, _ra.svn_ra_callbacks2_t_check_tunnel_func_set)
+    open_tunnel_func = _swig_property(_ra.svn_ra_callbacks2_t_open_tunnel_func_get, _ra.svn_ra_callbacks2_t_open_tunnel_func_set)
+    tunnel_baton = _swig_property(_ra.svn_ra_callbacks2_t_tunnel_baton_get, _ra.svn_ra_callbacks2_t_tunnel_baton_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -444,23 +542,57 @@ class svn_ra_callbacks2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -470,7 +602,7 @@ class svn_ra_callbacks2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def open_tmp_file(self, *args):
@@ -489,26 +621,17 @@ class svn_ra_callbacks2_t:
 svn_ra_callbacks2_t_swigregister = _ra.svn_ra_callbacks2_t_swigregister
 svn_ra_callbacks2_t_swigregister(svn_ra_callbacks2_t)
 
-class svn_ra_callbacks_t:
+class svn_ra_callbacks_t(object):
     """Proxy of C svn_ra_callbacks_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_callbacks_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_callbacks_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["open_tmp_file"] = _ra.svn_ra_callbacks_t_open_tmp_file_set
-    __swig_getmethods__["open_tmp_file"] = _ra.svn_ra_callbacks_t_open_tmp_file_get
-    __swig_setmethods__["auth_baton"] = _ra.svn_ra_callbacks_t_auth_baton_set
-    __swig_getmethods__["auth_baton"] = _ra.svn_ra_callbacks_t_auth_baton_get
-    __swig_setmethods__["get_wc_prop"] = _ra.svn_ra_callbacks_t_get_wc_prop_set
-    __swig_getmethods__["get_wc_prop"] = _ra.svn_ra_callbacks_t_get_wc_prop_get
-    __swig_setmethods__["set_wc_prop"] = _ra.svn_ra_callbacks_t_set_wc_prop_set
-    __swig_getmethods__["set_wc_prop"] = _ra.svn_ra_callbacks_t_set_wc_prop_get
-    __swig_setmethods__["push_wc_prop"] = _ra.svn_ra_callbacks_t_push_wc_prop_set
-    __swig_getmethods__["push_wc_prop"] = _ra.svn_ra_callbacks_t_push_wc_prop_get
-    __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
+    open_tmp_file = _swig_property(_ra.svn_ra_callbacks_t_open_tmp_file_get, _ra.svn_ra_callbacks_t_open_tmp_file_set)
+    auth_baton = _swig_property(_ra.svn_ra_callbacks_t_auth_baton_get, _ra.svn_ra_callbacks_t_auth_baton_set)
+    get_wc_prop = _swig_property(_ra.svn_ra_callbacks_t_get_wc_prop_get, _ra.svn_ra_callbacks_t_get_wc_prop_set)
+    set_wc_prop = _swig_property(_ra.svn_ra_callbacks_t_set_wc_prop_get, _ra.svn_ra_callbacks_t_set_wc_prop_set)
+    push_wc_prop = _swig_property(_ra.svn_ra_callbacks_t_push_wc_prop_get, _ra.svn_ra_callbacks_t_push_wc_prop_set)
+    invalidate_wc_props = _swig_property(_ra.svn_ra_callbacks_t_invalidate_wc_props_get, _ra.svn_ra_callbacks_t_invalidate_wc_props_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -523,23 +646,57 @@ class svn_ra_callbacks_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -549,7 +706,7 @@ class svn_ra_callbacks_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def open_tmp_file(self, *args):
@@ -569,231 +726,235 @@ svn_ra_callbacks_t_swigregister = _ra.svn_ra_callbacks_t_swigregister
 svn_ra_callbacks_t_swigregister(svn_ra_callbacks_t)
 
 
-def svn_ra_initialize(*args):
+def svn_ra_initialize(*args) -> "svn_error_t *":
     """svn_ra_initialize(apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_initialize(*args)
 
-def svn_ra_create_callbacks(*args):
+def svn_ra_create_callbacks(*args) -> "svn_ra_callbacks2_t **":
     """svn_ra_create_callbacks(apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_create_callbacks(*args)
 
-def svn_ra_open4(*args):
+def svn_ra_open5(*args) -> "svn_ra_session_t **, char const **, char const **":
+    """svn_ra_open5(char const * repos_URL, char const * uuid, svn_ra_callbacks2_t callbacks, apr_hash_t config, apr_pool_t pool) -> svn_error_t"""
+    return _ra.svn_ra_open5(*args)
+
+def svn_ra_open4(*args) -> "svn_ra_session_t **, char const **":
     """svn_ra_open4(char const * repos_URL, char const * uuid, svn_ra_callbacks2_t callbacks, apr_hash_t config, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_open4(*args)
 
-def svn_ra_open3(*args):
+def svn_ra_open3(*args) -> "svn_ra_session_t **":
     """svn_ra_open3(char const * repos_URL, char const * uuid, svn_ra_callbacks2_t callbacks, apr_hash_t config, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_open3(*args)
 
-def svn_ra_open2(*args):
+def svn_ra_open2(*args) -> "svn_ra_session_t **":
     """svn_ra_open2(char const * repos_URL, svn_ra_callbacks2_t callbacks, apr_hash_t config, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_open2(*args)
 
-def svn_ra_open(*args):
+def svn_ra_open(*args) -> "svn_ra_session_t **":
     """svn_ra_open(char const * repos_URL, svn_ra_callbacks_t callbacks, void * callback_baton, apr_hash_t config, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_open(*args)
 
-def svn_ra_reparent(*args):
+def svn_ra_reparent(*args) -> "svn_error_t *":
     """svn_ra_reparent(svn_ra_session_t * ra_session, char const * url, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reparent(*args)
 
-def svn_ra_get_session_url(*args):
+def svn_ra_get_session_url(*args) -> "char const **":
     """svn_ra_get_session_url(svn_ra_session_t * ra_session, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_session_url(*args)
 
-def svn_ra_get_path_relative_to_session(*args):
+def svn_ra_get_path_relative_to_session(*args) -> "char const **":
     """svn_ra_get_path_relative_to_session(svn_ra_session_t * ra_session, char const * url, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_path_relative_to_session(*args)
 
-def svn_ra_get_path_relative_to_root(*args):
+def svn_ra_get_path_relative_to_root(*args) -> "char const **":
     """svn_ra_get_path_relative_to_root(svn_ra_session_t * ra_session, char const * url, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_path_relative_to_root(*args)
 
-def svn_ra_get_latest_revnum(*args):
+def svn_ra_get_latest_revnum(*args) -> "svn_revnum_t *":
     """svn_ra_get_latest_revnum(svn_ra_session_t * session, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_latest_revnum(*args)
 
-def svn_ra_get_dated_revision(*args):
+def svn_ra_get_dated_revision(*args) -> "svn_revnum_t *":
     """svn_ra_get_dated_revision(svn_ra_session_t * session, apr_time_t tm, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_dated_revision(*args)
 
-def svn_ra_change_rev_prop2(*args):
+def svn_ra_change_rev_prop2(*args) -> "svn_string_t **":
     """svn_ra_change_rev_prop2(svn_ra_session_t * session, svn_revnum_t rev, char const * name, svn_string_t const *const * old_value_p, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_change_rev_prop2(*args)
 
-def svn_ra_change_rev_prop(*args):
+def svn_ra_change_rev_prop(*args) -> "svn_error_t *":
     """svn_ra_change_rev_prop(svn_ra_session_t * session, svn_revnum_t rev, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_change_rev_prop(*args)
 
-def svn_ra_rev_proplist(*args):
+def svn_ra_rev_proplist(*args) -> "apr_hash_t **":
     """svn_ra_rev_proplist(svn_ra_session_t * session, svn_revnum_t rev, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_rev_proplist(*args)
 
-def svn_ra_rev_prop(*args):
+def svn_ra_rev_prop(*args) -> "svn_string_t **":
     """svn_ra_rev_prop(svn_ra_session_t * session, svn_revnum_t rev, char const * name, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_rev_prop(*args)
 
-def svn_ra_get_commit_editor3(*args):
+def svn_ra_get_commit_editor3(*args) -> "svn_delta_editor_t const **, void **":
     """svn_ra_get_commit_editor3(svn_ra_session_t * session, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, apr_hash_t lock_tokens, svn_boolean_t keep_locks, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_commit_editor3(*args)
 
-def svn_ra_get_commit_editor2(*args):
+def svn_ra_get_commit_editor2(*args) -> "svn_delta_editor_t const **, void **":
     """svn_ra_get_commit_editor2(svn_ra_session_t * session, char const * log_msg, svn_commit_callback2_t commit_callback, apr_hash_t lock_tokens, svn_boolean_t keep_locks, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_commit_editor2(*args)
 
-def svn_ra_get_commit_editor(*args):
+def svn_ra_get_commit_editor(*args) -> "svn_delta_editor_t const **, void **":
     """svn_ra_get_commit_editor(svn_ra_session_t * session, char const * log_msg, svn_commit_callback_t callback, apr_hash_t lock_tokens, svn_boolean_t keep_locks, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_commit_editor(*args)
 
-def svn_ra_get_file(*args):
+def svn_ra_get_file(*args) -> "svn_revnum_t *, apr_hash_t **":
     """svn_ra_get_file(svn_ra_session_t * session, char const * path, svn_revnum_t revision, svn_stream_t * stream, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_file(*args)
 
-def svn_ra_get_dir2(*args):
+def svn_ra_get_dir2(*args) -> "apr_hash_t **, svn_revnum_t *, apr_hash_t **":
     """svn_ra_get_dir2(svn_ra_session_t * session, char const * path, svn_revnum_t revision, apr_uint32_t dirent_fields, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_dir2(*args)
 
-def svn_ra_get_dir(*args):
+def svn_ra_get_dir(*args) -> "apr_hash_t **, svn_revnum_t *, apr_hash_t **":
     """svn_ra_get_dir(svn_ra_session_t * session, char const * path, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_dir(*args)
 
-def svn_ra_list(*args):
+def svn_ra_list(*args) -> "svn_error_t *":
     """svn_ra_list(svn_ra_session_t * session, char const * path, svn_revnum_t revision, apr_array_header_t patterns, svn_depth_t depth, apr_uint32_t dirent_fields, svn_ra_dirent_receiver_t receiver, void * receiver_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _ra.svn_ra_list(*args)
 
-def svn_ra_get_mergeinfo(*args):
+def svn_ra_get_mergeinfo(*args) -> "apr_hash_t **":
     """svn_ra_get_mergeinfo(svn_ra_session_t * session, apr_array_header_t paths, svn_revnum_t revision, svn_mergeinfo_inheritance_t inherit, svn_boolean_t include_descendants, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_mergeinfo(*args)
 
-def svn_ra_do_update3(*args):
+def svn_ra_do_update3(*args) -> "svn_ra_reporter3_t const **, void **":
     """svn_ra_do_update3(svn_ra_session_t * session, svn_revnum_t revision_to_update_to, char const * update_target, svn_depth_t depth, svn_boolean_t send_copyfrom_args, svn_boolean_t ignore_ancestry, svn_delta_editor_t update_editor, void * update_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _ra.svn_ra_do_update3(*args)
 
-def svn_ra_do_update2(*args):
+def svn_ra_do_update2(*args) -> "svn_ra_reporter3_t const **, void **":
     """svn_ra_do_update2(svn_ra_session_t * session, svn_revnum_t revision_to_update_to, char const * update_target, svn_depth_t depth, svn_boolean_t send_copyfrom_args, svn_delta_editor_t update_editor, void * update_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_update2(*args)
 
-def svn_ra_do_update(*args):
+def svn_ra_do_update(*args) -> "svn_ra_reporter2_t const **, void **":
     """svn_ra_do_update(svn_ra_session_t * session, svn_revnum_t revision_to_update_to, char const * update_target, svn_boolean_t recurse, svn_delta_editor_t update_editor, void * update_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_update(*args)
 
-def svn_ra_do_switch3(*args):
+def svn_ra_do_switch3(*args) -> "svn_ra_reporter3_t const **, void **":
     """svn_ra_do_switch3(svn_ra_session_t * session, svn_revnum_t revision_to_switch_to, char const * switch_target, svn_depth_t depth, char const * switch_url, svn_boolean_t send_copyfrom_args, svn_boolean_t ignore_ancestry, svn_delta_editor_t switch_editor, void * switch_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _ra.svn_ra_do_switch3(*args)
 
-def svn_ra_do_switch2(*args):
+def svn_ra_do_switch2(*args) -> "svn_ra_reporter3_t const **, void **":
     """svn_ra_do_switch2(svn_ra_session_t * session, svn_revnum_t revision_to_switch_to, char const * switch_target, svn_depth_t depth, char const * switch_url, svn_delta_editor_t switch_editor, void * switch_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_switch2(*args)
 
-def svn_ra_do_switch(*args):
+def svn_ra_do_switch(*args) -> "svn_ra_reporter2_t const **, void **":
     """svn_ra_do_switch(svn_ra_session_t * session, svn_revnum_t revision_to_switch_to, char const * switch_target, svn_boolean_t recurse, char const * switch_url, svn_delta_editor_t switch_editor, void * switch_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_switch(*args)
 
-def svn_ra_do_status2(*args):
+def svn_ra_do_status2(*args) -> "svn_ra_reporter3_t const **, void **":
     """svn_ra_do_status2(svn_ra_session_t * session, char const * status_target, svn_revnum_t revision, svn_depth_t depth, svn_delta_editor_t status_editor, void * status_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_status2(*args)
 
-def svn_ra_do_status(*args):
+def svn_ra_do_status(*args) -> "svn_ra_reporter2_t const **, void **":
     """svn_ra_do_status(svn_ra_session_t * session, char const * status_target, svn_revnum_t revision, svn_boolean_t recurse, svn_delta_editor_t status_editor, void * status_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_status(*args)
 
-def svn_ra_do_diff3(*args):
+def svn_ra_do_diff3(*args) -> "svn_ra_reporter3_t const **, void **":
     """svn_ra_do_diff3(svn_ra_session_t * session, svn_revnum_t revision, char const * diff_target, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t text_deltas, char const * versus_url, svn_delta_editor_t diff_editor, void * diff_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_diff3(*args)
 
-def svn_ra_do_diff2(*args):
+def svn_ra_do_diff2(*args) -> "svn_ra_reporter2_t const **, void **":
     """svn_ra_do_diff2(svn_ra_session_t * session, svn_revnum_t revision, char const * diff_target, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t text_deltas, char const * versus_url, svn_delta_editor_t diff_editor, void * diff_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_diff2(*args)
 
-def svn_ra_do_diff(*args):
+def svn_ra_do_diff(*args) -> "svn_ra_reporter2_t const **, void **":
     """svn_ra_do_diff(svn_ra_session_t * session, svn_revnum_t revision, char const * diff_target, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, char const * versus_url, svn_delta_editor_t diff_editor, void * diff_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_do_diff(*args)
 
-def svn_ra_get_log2(*args):
+def svn_ra_get_log2(*args) -> "svn_error_t *":
     """svn_ra_get_log2(svn_ra_session_t * session, apr_array_header_t paths, svn_revnum_t start, svn_revnum_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_log_entry_receiver_t receiver, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_log2(*args)
 
-def svn_ra_get_log(*args):
+def svn_ra_get_log(*args) -> "svn_error_t *":
     """svn_ra_get_log(svn_ra_session_t * session, apr_array_header_t paths, svn_revnum_t start, svn_revnum_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_log(*args)
 
-def svn_ra_check_path(*args):
+def svn_ra_check_path(*args) -> "svn_node_kind_t *":
     """svn_ra_check_path(svn_ra_session_t * session, char const * path, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_check_path(*args)
 
-def svn_ra_stat(*args):
+def svn_ra_stat(*args) -> "svn_dirent_t **":
     """svn_ra_stat(svn_ra_session_t * session, char const * path, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_stat(*args)
 
-def svn_ra_get_uuid2(*args):
+def svn_ra_get_uuid2(*args) -> "char const **":
     """svn_ra_get_uuid2(svn_ra_session_t * session, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_uuid2(*args)
 
-def svn_ra_get_uuid(*args):
+def svn_ra_get_uuid(*args) -> "char const **":
     """svn_ra_get_uuid(svn_ra_session_t * session, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_uuid(*args)
 
-def svn_ra_get_repos_root2(*args):
+def svn_ra_get_repos_root2(*args) -> "char const **":
     """svn_ra_get_repos_root2(svn_ra_session_t * session, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_repos_root2(*args)
 
-def svn_ra_get_repos_root(*args):
+def svn_ra_get_repos_root(*args) -> "char const **":
     """svn_ra_get_repos_root(svn_ra_session_t * session, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_repos_root(*args)
 
-def svn_ra_get_locations(*args):
+def svn_ra_get_locations(*args) -> "apr_hash_t **":
     """svn_ra_get_locations(svn_ra_session_t * session, char const * path, svn_revnum_t peg_revision, apr_array_header_t location_revisions, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_locations(*args)
 
-def svn_ra_get_location_segments(*args):
+def svn_ra_get_location_segments(*args) -> "svn_error_t *":
     """svn_ra_get_location_segments(svn_ra_session_t * session, char const * path, svn_revnum_t peg_revision, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_location_segment_receiver_t receiver, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_location_segments(*args)
 
-def svn_ra_get_file_revs2(*args):
+def svn_ra_get_file_revs2(*args) -> "svn_error_t *":
     """svn_ra_get_file_revs2(svn_ra_session_t * session, char const * path, svn_revnum_t start, svn_revnum_t end, svn_boolean_t include_merged_revisions, svn_file_rev_handler_t handler, void * handler_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_file_revs2(*args)
 
-def svn_ra_get_file_revs(*args):
+def svn_ra_get_file_revs(*args) -> "svn_error_t *":
     """svn_ra_get_file_revs(svn_ra_session_t * session, char const * path, svn_revnum_t start, svn_revnum_t end, svn_ra_file_rev_handler_t handler, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_file_revs(*args)
 
-def svn_ra_lock(*args):
+def svn_ra_lock(*args) -> "svn_error_t *":
     """svn_ra_lock(svn_ra_session_t * session, apr_hash_t path_revs, char const * comment, svn_boolean_t steal_lock, svn_ra_lock_callback_t lock_func, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_lock(*args)
 
-def svn_ra_unlock(*args):
+def svn_ra_unlock(*args) -> "svn_error_t *":
     """svn_ra_unlock(svn_ra_session_t * session, apr_hash_t path_tokens, svn_boolean_t break_lock, svn_ra_lock_callback_t lock_func, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_unlock(*args)
 
-def svn_ra_get_lock(*args):
+def svn_ra_get_lock(*args) -> "svn_lock_t **":
     """svn_ra_get_lock(svn_ra_session_t * session, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_lock(*args)
 
-def svn_ra_get_locks2(*args):
+def svn_ra_get_locks2(*args) -> "apr_hash_t **":
     """svn_ra_get_locks2(svn_ra_session_t * session, char const * path, svn_depth_t depth, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_locks2(*args)
 
-def svn_ra_get_locks(*args):
+def svn_ra_get_locks(*args) -> "apr_hash_t **":
     """svn_ra_get_locks(svn_ra_session_t * session, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_locks(*args)
 
-def svn_ra_replay_range(*args):
+def svn_ra_replay_range(*args) -> "svn_error_t *":
     """svn_ra_replay_range(svn_ra_session_t * session, svn_revnum_t start_revision, svn_revnum_t end_revision, svn_revnum_t low_water_mark, svn_boolean_t send_deltas, svn_ra_replay_revstart_callback_t revstart_func, svn_ra_replay_revfinish_callback_t revfinish_func, void * replay_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_replay_range(*args)
 
-def svn_ra_replay(*args):
+def svn_ra_replay(*args) -> "svn_error_t *":
     """svn_ra_replay(svn_ra_session_t * session, svn_revnum_t revision, svn_revnum_t low_water_mark, svn_boolean_t send_deltas, svn_delta_editor_t editor, void * edit_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_replay(*args)
 
-def svn_ra_get_deleted_rev(*args):
+def svn_ra_get_deleted_rev(*args) -> "svn_revnum_t *":
     """svn_ra_get_deleted_rev(svn_ra_session_t * session, char const * path, svn_revnum_t peg_revision, svn_revnum_t end_revision, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_deleted_rev(*args)
 
-def svn_ra_get_inherited_props(*args):
+def svn_ra_get_inherited_props(*args) -> "apr_array_header_t **":
     """svn_ra_get_inherited_props(svn_ra_session_t * session, char const * path, svn_revnum_t revision, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _ra.svn_ra_get_inherited_props(*args)
 
-def svn_ra_has_capability(*args):
+def svn_ra_has_capability(*args) -> "svn_boolean_t *":
     """svn_ra_has_capability(svn_ra_session_t * session, char const * capability, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_has_capability(*args)
 SVN_RA_CAPABILITY_DEPTH = _ra.SVN_RA_CAPABILITY_DEPTH
@@ -807,65 +968,40 @@ SVN_RA_CAPABILITY_EPHEMERAL_TXNPROPS = _ra.SVN_RA_CAPABILITY_EPHEMERAL_TXNPROPS
 SVN_RA_CAPABILITY_GET_FILE_REVS_REVERSE = _ra.SVN_RA_CAPABILITY_GET_FILE_REVS_REVERSE
 SVN_RA_CAPABILITY_LIST = _ra.SVN_RA_CAPABILITY_LIST
 
-def svn_ra_print_modules(*args):
+def svn_ra_print_modules(*args) -> "svn_error_t *":
     """svn_ra_print_modules(svn_stringbuf_t * output, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_print_modules(*args)
 
-def svn_ra_print_ra_libraries(*args):
+def svn_ra_print_ra_libraries(*args) -> "svn_stringbuf_t **":
     """svn_ra_print_ra_libraries(void * ra_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_print_ra_libraries(*args)
-class svn_ra_plugin_t:
+class svn_ra_plugin_t(object):
     """Proxy of C svn_ra_plugin_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_plugin_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_plugin_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _ra.svn_ra_plugin_t_name_set
-    __swig_getmethods__["name"] = _ra.svn_ra_plugin_t_name_get
-    __swig_setmethods__["description"] = _ra.svn_ra_plugin_t_description_set
-    __swig_getmethods__["description"] = _ra.svn_ra_plugin_t_description_get
-    __swig_setmethods__["open"] = _ra.svn_ra_plugin_t_open_set
-    __swig_getmethods__["open"] = _ra.svn_ra_plugin_t_open_get
-    __swig_setmethods__["get_latest_revnum"] = _ra.svn_ra_plugin_t_get_latest_revnum_set
-    __swig_getmethods__["get_latest_revnum"] = _ra.svn_ra_plugin_t_get_latest_revnum_get
-    __swig_setmethods__["get_dated_revision"] = _ra.svn_ra_plugin_t_get_dated_revision_set
-    __swig_getmethods__["get_dated_revision"] = _ra.svn_ra_plugin_t_get_dated_revision_get
-    __swig_setmethods__["change_rev_prop"] = _ra.svn_ra_plugin_t_change_rev_prop_set
-    __swig_getmethods__["change_rev_prop"] = _ra.svn_ra_plugin_t_change_rev_prop_get
-    __swig_setmethods__["rev_proplist"] = _ra.svn_ra_plugin_t_rev_proplist_set
-    __swig_getmethods__["rev_proplist"] = _ra.svn_ra_plugin_t_rev_proplist_get
-    __swig_setmethods__["rev_prop"] = _ra.svn_ra_plugin_t_rev_prop_set
-    __swig_getmethods__["rev_prop"] = _ra.svn_ra_plugin_t_rev_prop_get
-    __swig_setmethods__["get_commit_editor"] = _ra.svn_ra_plugin_t_get_commit_editor_set
-    __swig_getmethods__["get_commit_editor"] = _ra.svn_ra_plugin_t_get_commit_editor_get
-    __swig_setmethods__["get_file"] = _ra.svn_ra_plugin_t_get_file_set
-    __swig_getmethods__["get_file"] = _ra.svn_ra_plugin_t_get_file_get
-    __swig_setmethods__["get_dir"] = _ra.svn_ra_plugin_t_get_dir_set
-    __swig_getmethods__["get_dir"] = _ra.svn_ra_plugin_t_get_dir_get
-    __swig_setmethods__["do_update"] = _ra.svn_ra_plugin_t_do_update_set
-    __swig_getmethods__["do_update"] = _ra.svn_ra_plugin_t_do_update_get
-    __swig_setmethods__["do_switch"] = _ra.svn_ra_plugin_t_do_switch_set
-    __swig_getmethods__["do_switch"] = _ra.svn_ra_plugin_t_do_switch_get
-    __swig_setmethods__["do_status"] = _ra.svn_ra_plugin_t_do_status_set
-    __swig_getmethods__["do_status"] = _ra.svn_ra_plugin_t_do_status_get
-    __swig_setmethods__["do_diff"] = _ra.svn_ra_plugin_t_do_diff_set
-    __swig_getmethods__["do_diff"] = _ra.svn_ra_plugin_t_do_diff_get
-    __swig_setmethods__["get_log"] = _ra.svn_ra_plugin_t_get_log_set
-    __swig_getmethods__["get_log"] = _ra.svn_ra_plugin_t_get_log_get
-    __swig_setmethods__["check_path"] = _ra.svn_ra_plugin_t_check_path_set
-    __swig_getmethods__["check_path"] = _ra.svn_ra_plugin_t_check_path_get
-    __swig_setmethods__["get_uuid"] = _ra.svn_ra_plugin_t_get_uuid_set
-    __swig_getmethods__["get_uuid"] = _ra.svn_ra_plugin_t_get_uuid_get
-    __swig_setmethods__["get_repos_root"] = _ra.svn_ra_plugin_t_get_repos_root_set
-    __swig_getmethods__["get_repos_root"] = _ra.svn_ra_plugin_t_get_repos_root_get
-    __swig_setmethods__["get_locations"] = _ra.svn_ra_plugin_t_get_locations_set
-    __swig_getmethods__["get_locations"] = _ra.svn_ra_plugin_t_get_locations_get
-    __swig_setmethods__["get_file_revs"] = _ra.svn_ra_plugin_t_get_file_revs_set
-    __swig_getmethods__["get_file_revs"] = _ra.svn_ra_plugin_t_get_file_revs_get
-    __swig_setmethods__["get_version"] = _ra.svn_ra_plugin_t_get_version_set
-    __swig_getmethods__["get_version"] = _ra.svn_ra_plugin_t_get_version_get
+    name = _swig_property(_ra.svn_ra_plugin_t_name_get, _ra.svn_ra_plugin_t_name_set)
+    description = _swig_property(_ra.svn_ra_plugin_t_description_get, _ra.svn_ra_plugin_t_description_set)
+    open = _swig_property(_ra.svn_ra_plugin_t_open_get, _ra.svn_ra_plugin_t_open_set)
+    get_latest_revnum = _swig_property(_ra.svn_ra_plugin_t_get_latest_revnum_get, _ra.svn_ra_plugin_t_get_latest_revnum_set)
+    get_dated_revision = _swig_property(_ra.svn_ra_plugin_t_get_dated_revision_get, _ra.svn_ra_plugin_t_get_dated_revision_set)
+    change_rev_prop = _swig_property(_ra.svn_ra_plugin_t_change_rev_prop_get, _ra.svn_ra_plugin_t_change_rev_prop_set)
+    rev_proplist = _swig_property(_ra.svn_ra_plugin_t_rev_proplist_get, _ra.svn_ra_plugin_t_rev_proplist_set)
+    rev_prop = _swig_property(_ra.svn_ra_plugin_t_rev_prop_get, _ra.svn_ra_plugin_t_rev_prop_set)
+    get_commit_editor = _swig_property(_ra.svn_ra_plugin_t_get_commit_editor_get, _ra.svn_ra_plugin_t_get_commit_editor_set)
+    get_file = _swig_property(_ra.svn_ra_plugin_t_get_file_get, _ra.svn_ra_plugin_t_get_file_set)
+    get_dir = _swig_property(_ra.svn_ra_plugin_t_get_dir_get, _ra.svn_ra_plugin_t_get_dir_set)
+    do_update = _swig_property(_ra.svn_ra_plugin_t_do_update_get, _ra.svn_ra_plugin_t_do_update_set)
+    do_switch = _swig_property(_ra.svn_ra_plugin_t_do_switch_get, _ra.svn_ra_plugin_t_do_switch_set)
+    do_status = _swig_property(_ra.svn_ra_plugin_t_do_status_get, _ra.svn_ra_plugin_t_do_status_set)
+    do_diff = _swig_property(_ra.svn_ra_plugin_t_do_diff_get, _ra.svn_ra_plugin_t_do_diff_set)
+    get_log = _swig_property(_ra.svn_ra_plugin_t_get_log_get, _ra.svn_ra_plugin_t_get_log_set)
+    check_path = _swig_property(_ra.svn_ra_plugin_t_check_path_get, _ra.svn_ra_plugin_t_check_path_set)
+    get_uuid = _swig_property(_ra.svn_ra_plugin_t_get_uuid_get, _ra.svn_ra_plugin_t_get_uuid_set)
+    get_repos_root = _swig_property(_ra.svn_ra_plugin_t_get_repos_root_get, _ra.svn_ra_plugin_t_get_repos_root_set)
+    get_locations = _swig_property(_ra.svn_ra_plugin_t_get_locations_get, _ra.svn_ra_plugin_t_get_locations_set)
+    get_file_revs = _swig_property(_ra.svn_ra_plugin_t_get_file_revs_get, _ra.svn_ra_plugin_t_get_file_revs_set)
+    get_version = _swig_property(_ra.svn_ra_plugin_t_get_version_get, _ra.svn_ra_plugin_t_get_version_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -880,23 +1016,57 @@ class svn_ra_plugin_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -906,7 +1076,7 @@ class svn_ra_plugin_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def open(self, *args):
@@ -1003,20 +1173,17 @@ svn_ra_plugin_t_swigregister(svn_ra_plugin_t)
 
 SVN_RA_ABI_VERSION = _ra.SVN_RA_ABI_VERSION
 
-def svn_ra_init_ra_libs(*args):
+def svn_ra_init_ra_libs(*args) -> "void **":
     """svn_ra_init_ra_libs(apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_init_ra_libs(*args)
 
-def svn_ra_get_ra_library(*args):
+def svn_ra_get_ra_library(*args) -> "svn_ra_plugin_t **":
     """svn_ra_get_ra_library(void * ra_baton, char const * url, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_get_ra_library(*args)
-class svn_ra_session_t:
+class svn_ra_session_t(object):
     """Proxy of C svn_ra_session_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_session_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_session_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1035,23 +1202,57 @@ class svn_ra_session_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1061,230 +1262,227 @@ class svn_ra_session_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_ra_session_t_swigregister = _ra.svn_ra_session_t_swigregister
 svn_ra_session_t_swigregister(svn_ra_session_t)
 
 
-def svn_ra_reporter3_invoke_set_path(*args):
+def svn_ra_reporter3_invoke_set_path(*args) -> "svn_error_t *":
     """svn_ra_reporter3_invoke_set_path(svn_ra_reporter3_t _obj, void * report_baton, char const * path, svn_revnum_t revision, svn_depth_t depth, svn_boolean_t start_empty, char const * lock_token, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter3_invoke_set_path(*args)
 
-def svn_ra_reporter3_invoke_delete_path(*args):
+def svn_ra_reporter3_invoke_delete_path(*args) -> "svn_error_t *":
     """svn_ra_reporter3_invoke_delete_path(svn_ra_reporter3_t _obj, void * report_baton, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter3_invoke_delete_path(*args)
 
-def svn_ra_reporter3_invoke_link_path(*args):
+def svn_ra_reporter3_invoke_link_path(*args) -> "svn_error_t *":
     """svn_ra_reporter3_invoke_link_path(svn_ra_reporter3_t _obj, void * report_baton, char const * path, char const * url, svn_revnum_t revision, svn_depth_t depth, svn_boolean_t start_empty, char const * lock_token, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter3_invoke_link_path(*args)
 
-def svn_ra_reporter3_invoke_finish_report(*args):
+def svn_ra_reporter3_invoke_finish_report(*args) -> "svn_error_t *":
     """svn_ra_reporter3_invoke_finish_report(svn_ra_reporter3_t _obj, void * report_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter3_invoke_finish_report(*args)
 
-def svn_ra_reporter3_invoke_abort_report(*args):
+def svn_ra_reporter3_invoke_abort_report(*args) -> "svn_error_t *":
     """svn_ra_reporter3_invoke_abort_report(svn_ra_reporter3_t _obj, void * report_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter3_invoke_abort_report(*args)
 
-def svn_ra_reporter2_invoke_set_path(*args):
+def svn_ra_reporter2_invoke_set_path(*args) -> "svn_error_t *":
     """svn_ra_reporter2_invoke_set_path(svn_ra_reporter2_t _obj, void * report_baton, char const * path, svn_revnum_t revision, svn_boolean_t start_empty, char const * lock_token, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter2_invoke_set_path(*args)
 
-def svn_ra_reporter2_invoke_delete_path(*args):
+def svn_ra_reporter2_invoke_delete_path(*args) -> "svn_error_t *":
     """svn_ra_reporter2_invoke_delete_path(svn_ra_reporter2_t _obj, void * report_baton, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter2_invoke_delete_path(*args)
 
-def svn_ra_reporter2_invoke_link_path(*args):
+def svn_ra_reporter2_invoke_link_path(*args) -> "svn_error_t *":
     """svn_ra_reporter2_invoke_link_path(svn_ra_reporter2_t _obj, void * report_baton, char const * path, char const * url, svn_revnum_t revision, svn_boolean_t start_empty, char const * lock_token, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter2_invoke_link_path(*args)
 
-def svn_ra_reporter2_invoke_finish_report(*args):
+def svn_ra_reporter2_invoke_finish_report(*args) -> "svn_error_t *":
     """svn_ra_reporter2_invoke_finish_report(svn_ra_reporter2_t _obj, void * report_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter2_invoke_finish_report(*args)
 
-def svn_ra_reporter2_invoke_abort_report(*args):
+def svn_ra_reporter2_invoke_abort_report(*args) -> "svn_error_t *":
     """svn_ra_reporter2_invoke_abort_report(svn_ra_reporter2_t _obj, void * report_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter2_invoke_abort_report(*args)
 
-def svn_ra_reporter_invoke_set_path(*args):
+def svn_ra_reporter_invoke_set_path(*args) -> "svn_error_t *":
     """svn_ra_reporter_invoke_set_path(svn_ra_reporter_t _obj, void * report_baton, char const * path, svn_revnum_t revision, svn_boolean_t start_empty, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter_invoke_set_path(*args)
 
-def svn_ra_reporter_invoke_delete_path(*args):
+def svn_ra_reporter_invoke_delete_path(*args) -> "svn_error_t *":
     """svn_ra_reporter_invoke_delete_path(svn_ra_reporter_t _obj, void * report_baton, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter_invoke_delete_path(*args)
 
-def svn_ra_reporter_invoke_link_path(*args):
+def svn_ra_reporter_invoke_link_path(*args) -> "svn_error_t *":
     """svn_ra_reporter_invoke_link_path(svn_ra_reporter_t _obj, void * report_baton, char const * path, char const * url, svn_revnum_t revision, svn_boolean_t start_empty, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter_invoke_link_path(*args)
 
-def svn_ra_reporter_invoke_finish_report(*args):
+def svn_ra_reporter_invoke_finish_report(*args) -> "svn_error_t *":
     """svn_ra_reporter_invoke_finish_report(svn_ra_reporter_t _obj, void * report_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter_invoke_finish_report(*args)
 
-def svn_ra_reporter_invoke_abort_report(*args):
+def svn_ra_reporter_invoke_abort_report(*args) -> "svn_error_t *":
     """svn_ra_reporter_invoke_abort_report(svn_ra_reporter_t _obj, void * report_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_reporter_invoke_abort_report(*args)
 
-def svn_ra_callbacks2_invoke_open_tmp_file(*args):
+def svn_ra_callbacks2_invoke_open_tmp_file(*args) -> "apr_file_t **":
     """svn_ra_callbacks2_invoke_open_tmp_file(svn_ra_callbacks2_t _obj, void * callback_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_callbacks2_invoke_open_tmp_file(*args)
 
-def svn_ra_callbacks_invoke_open_tmp_file(*args):
+def svn_ra_callbacks_invoke_open_tmp_file(*args) -> "apr_file_t **":
     """svn_ra_callbacks_invoke_open_tmp_file(svn_ra_callbacks_t _obj, void * callback_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_callbacks_invoke_open_tmp_file(*args)
 
-def svn_ra_plugin_invoke_open(*args):
+def svn_ra_plugin_invoke_open(*args) -> "void **":
     """svn_ra_plugin_invoke_open(svn_ra_plugin_t _obj, char const * repos_URL, svn_ra_callbacks_t callbacks, void * callback_baton, apr_hash_t config, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_open(*args)
 
-def svn_ra_plugin_invoke_get_latest_revnum(*args):
+def svn_ra_plugin_invoke_get_latest_revnum(*args) -> "svn_revnum_t *":
     """svn_ra_plugin_invoke_get_latest_revnum(svn_ra_plugin_t _obj, void * session_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_latest_revnum(*args)
 
-def svn_ra_plugin_invoke_get_dated_revision(*args):
+def svn_ra_plugin_invoke_get_dated_revision(*args) -> "svn_revnum_t *":
     """svn_ra_plugin_invoke_get_dated_revision(svn_ra_plugin_t _obj, void * session_baton, apr_time_t tm, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_dated_revision(*args)
 
-def svn_ra_plugin_invoke_change_rev_prop(*args):
+def svn_ra_plugin_invoke_change_rev_prop(*args) -> "svn_error_t *":
     """svn_ra_plugin_invoke_change_rev_prop(svn_ra_plugin_t _obj, void * session_baton, svn_revnum_t rev, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_change_rev_prop(*args)
 
-def svn_ra_plugin_invoke_rev_proplist(*args):
+def svn_ra_plugin_invoke_rev_proplist(*args) -> "apr_hash_t **":
     """svn_ra_plugin_invoke_rev_proplist(svn_ra_plugin_t _obj, void * session_baton, svn_revnum_t rev, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_rev_proplist(*args)
 
-def svn_ra_plugin_invoke_rev_prop(*args):
+def svn_ra_plugin_invoke_rev_prop(*args) -> "svn_string_t **":
     """svn_ra_plugin_invoke_rev_prop(svn_ra_plugin_t _obj, void * session_baton, svn_revnum_t rev, char const * name, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_rev_prop(*args)
 
-def svn_ra_plugin_invoke_get_commit_editor(*args):
+def svn_ra_plugin_invoke_get_commit_editor(*args) -> "svn_delta_editor_t const **, void **":
     """svn_ra_plugin_invoke_get_commit_editor(svn_ra_plugin_t _obj, void * session_baton, char const * log_msg, svn_commit_callback_t callback, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_commit_editor(*args)
 
-def svn_ra_plugin_invoke_get_file(*args):
+def svn_ra_plugin_invoke_get_file(*args) -> "svn_revnum_t *, apr_hash_t **":
     """svn_ra_plugin_invoke_get_file(svn_ra_plugin_t _obj, void * session_baton, char const * path, svn_revnum_t revision, svn_stream_t * stream, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_file(*args)
 
-def svn_ra_plugin_invoke_get_dir(*args):
+def svn_ra_plugin_invoke_get_dir(*args) -> "apr_hash_t **, svn_revnum_t *, apr_hash_t **":
     """svn_ra_plugin_invoke_get_dir(svn_ra_plugin_t _obj, void * session_baton, char const * path, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_dir(*args)
 
-def svn_ra_plugin_invoke_do_update(*args):
+def svn_ra_plugin_invoke_do_update(*args) -> "svn_ra_reporter_t const **, void **":
     """svn_ra_plugin_invoke_do_update(svn_ra_plugin_t _obj, void * session_baton, svn_revnum_t revision_to_update_to, char const * update_target, svn_boolean_t recurse, svn_delta_editor_t update_editor, void * update_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_do_update(*args)
 
-def svn_ra_plugin_invoke_do_switch(*args):
+def svn_ra_plugin_invoke_do_switch(*args) -> "svn_ra_reporter_t const **, void **":
     """svn_ra_plugin_invoke_do_switch(svn_ra_plugin_t _obj, void * session_baton, svn_revnum_t revision_to_switch_to, char const * switch_target, svn_boolean_t recurse, char const * switch_url, svn_delta_editor_t switch_editor, void * switch_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_do_switch(*args)
 
-def svn_ra_plugin_invoke_do_status(*args):
+def svn_ra_plugin_invoke_do_status(*args) -> "svn_ra_reporter_t const **, void **":
     """svn_ra_plugin_invoke_do_status(svn_ra_plugin_t _obj, void * session_baton, char const * status_target, svn_revnum_t revision, svn_boolean_t recurse, svn_delta_editor_t status_editor, void * status_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_do_status(*args)
 
-def svn_ra_plugin_invoke_do_diff(*args):
+def svn_ra_plugin_invoke_do_diff(*args) -> "svn_ra_reporter_t const **, void **":
     """svn_ra_plugin_invoke_do_diff(svn_ra_plugin_t _obj, void * session_baton, svn_revnum_t revision, char const * diff_target, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, char const * versus_url, svn_delta_editor_t diff_editor, void * diff_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_do_diff(*args)
 
-def svn_ra_plugin_invoke_get_log(*args):
+def svn_ra_plugin_invoke_get_log(*args) -> "svn_error_t *":
     """svn_ra_plugin_invoke_get_log(svn_ra_plugin_t _obj, void * session_baton, apr_array_header_t paths, svn_revnum_t start, svn_revnum_t end, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_log(*args)
 
-def svn_ra_plugin_invoke_check_path(*args):
+def svn_ra_plugin_invoke_check_path(*args) -> "svn_node_kind_t *":
     """svn_ra_plugin_invoke_check_path(svn_ra_plugin_t _obj, void * session_baton, char const * path, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_check_path(*args)
 
-def svn_ra_plugin_invoke_get_uuid(*args):
+def svn_ra_plugin_invoke_get_uuid(*args) -> "char const **":
     """svn_ra_plugin_invoke_get_uuid(svn_ra_plugin_t _obj, void * session_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_uuid(*args)
 
-def svn_ra_plugin_invoke_get_repos_root(*args):
+def svn_ra_plugin_invoke_get_repos_root(*args) -> "char const **":
     """svn_ra_plugin_invoke_get_repos_root(svn_ra_plugin_t _obj, void * session_baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_repos_root(*args)
 
-def svn_ra_plugin_invoke_get_locations(*args):
+def svn_ra_plugin_invoke_get_locations(*args) -> "apr_hash_t **":
     """svn_ra_plugin_invoke_get_locations(svn_ra_plugin_t _obj, void * session_baton, char const * path, svn_revnum_t peg_revision, apr_array_header_t location_revisions, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_locations(*args)
 
-def svn_ra_plugin_invoke_get_file_revs(*args):
+def svn_ra_plugin_invoke_get_file_revs(*args) -> "svn_error_t *":
     """svn_ra_plugin_invoke_get_file_revs(svn_ra_plugin_t _obj, void * session_baton, char const * path, svn_revnum_t start, svn_revnum_t end, svn_ra_file_rev_handler_t handler, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_plugin_invoke_get_file_revs(*args)
 
-def svn_ra_plugin_invoke_get_version(_obj):
+def svn_ra_plugin_invoke_get_version(_obj: 'svn_ra_plugin_t') -> "svn_version_t const *":
     """svn_ra_plugin_invoke_get_version(svn_ra_plugin_t _obj) -> svn_version_t const *"""
     return _ra.svn_ra_plugin_invoke_get_version(_obj)
 
-def svn_ra_invoke_get_wc_prop_func(*args):
+def svn_ra_invoke_get_wc_prop_func(*args) -> "svn_string_t **":
     """svn_ra_invoke_get_wc_prop_func(svn_ra_get_wc_prop_func_t _obj, void * baton, char const * path, char const * name, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_get_wc_prop_func(*args)
 
-def svn_ra_invoke_set_wc_prop_func(*args):
+def svn_ra_invoke_set_wc_prop_func(*args) -> "svn_error_t *":
     """svn_ra_invoke_set_wc_prop_func(svn_ra_set_wc_prop_func_t _obj, void * baton, char const * path, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_set_wc_prop_func(*args)
 
-def svn_ra_invoke_push_wc_prop_func(*args):
+def svn_ra_invoke_push_wc_prop_func(*args) -> "svn_error_t *":
     """svn_ra_invoke_push_wc_prop_func(svn_ra_push_wc_prop_func_t _obj, void * baton, char const * path, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_push_wc_prop_func(*args)
 
-def svn_ra_invoke_invalidate_wc_props_func(*args):
+def svn_ra_invoke_invalidate_wc_props_func(*args) -> "svn_error_t *":
     """svn_ra_invoke_invalidate_wc_props_func(svn_ra_invalidate_wc_props_func_t _obj, void * baton, char const * path, char const * name, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_invalidate_wc_props_func(*args)
 
-def svn_ra_invoke_get_wc_contents_func(*args):
+def svn_ra_invoke_get_wc_contents_func(*args) -> "svn_stream_t **":
     """svn_ra_invoke_get_wc_contents_func(svn_ra_get_wc_contents_func_t _obj, void * baton, svn_checksum_t checksum, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_get_wc_contents_func(*args)
 
-def svn_ra_invoke_get_latest_revnum_func(_obj, session_baton):
+def svn_ra_invoke_get_latest_revnum_func(_obj: 'svn_ra_get_latest_revnum_func_t', session_baton: 'void *') -> "svn_revnum_t *":
     """svn_ra_invoke_get_latest_revnum_func(svn_ra_get_latest_revnum_func_t _obj, void * session_baton) -> svn_error_t"""
     return _ra.svn_ra_invoke_get_latest_revnum_func(_obj, session_baton)
 
-def svn_ra_invoke_get_client_string_func(*args):
+def svn_ra_invoke_get_client_string_func(*args) -> "char const **":
     """svn_ra_invoke_get_client_string_func(svn_ra_get_client_string_func_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_get_client_string_func(*args)
 
-def svn_ra_invoke_file_rev_handler(*args):
+def svn_ra_invoke_file_rev_handler(*args) -> "svn_txdelta_window_handler_t *, void **":
     """svn_ra_invoke_file_rev_handler(svn_ra_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 _ra.svn_ra_invoke_file_rev_handler(*args)
 
-def svn_ra_invoke_lock_callback(*args):
+def svn_ra_invoke_lock_callback(*args) -> "svn_error_t *":
     """svn_ra_invoke_lock_callback(svn_ra_lock_callback_t _obj, void * baton, char const * path, svn_boolean_t do_lock, svn_lock_t lock, svn_error_t ra_err, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_lock_callback(*args)
 
-def svn_ra_invoke_progress_notify_func(*args):
+def svn_ra_invoke_progress_notify_func(*args) -> "void":
     """svn_ra_invoke_progress_notify_func(svn_ra_progress_notify_func_t _obj, apr_off_t progress, apr_off_t total, void * baton, apr_pool_t pool)"""
     return _ra.svn_ra_invoke_progress_notify_func(*args)
 
-def svn_ra_invoke_replay_revstart_callback(*args):
+def svn_ra_invoke_replay_revstart_callback(*args) -> "svn_delta_editor_t const **, void **":
     """svn_ra_invoke_replay_revstart_callback(svn_ra_replay_revstart_callback_t _obj, svn_revnum_t revision, void * replay_baton, apr_hash_t rev_props, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_replay_revstart_callback(*args)
 
-def svn_ra_invoke_replay_revfinish_callback(*args):
+def svn_ra_invoke_replay_revfinish_callback(*args) -> "svn_error_t *":
     """svn_ra_invoke_replay_revfinish_callback(svn_ra_replay_revfinish_callback_t _obj, svn_revnum_t revision, void * replay_baton, svn_delta_editor_t editor, void * edit_baton, apr_hash_t rev_props, apr_pool_t pool) -> svn_error_t"""
     return _ra.svn_ra_invoke_replay_revfinish_callback(*args)
 
-def svn_ra_invoke_check_tunnel_func(_obj, tunnel_baton, tunnel_name):
+def svn_ra_invoke_check_tunnel_func(_obj: 'svn_ra_check_tunnel_func_t', tunnel_baton: 'void *', tunnel_name: 'char const *') -> "svn_boolean_t":
     """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(_obj, tunnel_baton, tunnel_name)
 
-def svn_ra_invoke_close_tunnel_func(_obj, close_baton, tunnel_baton):
+def svn_ra_invoke_close_tunnel_func(_obj: 'svn_ra_close_tunnel_func_t', close_baton: 'void *', tunnel_baton: 'void *') -> "void":
     """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(_obj, close_baton, tunnel_baton)
 
-def svn_ra_invoke_open_tunnel_func(*args):
+def svn_ra_invoke_open_tunnel_func(*args) -> "svn_stream_t **, svn_stream_t **, svn_ra_close_tunnel_func_t *, SWIGTYPE **":
     """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):
+def svn_ra_invoke_init_func(*args) -> "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) -> svn_error_t"""
     return _ra.svn_ra_invoke_init_func(*args)
-class svn_ra_get_wc_prop_func_t:
+class svn_ra_get_wc_prop_func_t(object):
     """Proxy of C svn_ra_get_wc_prop_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_get_wc_prop_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_get_wc_prop_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1303,23 +1501,57 @@ class svn_ra_get_wc_prop_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1329,7 +1561,7 @@ class svn_ra_get_wc_prop_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1338,13 +1570,10 @@ class svn_ra_get_wc_prop_func_t:
 svn_ra_get_wc_prop_func_t_swigregister = _ra.svn_ra_get_wc_prop_func_t_swigregister
 svn_ra_get_wc_prop_func_t_swigregister(svn_ra_get_wc_prop_func_t)
 
-class svn_ra_set_wc_prop_func_t:
+class svn_ra_set_wc_prop_func_t(object):
     """Proxy of C svn_ra_set_wc_prop_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_set_wc_prop_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_set_wc_prop_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1363,23 +1592,57 @@ class svn_ra_set_wc_prop_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1389,7 +1652,7 @@ class svn_ra_set_wc_prop_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1398,13 +1661,10 @@ class svn_ra_set_wc_prop_func_t:
 svn_ra_set_wc_prop_func_t_swigregister = _ra.svn_ra_set_wc_prop_func_t_swigregister
 svn_ra_set_wc_prop_func_t_swigregister(svn_ra_set_wc_prop_func_t)
 
-class svn_ra_push_wc_prop_func_t:
+class svn_ra_push_wc_prop_func_t(object):
     """Proxy of C svn_ra_push_wc_prop_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_push_wc_prop_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_push_wc_prop_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1423,23 +1683,57 @@ class svn_ra_push_wc_prop_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1449,7 +1743,7 @@ class svn_ra_push_wc_prop_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1458,13 +1752,10 @@ class svn_ra_push_wc_prop_func_t:
 svn_ra_push_wc_prop_func_t_swigregister = _ra.svn_ra_push_wc_prop_func_t_swigregister
 svn_ra_push_wc_prop_func_t_swigregister(svn_ra_push_wc_prop_func_t)
 
-class svn_ra_invalidate_wc_props_func_t:
+class svn_ra_invalidate_wc_props_func_t(object):
     """Proxy of C svn_ra_invalidate_wc_props_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_invalidate_wc_props_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_invalidate_wc_props_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1483,23 +1774,57 @@ class svn_ra_invalidate_wc_props_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1509,7 +1834,7 @@ class svn_ra_invalidate_wc_props_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1518,13 +1843,10 @@ class svn_ra_invalidate_wc_props_func_t:
 svn_ra_invalidate_wc_props_func_t_swigregister = _ra.svn_ra_invalidate_wc_props_func_t_swigregister
 svn_ra_invalidate_wc_props_func_t_swigregister(svn_ra_invalidate_wc_props_func_t)
 
-class svn_ra_get_wc_contents_func_t:
+class svn_ra_get_wc_contents_func_t(object):
     """Proxy of C svn_ra_get_wc_contents_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_get_wc_contents_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_get_wc_contents_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1543,23 +1865,57 @@ class svn_ra_get_wc_contents_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1569,7 +1925,7 @@ class svn_ra_get_wc_contents_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1578,13 +1934,10 @@ class svn_ra_get_wc_contents_func_t:
 svn_ra_get_wc_contents_func_t_swigregister = _ra.svn_ra_get_wc_contents_func_t_swigregister
 svn_ra_get_wc_contents_func_t_swigregister(svn_ra_get_wc_contents_func_t)
 
-class svn_ra_get_latest_revnum_func_t:
+class svn_ra_get_latest_revnum_func_t(object):
     """Proxy of C svn_ra_get_latest_revnum_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_get_latest_revnum_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_get_latest_revnum_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1603,23 +1956,57 @@ class svn_ra_get_latest_revnum_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1629,7 +2016,7 @@ class svn_ra_get_latest_revnum_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1638,13 +2025,10 @@ class svn_ra_get_latest_revnum_func_t:
 svn_ra_get_latest_revnum_func_t_swigregister = _ra.svn_ra_get_latest_revnum_func_t_swigregister
 svn_ra_get_latest_revnum_func_t_swigregister(svn_ra_get_latest_revnum_func_t)
 
-class svn_ra_get_client_string_func_t:
+class svn_ra_get_client_string_func_t(object):
     """Proxy of C svn_ra_get_client_string_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_get_client_string_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_get_client_string_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1663,23 +2047,57 @@ class svn_ra_get_client_string_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1689,7 +2107,7 @@ class svn_ra_get_client_string_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1698,13 +2116,10 @@ class svn_ra_get_client_string_func_t:
 svn_ra_get_client_string_func_t_swigregister = _ra.svn_ra_get_client_string_func_t_swigregister
 svn_ra_get_client_string_func_t_swigregister(svn_ra_get_client_string_func_t)
 
-class svn_ra_file_rev_handler_t:
+class svn_ra_file_rev_handler_t(object):
     """Proxy of C svn_ra_file_rev_handler_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_file_rev_handler_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_file_rev_handler_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1723,23 +2138,57 @@ class svn_ra_file_rev_handler_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1749,7 +2198,7 @@ class svn_ra_file_rev_handler_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1758,13 +2207,10 @@ class svn_ra_file_rev_handler_t:
 svn_ra_file_rev_handler_t_swigregister = _ra.svn_ra_file_rev_handler_t_swigregister
 svn_ra_file_rev_handler_t_swigregister(svn_ra_file_rev_handler_t)
 
-class svn_ra_lock_callback_t:
+class svn_ra_lock_callback_t(object):
     """Proxy of C svn_ra_lock_callback_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_lock_callback_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_lock_callback_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1783,23 +2229,57 @@ class svn_ra_lock_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1809,7 +2289,7 @@ class svn_ra_lock_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1818,13 +2298,10 @@ class svn_ra_lock_callback_t:
 svn_ra_lock_callback_t_swigregister = _ra.svn_ra_lock_callback_t_swigregister
 svn_ra_lock_callback_t_swigregister(svn_ra_lock_callback_t)
 
-class svn_ra_progress_notify_func_t:
+class svn_ra_progress_notify_func_t(object):
     """Proxy of C svn_ra_progress_notify_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_progress_notify_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_progress_notify_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1843,23 +2320,57 @@ class svn_ra_progress_notify_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1869,7 +2380,7 @@ class svn_ra_progress_notify_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1878,13 +2389,10 @@ class svn_ra_progress_notify_func_t:
 svn_ra_progress_notify_func_t_swigregister = _ra.svn_ra_progress_notify_func_t_swigregister
 svn_ra_progress_notify_func_t_swigregister(svn_ra_progress_notify_func_t)
 
-class svn_ra_replay_revstart_callback_t:
+class svn_ra_replay_revstart_callback_t(object):
     """Proxy of C svn_ra_replay_revstart_callback_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_replay_revstart_callback_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_replay_revstart_callback_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1903,23 +2411,57 @@ class svn_ra_replay_revstart_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1929,7 +2471,7 @@ class svn_ra_replay_revstart_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1938,13 +2480,10 @@ class svn_ra_replay_revstart_callback_t:
 svn_ra_replay_revstart_callback_t_swigregister = _ra.svn_ra_replay_revstart_callback_t_swigregister
 svn_ra_replay_revstart_callback_t_swigregister(svn_ra_replay_revstart_callback_t)
 
-class svn_ra_replay_revfinish_callback_t:
+class svn_ra_replay_revfinish_callback_t(object):
     """Proxy of C svn_ra_replay_revfinish_callback_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_replay_revfinish_callback_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_replay_revfinish_callback_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1963,23 +2502,57 @@ class svn_ra_replay_revfinish_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1989,7 +2562,7 @@ class svn_ra_replay_revfinish_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1998,13 +2571,10 @@ class svn_ra_replay_revfinish_callback_t:
 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:
+class svn_ra_check_tunnel_func_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2023,23 +2593,57 @@ class svn_ra_check_tunnel_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2049,7 +2653,7 @@ class svn_ra_check_tunnel_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2058,13 +2662,10 @@ class svn_ra_check_tunnel_func_t:
 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:
+class svn_ra_close_tunnel_func_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2083,23 +2684,57 @@ class svn_ra_close_tunnel_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2109,7 +2744,7 @@ class svn_ra_close_tunnel_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2118,13 +2753,10 @@ class svn_ra_close_tunnel_func_t:
 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:
+class svn_ra_open_tunnel_func_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2143,23 +2775,57 @@ class svn_ra_open_tunnel_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2169,7 +2835,7 @@ class svn_ra_open_tunnel_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2178,13 +2844,10 @@ class svn_ra_open_tunnel_func_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:
+class svn_ra_init_func_t(object):
     """Proxy of C svn_ra_init_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_init_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_init_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2203,23 +2866,57 @@ class svn_ra_init_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2229,7 +2926,7 @@ class svn_ra_init_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
diff --git a/subversion/bindings/swig/python/repos.py b/subversion/bindings/swig/python/repos.py
index 787773e..b6bb44e 100644
--- a/subversion/bindings/swig/python/repos.py
+++ b/subversion/bindings/swig/python/repos.py
@@ -39,6 +39,11 @@ else:
 del _swig_python_version_info
 
 try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
@@ -54,7 +59,7 @@ def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
     if method:
         return method(self, value)
     if (not static):
-        self.__dict__[name] = value
+        object.__setattr__(self, name, value)
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
 
@@ -80,14 +85,26 @@ def _swig_repr(self):
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self, name, value):
+        if (name == "thisown"):
+            return self.this.own(value)
+        if hasattr(self, name) or (name == "this"):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
+
 def _copy_metadata_deep(value, old_value):
   """Copy all attributes of old_value into value, recursively traversing
   lists and dicts if needed."""
   if value is None or old_value is None or value is old_value: return
 
   if isinstance(value, dict):
-    for k, v in value.iteritems():
-      _copy_metadata_deep(v, old_value[k])
+    for k in value:
+      _copy_metadata_deep(value[k], old_value[k])
   elif isinstance(value, list):
     for v, old_v in zip(value, old_value):
       _copy_metadata_deep(v, old_v)
@@ -100,24 +117,44 @@ def _copy_metadata_deep(value, old_value):
 def _assert_valid_deep(value):
   """Assert value's validity, recursively traversing lists and dicts."""
   if isinstance(value, dict):
-    for v in value.itervalues():
-      _assert_valid_deep(v)
+    for k in value:
+      _assert_valid_deep(value[k])
   elif isinstance(value, list):
     for v in value:
       _assert_valid_deep(v)
-  else:
-    if hasattr(value, "assert_valid"):
-      value.assert_valid()
+# Ensure that the passed in value isn't a type, which could have an
+# assert_valid attribute, but it can not be called without an instance.
+  elif type(value) != type:
+    try:
+      fn = value.assert_valid
+    except AttributeError:
+      pass
+    else:
+      fn()
+
+
+
+  # SWIG classes generated with -modern do not define this variable
+try:
+  _newclass
+except NameError:
+  _newclass = 1
+else:
+  raise RuntimeError("Require -modern option, but _newclass is defined")
+
+_get_instance_attr = object.__getattribute__
+_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 
 import libsvn.core
 import libsvn.delta
 import libsvn.fs
 
-def svn_swig_py_make_parse_fns3(*args):
+def svn_swig_py_make_parse_fns3(*args) -> "svn_repos_parse_fns3_t const **, void **":
     """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():
+def svn_repos_version() -> "svn_version_t const *":
     """svn_repos_version() -> svn_version_t const *"""
     return _repos.svn_repos_version()
 svn_node_action_change = _repos.svn_node_action_change
@@ -160,39 +197,25 @@ svn_repos_notify_warning_invalid_fspath = _repos.svn_repos_notify_warning_invali
 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:
+class svn_repos_notify_t(object):
     """Proxy of C svn_repos_notify_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_notify_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_notify_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["action"] = _repos.svn_repos_notify_t_action_set
-    __swig_getmethods__["action"] = _repos.svn_repos_notify_t_action_get
-    __swig_setmethods__["revision"] = _repos.svn_repos_notify_t_revision_set
-    __swig_getmethods__["revision"] = _repos.svn_repos_notify_t_revision_get
-    __swig_setmethods__["warning_str"] = _repos.svn_repos_notify_t_warning_str_set
-    __swig_getmethods__["warning_str"] = _repos.svn_repos_notify_t_warning_str_get
-    __swig_setmethods__["warning"] = _repos.svn_repos_notify_t_warning_set
-    __swig_getmethods__["warning"] = _repos.svn_repos_notify_t_warning_get
-    __swig_setmethods__["shard"] = _repos.svn_repos_notify_t_shard_set
-    __swig_getmethods__["shard"] = _repos.svn_repos_notify_t_shard_get
-    __swig_setmethods__["new_revision"] = _repos.svn_repos_notify_t_new_revision_set
-    __swig_getmethods__["new_revision"] = _repos.svn_repos_notify_t_new_revision_get
-    __swig_setmethods__["old_revision"] = _repos.svn_repos_notify_t_old_revision_set
-    __swig_getmethods__["old_revision"] = _repos.svn_repos_notify_t_old_revision_get
-    __swig_setmethods__["node_action"] = _repos.svn_repos_notify_t_node_action_set
-    __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
+    action = _swig_property(_repos.svn_repos_notify_t_action_get, _repos.svn_repos_notify_t_action_set)
+    revision = _swig_property(_repos.svn_repos_notify_t_revision_get, _repos.svn_repos_notify_t_revision_set)
+    warning_str = _swig_property(_repos.svn_repos_notify_t_warning_str_get, _repos.svn_repos_notify_t_warning_str_set)
+    warning = _swig_property(_repos.svn_repos_notify_t_warning_get, _repos.svn_repos_notify_t_warning_set)
+    shard = _swig_property(_repos.svn_repos_notify_t_shard_get, _repos.svn_repos_notify_t_shard_set)
+    new_revision = _swig_property(_repos.svn_repos_notify_t_new_revision_get, _repos.svn_repos_notify_t_new_revision_set)
+    old_revision = _swig_property(_repos.svn_repos_notify_t_old_revision_get, _repos.svn_repos_notify_t_old_revision_set)
+    node_action = _swig_property(_repos.svn_repos_notify_t_node_action_get, _repos.svn_repos_notify_t_node_action_set)
+    path = _swig_property(_repos.svn_repos_notify_t_path_get, _repos.svn_repos_notify_t_path_set)
+    start_revision = _swig_property(_repos.svn_repos_notify_t_start_revision_get, _repos.svn_repos_notify_t_start_revision_set)
+    end_revision = _swig_property(_repos.svn_repos_notify_t_end_revision_get, _repos.svn_repos_notify_t_end_revision_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -207,23 +230,57 @@ class svn_repos_notify_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -233,333 +290,325 @@ class svn_repos_notify_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_repos_notify_t_swigregister = _repos.svn_repos_notify_t_swigregister
 svn_repos_notify_t_swigregister(svn_repos_notify_t)
 
 
-def svn_repos_notify_create(*args):
+def svn_repos_notify_create(*args) -> "svn_repos_notify_t *":
     """svn_repos_notify_create(svn_repos_notify_action_t action, apr_pool_t result_pool) -> svn_repos_notify_t"""
     return _repos.svn_repos_notify_create(*args)
 
-def svn_repos_find_root_path(*args):
+def svn_repos_find_root_path(*args) -> "char const *":
     """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):
+def svn_repos_open3(*args) -> "svn_repos_t **":
     """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):
+def svn_repos_open2(*args) -> "svn_repos_t **":
     """svn_repos_open2(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_open2(*args)
 
-def svn_repos_open(*args):
+def svn_repos_open(*args) -> "svn_repos_t **":
     """svn_repos_open(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_open(*args)
 
-def svn_repos_create(*args):
+def svn_repos_create(*args) -> "svn_repos_t **":
     """svn_repos_create(char const * path, char const * unused_1, char const * unused_2, apr_hash_t config, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_create(*args)
 
-def svn_repos_upgrade2(*args):
+def svn_repos_upgrade2(*args) -> "svn_error_t *":
     """svn_repos_upgrade2(char const * path, svn_boolean_t nonblocking, svn_repos_notify_func_t notify_func, void * notify_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_upgrade2(*args)
 
-def svn_repos_upgrade(*args):
+def svn_repos_upgrade(*args) -> "svn_error_t *":
     """svn_repos_upgrade(char const * path, svn_boolean_t nonblocking, svn_error_t *(*)(void *) start_callback, void * start_callback_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_upgrade(*args)
 
-def svn_repos_delete(*args):
+def svn_repos_delete(*args) -> "svn_error_t *":
     """svn_repos_delete(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_delete(*args)
 
-def svn_repos_has_capability(*args):
+def svn_repos_has_capability(*args) -> "svn_boolean_t *":
     """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):
+def svn_repos_capabilities(*args) -> "apr_hash_t **":
     """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(repos, capabilities):
+def svn_repos_remember_client_capabilities(repos: 'svn_repos_t *', capabilities: 'apr_array_header_t') -> "svn_error_t *":
     """svn_repos_remember_client_capabilities(svn_repos_t * repos, apr_array_header_t capabilities) -> svn_error_t"""
     return _repos.svn_repos_remember_client_capabilities(repos, capabilities)
 
-def svn_repos_fs(repos):
+def svn_repos_fs(repos: 'svn_repos_t *') -> "svn_fs_t *":
     """svn_repos_fs(svn_repos_t * repos) -> svn_fs_t *"""
     return _repos.svn_repos_fs(repos)
 
-def svn_repos_fs_type(*args):
+def svn_repos_fs_type(*args) -> "char const *":
     """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):
+def svn_repos_hotcopy3(*args) -> "svn_error_t *":
     """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):
+def svn_repos_hotcopy2(*args) -> "svn_error_t *":
     """svn_repos_hotcopy2(char const * src_path, char const * dst_path, svn_boolean_t clean_logs, svn_boolean_t incremental, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_hotcopy2(*args)
 
-def svn_repos_hotcopy(*args):
+def svn_repos_hotcopy(*args) -> "svn_error_t *":
     """svn_repos_hotcopy(char const * src_path, char const * dst_path, svn_boolean_t clean_logs, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_hotcopy(*args)
 
-def svn_repos_fs_pack2(*args):
+def svn_repos_fs_pack2(*args) -> "svn_error_t *":
     """svn_repos_fs_pack2(svn_repos_t * repos, 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_fs_pack2(*args)
 
-def svn_repos_fs_pack(*args):
+def svn_repos_fs_pack(*args) -> "svn_error_t *":
     """svn_repos_fs_pack(svn_repos_t * repos, svn_fs_pack_notify_t notify_func, void * notify_baton, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_pack(*args)
 
-def svn_repos_recover4(*args):
+def svn_repos_recover4(*args) -> "svn_error_t *":
     """svn_repos_recover4(char const * path, svn_boolean_t nonblocking, 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_recover4(*args)
 
-def svn_repos_recover3(*args):
+def svn_repos_recover3(*args) -> "svn_error_t *":
     """svn_repos_recover3(char const * path, svn_boolean_t nonblocking, svn_error_t *(*)(void *) start_callback, void * start_callback_baton, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_recover3(*args)
 
-def svn_repos_recover2(*args):
+def svn_repos_recover2(*args) -> "svn_error_t *":
     """svn_repos_recover2(char const * path, svn_boolean_t nonblocking, svn_error_t *(*)(void *) start_callback, void * start_callback_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_recover2(*args)
 
-def svn_repos_recover(*args):
+def svn_repos_recover(*args) -> "svn_error_t *":
     """svn_repos_recover(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_recover(*args)
 
-def svn_repos_freeze(*args):
+def svn_repos_freeze(*args) -> "svn_error_t *":
     """svn_repos_freeze(apr_array_header_t paths, svn_repos_freeze_func_t freeze_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_freeze(*args)
 
-def svn_repos_db_logfiles(*args):
+def svn_repos_db_logfiles(*args) -> "apr_array_header_t **":
     """svn_repos_db_logfiles(char const * path, svn_boolean_t only_unused, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_db_logfiles(*args)
 
-def svn_repos_path(*args):
+def svn_repos_path(*args) -> "char const *":
     """svn_repos_path(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_path(*args)
 
-def svn_repos_db_env(*args):
+def svn_repos_db_env(*args) -> "char const *":
     """svn_repos_db_env(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_db_env(*args)
 
-def svn_repos_conf_dir(*args):
+def svn_repos_conf_dir(*args) -> "char const *":
     """svn_repos_conf_dir(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_conf_dir(*args)
 
-def svn_repos_svnserve_conf(*args):
+def svn_repos_svnserve_conf(*args) -> "char const *":
     """svn_repos_svnserve_conf(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_svnserve_conf(*args)
 
-def svn_repos_lock_dir(*args):
+def svn_repos_lock_dir(*args) -> "char const *":
     """svn_repos_lock_dir(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_lock_dir(*args)
 
-def svn_repos_db_lockfile(*args):
+def svn_repos_db_lockfile(*args) -> "char const *":
     """svn_repos_db_lockfile(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_db_lockfile(*args)
 
-def svn_repos_db_logs_lockfile(*args):
+def svn_repos_db_logs_lockfile(*args) -> "char const *":
     """svn_repos_db_logs_lockfile(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_db_logs_lockfile(*args)
 
-def svn_repos_hook_dir(*args):
+def svn_repos_hook_dir(*args) -> "char const *":
     """svn_repos_hook_dir(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_hook_dir(*args)
 
-def svn_repos_start_commit_hook(*args):
+def svn_repos_start_commit_hook(*args) -> "char const *":
     """svn_repos_start_commit_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_start_commit_hook(*args)
 
-def svn_repos_pre_commit_hook(*args):
+def svn_repos_pre_commit_hook(*args) -> "char const *":
     """svn_repos_pre_commit_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_pre_commit_hook(*args)
 
-def svn_repos_post_commit_hook(*args):
+def svn_repos_post_commit_hook(*args) -> "char const *":
     """svn_repos_post_commit_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_post_commit_hook(*args)
 
-def svn_repos_pre_revprop_change_hook(*args):
+def svn_repos_pre_revprop_change_hook(*args) -> "char const *":
     """svn_repos_pre_revprop_change_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_pre_revprop_change_hook(*args)
 
-def svn_repos_post_revprop_change_hook(*args):
+def svn_repos_post_revprop_change_hook(*args) -> "char const *":
     """svn_repos_post_revprop_change_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_post_revprop_change_hook(*args)
 
-def svn_repos_pre_lock_hook(*args):
+def svn_repos_pre_lock_hook(*args) -> "char const *":
     """svn_repos_pre_lock_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_pre_lock_hook(*args)
 
-def svn_repos_post_lock_hook(*args):
+def svn_repos_post_lock_hook(*args) -> "char const *":
     """svn_repos_post_lock_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_post_lock_hook(*args)
 
-def svn_repos_pre_unlock_hook(*args):
+def svn_repos_pre_unlock_hook(*args) -> "char const *":
     """svn_repos_pre_unlock_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_pre_unlock_hook(*args)
 
-def svn_repos_post_unlock_hook(*args):
+def svn_repos_post_unlock_hook(*args) -> "char const *":
     """svn_repos_post_unlock_hook(svn_repos_t * repos, apr_pool_t pool) -> char const *"""
     return _repos.svn_repos_post_unlock_hook(*args)
 
-def svn_repos_hooks_setenv(*args):
+def svn_repos_hooks_setenv(*args) -> "svn_error_t *":
     """svn_repos_hooks_setenv(svn_repos_t * repos, char const * hooks_env_path, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_hooks_setenv(*args)
 
-def svn_repos_begin_report3(*args):
+def svn_repos_begin_report3(*args) -> "void **":
     """svn_repos_begin_report3(svn_revnum_t revnum, svn_repos_t * repos, char const * fs_base, char const * target, char const * tgt_path, svn_boolean_t text_deltas, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t send_copyfrom_args, svn_delta_editor_t editor, void * edit_baton, svn_repos_authz_func_t authz_read_func, apr_size_t zero_copy_limit, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_begin_report3(*args)
 
-def svn_repos_begin_report2(*args):
+def svn_repos_begin_report2(*args) -> "void **":
     """svn_repos_begin_report2(svn_revnum_t revnum, svn_repos_t * repos, char const * fs_base, char const * target, char const * tgt_path, svn_boolean_t text_deltas, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t send_copyfrom_args, svn_delta_editor_t editor, void * edit_baton, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_begin_report2(*args)
 
-def svn_repos_begin_report(*args):
+def svn_repos_begin_report(*args) -> "void **":
     """svn_repos_begin_report(svn_revnum_t revnum, char const * username, svn_repos_t * repos, char const * fs_base, char const * target, char const * tgt_path, svn_boolean_t text_deltas, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_delta_editor_t editor, void * edit_baton, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_begin_report(*args)
 
-def svn_repos_set_path3(*args):
+def svn_repos_set_path3(*args) -> "svn_error_t *":
     """svn_repos_set_path3(void * report_baton, char const * path, svn_revnum_t revision, svn_depth_t depth, svn_boolean_t start_empty, char const * lock_token, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_set_path3(*args)
 
-def svn_repos_set_path2(*args):
+def svn_repos_set_path2(*args) -> "svn_error_t *":
     """svn_repos_set_path2(void * report_baton, char const * path, svn_revnum_t revision, svn_boolean_t start_empty, char const * lock_token, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_set_path2(*args)
 
-def svn_repos_set_path(*args):
+def svn_repos_set_path(*args) -> "svn_error_t *":
     """svn_repos_set_path(void * report_baton, char const * path, svn_revnum_t revision, svn_boolean_t start_empty, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_set_path(*args)
 
-def svn_repos_link_path3(*args):
+def svn_repos_link_path3(*args) -> "svn_error_t *":
     """svn_repos_link_path3(void * report_baton, char const * path, char const * link_path, svn_revnum_t revision, svn_depth_t depth, svn_boolean_t start_empty, char const * lock_token, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_link_path3(*args)
 
-def svn_repos_link_path2(*args):
+def svn_repos_link_path2(*args) -> "svn_error_t *":
     """svn_repos_link_path2(void * report_baton, char const * path, char const * link_path, svn_revnum_t revision, svn_boolean_t start_empty, char const * lock_token, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_link_path2(*args)
 
-def svn_repos_link_path(*args):
+def svn_repos_link_path(*args) -> "svn_error_t *":
     """svn_repos_link_path(void * report_baton, char const * path, char const * link_path, svn_revnum_t revision, svn_boolean_t start_empty, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_link_path(*args)
 
-def svn_repos_delete_path(*args):
+def svn_repos_delete_path(*args) -> "svn_error_t *":
     """svn_repos_delete_path(void * report_baton, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_delete_path(*args)
 
-def svn_repos_finish_report(*args):
+def svn_repos_finish_report(*args) -> "svn_error_t *":
     """svn_repos_finish_report(void * report_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_finish_report(*args)
 
-def svn_repos_abort_report(*args):
+def svn_repos_abort_report(*args) -> "svn_error_t *":
     """svn_repos_abort_report(void * report_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_abort_report(*args)
 
-def svn_repos_dir_delta2(*args):
+def svn_repos_dir_delta2(*args) -> "svn_error_t *":
     """svn_repos_dir_delta2(svn_fs_root_t * src_root, char const * src_parent_dir, char const * src_entry, svn_fs_root_t * tgt_root, char const * tgt_path, svn_delta_editor_t editor, void * edit_baton, svn_repos_authz_func_t authz_read_func, svn_boolean_t text_deltas, svn_depth_t depth, svn_boolean_t entry_props, svn_boolean_t ignore_ancestry, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_dir_delta2(*args)
 
-def svn_repos_dir_delta(*args):
+def svn_repos_dir_delta(*args) -> "svn_error_t *":
     """svn_repos_dir_delta(svn_fs_root_t * src_root, char const * src_parent_dir, char const * src_entry, svn_fs_root_t * tgt_root, char const * tgt_path, svn_delta_editor_t editor, void * edit_baton, svn_repos_authz_func_t authz_read_func, svn_boolean_t text_deltas, svn_boolean_t recurse, svn_boolean_t entry_props, svn_boolean_t ignore_ancestry, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_dir_delta(*args)
 
-def svn_repos_replay2(*args):
+def svn_repos_replay2(*args) -> "svn_error_t *":
     """svn_repos_replay2(svn_fs_root_t * root, char const * base_dir, svn_revnum_t low_water_mark, svn_boolean_t send_deltas, svn_delta_editor_t editor, void * edit_baton, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_replay2(*args)
 
-def svn_repos_replay(*args):
+def svn_repos_replay(*args) -> "svn_error_t *":
     """svn_repos_replay(svn_fs_root_t * root, svn_delta_editor_t editor, void * edit_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_replay(*args)
 
-def svn_repos_get_commit_editor5(*args):
+def svn_repos_get_commit_editor5(*args) -> "svn_delta_editor_t const **, void **":
     """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)
 
-def svn_repos_get_commit_editor4(*args):
+def svn_repos_get_commit_editor4(*args) -> "svn_delta_editor_t const **, void **":
     """svn_repos_get_commit_editor4(svn_repos_t * repos, svn_fs_txn_t * txn, char const * repos_url, char const * base_path, char const * user, char const * log_msg, 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_editor4(*args)
 
-def svn_repos_get_commit_editor3(*args):
+def svn_repos_get_commit_editor3(*args) -> "svn_delta_editor_t const **, void **":
     """svn_repos_get_commit_editor3(svn_repos_t * repos, svn_fs_txn_t * txn, char const * repos_url, char const * base_path, char const * user, char const * log_msg, svn_commit_callback_t callback, svn_repos_authz_callback_t authz_callback, void * authz_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_commit_editor3(*args)
 
-def svn_repos_get_commit_editor2(*args):
+def svn_repos_get_commit_editor2(*args) -> "svn_delta_editor_t const **, void **":
     """svn_repos_get_commit_editor2(svn_repos_t * repos, svn_fs_txn_t * txn, char const * repos_url, char const * base_path, char const * user, char const * log_msg, svn_commit_callback_t callback, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_commit_editor2(*args)
 
-def svn_repos_get_commit_editor(*args):
+def svn_repos_get_commit_editor(*args) -> "svn_delta_editor_t const **, void **":
     """svn_repos_get_commit_editor(svn_repos_t * repos, char const * repos_url, char const * base_path, char const * user, char const * log_msg, svn_commit_callback_t callback, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_commit_editor(*args)
 
-def svn_repos_dated_revision(*args):
+def svn_repos_dated_revision(*args) -> "svn_revnum_t *":
     """svn_repos_dated_revision(svn_repos_t * repos, apr_time_t tm, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_dated_revision(*args)
 
-def svn_repos_get_committed_info(*args):
+def svn_repos_get_committed_info(*args) -> "svn_revnum_t *, char const **, char const **":
     """svn_repos_get_committed_info(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_committed_info(*args)
 
-def svn_repos_stat(*args):
+def svn_repos_stat(*args) -> "svn_dirent_t **":
     """svn_repos_stat(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_stat(*args)
 
-def svn_repos_list(*args):
+def svn_repos_list(*args) -> "svn_error_t *":
     """svn_repos_list(svn_fs_root_t * root, char const * path, apr_array_header_t patterns, svn_depth_t depth, svn_boolean_t path_info_only, svn_repos_authz_func_t authz_read_func, svn_repos_dirent_receiver_t receiver, void * receiver_baton, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_list(*args)
 
-def svn_repos_deleted_rev(*args):
+def svn_repos_deleted_rev(*args) -> "svn_revnum_t *":
     """svn_repos_deleted_rev(svn_fs_t * fs, char const * path, svn_revnum_t start, svn_revnum_t end, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_deleted_rev(*args)
 
-def svn_repos_history2(*args):
+def svn_repos_history2(*args) -> "svn_error_t *":
     """svn_repos_history2(svn_fs_t * fs, char const * path, svn_repos_history_func_t history_func, svn_repos_authz_func_t authz_read_func, svn_revnum_t start, svn_revnum_t end, svn_boolean_t cross_copies, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_history2(*args)
 
-def svn_repos_history(*args):
+def svn_repos_history(*args) -> "svn_error_t *":
     """svn_repos_history(svn_fs_t * fs, char const * path, svn_repos_history_func_t history_func, svn_revnum_t start, svn_revnum_t end, svn_boolean_t cross_copies, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_history(*args)
 
-def svn_repos_trace_node_locations(*args):
+def svn_repos_trace_node_locations(*args) -> "apr_hash_t **":
     """svn_repos_trace_node_locations(svn_fs_t * fs, char const * fs_path, svn_revnum_t peg_revision, apr_array_header_t location_revisions, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_trace_node_locations(*args)
 
-def svn_repos_node_location_segments(*args):
+def svn_repos_node_location_segments(*args) -> "svn_error_t *":
     """svn_repos_node_location_segments(svn_repos_t * repos, char const * path, svn_revnum_t peg_revision, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_location_segment_receiver_t receiver, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_node_location_segments(*args)
 
-def svn_repos_path_change_create(*args):
+def svn_repos_path_change_create(*args) -> "svn_repos_path_change_t *":
     """svn_repos_path_change_create(apr_pool_t result_pool) -> svn_fs_path_change3_t"""
     return _repos.svn_repos_path_change_create(*args)
 
-def svn_repos_path_change_dup(*args):
+def svn_repos_path_change_dup(*args) -> "svn_repos_path_change_t *":
     """svn_repos_path_change_dup(svn_fs_path_change3_t change, apr_pool_t result_pool) -> svn_fs_path_change3_t"""
     return _repos.svn_repos_path_change_dup(*args)
-class svn_repos_log_entry_t:
+class svn_repos_log_entry_t(object):
     """Proxy of C svn_repos_log_entry_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_log_entry_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_log_entry_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["revision"] = _repos.svn_repos_log_entry_t_revision_set
-    __swig_getmethods__["revision"] = _repos.svn_repos_log_entry_t_revision_get
-    __swig_setmethods__["revprops"] = _repos.svn_repos_log_entry_t_revprops_set
-    __swig_getmethods__["revprops"] = _repos.svn_repos_log_entry_t_revprops_get
-    __swig_setmethods__["has_children"] = _repos.svn_repos_log_entry_t_has_children_set
-    __swig_getmethods__["has_children"] = _repos.svn_repos_log_entry_t_has_children_get
-    __swig_setmethods__["non_inheritable"] = _repos.svn_repos_log_entry_t_non_inheritable_set
-    __swig_getmethods__["non_inheritable"] = _repos.svn_repos_log_entry_t_non_inheritable_get
-    __swig_setmethods__["subtractive_merge"] = _repos.svn_repos_log_entry_t_subtractive_merge_set
-    __swig_getmethods__["subtractive_merge"] = _repos.svn_repos_log_entry_t_subtractive_merge_get
+    revision = _swig_property(_repos.svn_repos_log_entry_t_revision_get, _repos.svn_repos_log_entry_t_revision_set)
+    revprops = _swig_property(_repos.svn_repos_log_entry_t_revprops_get, _repos.svn_repos_log_entry_t_revprops_set)
+    has_children = _swig_property(_repos.svn_repos_log_entry_t_has_children_get, _repos.svn_repos_log_entry_t_has_children_set)
+    non_inheritable = _swig_property(_repos.svn_repos_log_entry_t_non_inheritable_get, _repos.svn_repos_log_entry_t_non_inheritable_set)
+    subtractive_merge = _swig_property(_repos.svn_repos_log_entry_t_subtractive_merge_get, _repos.svn_repos_log_entry_t_subtractive_merge_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -574,23 +623,57 @@ class svn_repos_log_entry_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -600,166 +683,153 @@ class svn_repos_log_entry_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_repos_log_entry_t_swigregister = _repos.svn_repos_log_entry_t_swigregister
 svn_repos_log_entry_t_swigregister(svn_repos_log_entry_t)
 
 
-def svn_repos_log_entry_create(*args):
+def svn_repos_log_entry_create(*args) -> "svn_repos_log_entry_t *":
     """svn_repos_log_entry_create(apr_pool_t result_pool) -> svn_repos_log_entry_t"""
     return _repos.svn_repos_log_entry_create(*args)
 
-def svn_repos_log_entry_dup(*args):
+def svn_repos_log_entry_dup(*args) -> "svn_repos_log_entry_t *":
     """svn_repos_log_entry_dup(svn_repos_log_entry_t log_entry, apr_pool_t result_pool) -> svn_repos_log_entry_t"""
     return _repos.svn_repos_log_entry_dup(*args)
 
-def svn_repos_get_logs5(*args):
+def svn_repos_get_logs5(*args) -> "svn_error_t *":
     """svn_repos_get_logs5(svn_repos_t * repos, apr_array_header_t paths, svn_revnum_t start, svn_revnum_t end, int limit, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_repos_authz_func_t authz_read_func, svn_repos_path_change_receiver_t path_change_receiver, void * path_change_receiver_baton, svn_repos_log_entry_receiver_t revision_receiver, void * revision_receiver_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_get_logs5(*args)
 
-def svn_repos_get_logs4(*args):
+def svn_repos_get_logs4(*args) -> "svn_error_t *":
     """svn_repos_get_logs4(svn_repos_t * repos, apr_array_header_t paths, svn_revnum_t start, svn_revnum_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_repos_authz_func_t authz_read_func, svn_log_entry_receiver_t receiver, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_logs4(*args)
 
-def svn_repos_get_logs3(*args):
+def svn_repos_get_logs3(*args) -> "svn_error_t *":
     """svn_repos_get_logs3(svn_repos_t * repos, apr_array_header_t paths, svn_revnum_t start, svn_revnum_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_repos_authz_func_t authz_read_func, svn_log_message_receiver_t receiver, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_logs3(*args)
 
-def svn_repos_get_logs2(*args):
+def svn_repos_get_logs2(*args) -> "svn_error_t *":
     """svn_repos_get_logs2(svn_repos_t * repos, apr_array_header_t paths, svn_revnum_t start, svn_revnum_t end, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_repos_authz_func_t authz_read_func, svn_log_message_receiver_t receiver, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_logs2(*args)
 
-def svn_repos_get_logs(*args):
+def svn_repos_get_logs(*args) -> "svn_error_t *":
     """svn_repos_get_logs(svn_repos_t * repos, apr_array_header_t paths, svn_revnum_t start, svn_revnum_t end, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_logs(*args)
 
-def svn_repos_fs_get_mergeinfo2(*args):
+def svn_repos_fs_get_mergeinfo2(*args) -> "svn_error_t *":
     """svn_repos_fs_get_mergeinfo2(svn_repos_t * repos, apr_array_header_t paths, svn_revnum_t revision, svn_mergeinfo_inheritance_t inherit, svn_boolean_t include_descendants, svn_repos_authz_func_t authz_read_func, svn_repos_mergeinfo_receiver_t receiver, void * receiver_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_fs_get_mergeinfo2(*args)
 
-def svn_repos_fs_get_mergeinfo(*args):
+def svn_repos_fs_get_mergeinfo(*args) -> "apr_hash_t **":
     """svn_repos_fs_get_mergeinfo(svn_repos_t * repos, apr_array_header_t paths, svn_revnum_t revision, svn_mergeinfo_inheritance_t inherit, svn_boolean_t include_descendants, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_get_mergeinfo(*args)
 
-def svn_repos_get_file_revs2(*args):
+def svn_repos_get_file_revs2(*args) -> "svn_error_t *":
     """svn_repos_get_file_revs2(svn_repos_t * repos, char const * path, svn_revnum_t start, svn_revnum_t end, svn_boolean_t include_merged_revisions, svn_repos_authz_func_t authz_read_func, svn_file_rev_handler_t handler, void * handler_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_file_revs2(*args)
 
-def svn_repos_get_file_revs(*args):
+def svn_repos_get_file_revs(*args) -> "svn_error_t *":
     """svn_repos_get_file_revs(svn_repos_t * repos, char const * path, svn_revnum_t start, svn_revnum_t end, svn_repos_authz_func_t authz_read_func, svn_repos_file_rev_handler_t handler, void * handler_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_file_revs(*args)
 
-def svn_repos_fs_commit_txn(*args):
+def svn_repos_fs_commit_txn(*args) -> "char const **, svn_revnum_t *":
     """svn_repos_fs_commit_txn(svn_repos_t * repos, svn_fs_txn_t * txn, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_commit_txn(*args)
 
-def svn_repos_fs_begin_txn_for_commit2(*args):
+def svn_repos_fs_begin_txn_for_commit2(*args) -> "svn_fs_txn_t **":
     """svn_repos_fs_begin_txn_for_commit2(svn_repos_t * repos, svn_revnum_t rev, apr_hash_t revprop_table, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_begin_txn_for_commit2(*args)
 
-def svn_repos_fs_begin_txn_for_commit(*args):
+def svn_repos_fs_begin_txn_for_commit(*args) -> "svn_fs_txn_t **":
     """svn_repos_fs_begin_txn_for_commit(svn_repos_t * repos, svn_revnum_t rev, char const * author, char const * log_msg, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_begin_txn_for_commit(*args)
 
-def svn_repos_fs_begin_txn_for_update(*args):
+def svn_repos_fs_begin_txn_for_update(*args) -> "svn_fs_txn_t **":
     """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):
+def svn_repos_fs_lock_many(*args) -> "svn_error_t *":
     """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):
+def svn_repos_fs_lock(*args) -> "svn_lock_t **":
     """svn_repos_fs_lock(svn_repos_t * repos, char const * path, char const * token, char const * comment, svn_boolean_t is_dav_comment, apr_time_t expiration_date, svn_revnum_t current_rev, svn_boolean_t steal_lock, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_lock(*args)
 
-def svn_repos_fs_unlock_many(*args):
+def svn_repos_fs_unlock_many(*args) -> "svn_error_t *":
     """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):
+def svn_repos_fs_unlock(*args) -> "svn_error_t *":
     """svn_repos_fs_unlock(svn_repos_t * repos, char const * path, char const * token, svn_boolean_t break_lock, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_unlock(*args)
 
-def svn_repos_fs_get_locks2(*args):
+def svn_repos_fs_get_locks2(*args) -> "apr_hash_t **":
     """svn_repos_fs_get_locks2(svn_repos_t * repos, char const * path, svn_depth_t depth, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_get_locks2(*args)
 
-def svn_repos_fs_get_locks(*args):
+def svn_repos_fs_get_locks(*args) -> "apr_hash_t **":
     """svn_repos_fs_get_locks(svn_repos_t * repos, char const * path, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_get_locks(*args)
 
-def svn_repos_fs_change_rev_prop4(*args):
+def svn_repos_fs_change_rev_prop4(*args) -> "svn_string_t **":
     """svn_repos_fs_change_rev_prop4(svn_repos_t * repos, svn_revnum_t rev, char const * author, char const * name, svn_string_t const *const * old_value_p, svn_string_t const * new_value, svn_boolean_t use_pre_revprop_change_hook, svn_boolean_t use_post_revprop_change_hook, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_change_rev_prop4(*args)
 
-def svn_repos_fs_change_rev_prop3(*args):
+def svn_repos_fs_change_rev_prop3(*args) -> "svn_error_t *":
     """svn_repos_fs_change_rev_prop3(svn_repos_t * repos, svn_revnum_t rev, char const * author, char const * name, svn_string_t const * new_value, svn_boolean_t use_pre_revprop_change_hook, svn_boolean_t use_post_revprop_change_hook, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_change_rev_prop3(*args)
 
-def svn_repos_fs_change_rev_prop2(*args):
+def svn_repos_fs_change_rev_prop2(*args) -> "svn_error_t *":
     """svn_repos_fs_change_rev_prop2(svn_repos_t * repos, svn_revnum_t rev, char const * author, char const * name, svn_string_t const * new_value, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_change_rev_prop2(*args)
 
-def svn_repos_fs_change_rev_prop(*args):
+def svn_repos_fs_change_rev_prop(*args) -> "svn_error_t *":
     """svn_repos_fs_change_rev_prop(svn_repos_t * repos, svn_revnum_t rev, char const * author, char const * name, svn_string_t const * new_value, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_change_rev_prop(*args)
 
-def svn_repos_fs_revision_prop(*args):
+def svn_repos_fs_revision_prop(*args) -> "svn_string_t **":
     """svn_repos_fs_revision_prop(svn_repos_t * repos, svn_revnum_t rev, char const * propname, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_revision_prop(*args)
 
-def svn_repos_fs_revision_proplist(*args):
+def svn_repos_fs_revision_proplist(*args) -> "apr_hash_t **":
     """svn_repos_fs_revision_proplist(svn_repos_t * repos, svn_revnum_t rev, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_revision_proplist(*args)
 
-def svn_repos_fs_change_node_prop(*args):
+def svn_repos_fs_change_node_prop(*args) -> "svn_error_t *":
     """svn_repos_fs_change_node_prop(svn_fs_root_t * root, char const * path, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_change_node_prop(*args)
 
-def svn_repos_fs_get_inherited_props(*args):
+def svn_repos_fs_get_inherited_props(*args) -> "apr_array_header_t **":
     """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):
+def svn_repos_fs_change_txn_prop(*args) -> "svn_error_t *":
     """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)
 
-def svn_repos_fs_change_txn_props(*args):
+def svn_repos_fs_change_txn_props(*args) -> "svn_error_t *":
     """svn_repos_fs_change_txn_props(svn_fs_txn_t * txn, apr_array_header_t props, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_fs_change_txn_props(*args)
-class svn_repos_node_t:
+class svn_repos_node_t(object):
     """Proxy of C svn_repos_node_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_node_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_node_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["kind"] = _repos.svn_repos_node_t_kind_set
-    __swig_getmethods__["kind"] = _repos.svn_repos_node_t_kind_get
-    __swig_setmethods__["action"] = _repos.svn_repos_node_t_action_set
-    __swig_getmethods__["action"] = _repos.svn_repos_node_t_action_get
-    __swig_setmethods__["text_mod"] = _repos.svn_repos_node_t_text_mod_set
-    __swig_getmethods__["text_mod"] = _repos.svn_repos_node_t_text_mod_get
-    __swig_setmethods__["prop_mod"] = _repos.svn_repos_node_t_prop_mod_set
-    __swig_getmethods__["prop_mod"] = _repos.svn_repos_node_t_prop_mod_get
-    __swig_setmethods__["name"] = _repos.svn_repos_node_t_name_set
-    __swig_getmethods__["name"] = _repos.svn_repos_node_t_name_get
-    __swig_setmethods__["copyfrom_rev"] = _repos.svn_repos_node_t_copyfrom_rev_set
-    __swig_getmethods__["copyfrom_rev"] = _repos.svn_repos_node_t_copyfrom_rev_get
-    __swig_setmethods__["copyfrom_path"] = _repos.svn_repos_node_t_copyfrom_path_set
-    __swig_getmethods__["copyfrom_path"] = _repos.svn_repos_node_t_copyfrom_path_get
-    __swig_setmethods__["sibling"] = _repos.svn_repos_node_t_sibling_set
-    __swig_getmethods__["sibling"] = _repos.svn_repos_node_t_sibling_get
-    __swig_setmethods__["child"] = _repos.svn_repos_node_t_child_set
-    __swig_getmethods__["child"] = _repos.svn_repos_node_t_child_get
-    __swig_setmethods__["parent"] = _repos.svn_repos_node_t_parent_set
-    __swig_getmethods__["parent"] = _repos.svn_repos_node_t_parent_get
+    kind = _swig_property(_repos.svn_repos_node_t_kind_get, _repos.svn_repos_node_t_kind_set)
+    action = _swig_property(_repos.svn_repos_node_t_action_get, _repos.svn_repos_node_t_action_set)
+    text_mod = _swig_property(_repos.svn_repos_node_t_text_mod_get, _repos.svn_repos_node_t_text_mod_set)
+    prop_mod = _swig_property(_repos.svn_repos_node_t_prop_mod_get, _repos.svn_repos_node_t_prop_mod_set)
+    name = _swig_property(_repos.svn_repos_node_t_name_get, _repos.svn_repos_node_t_name_set)
+    copyfrom_rev = _swig_property(_repos.svn_repos_node_t_copyfrom_rev_get, _repos.svn_repos_node_t_copyfrom_rev_set)
+    copyfrom_path = _swig_property(_repos.svn_repos_node_t_copyfrom_path_get, _repos.svn_repos_node_t_copyfrom_path_set)
+    sibling = _swig_property(_repos.svn_repos_node_t_sibling_get, _repos.svn_repos_node_t_sibling_set)
+    child = _swig_property(_repos.svn_repos_node_t_child_get, _repos.svn_repos_node_t_child_set)
+    parent = _swig_property(_repos.svn_repos_node_t_parent_get, _repos.svn_repos_node_t_parent_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -774,23 +844,57 @@ class svn_repos_node_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -800,21 +904,21 @@ class svn_repos_node_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_repos_node_t_swigregister = _repos.svn_repos_node_t_swigregister
 svn_repos_node_t_swigregister(svn_repos_node_t)
 
 
-def svn_repos_node_editor(*args):
+def svn_repos_node_editor(*args) -> "svn_delta_editor_t const **, void **":
     """svn_repos_node_editor(svn_repos_t * repos, svn_fs_root_t * base_root, svn_fs_root_t * root, apr_pool_t node_pool, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_node_editor(*args)
 
-def svn_repos_node_from_baton(edit_baton):
+def svn_repos_node_from_baton(edit_baton: 'void *') -> "svn_repos_node_t *":
     """svn_repos_node_from_baton(void * edit_baton) -> svn_repos_node_t"""
     return _repos.svn_repos_node_from_baton(edit_baton)
 
-def svn_repos_info_format(*args):
+def svn_repos_info_format(*args) -> "int *, SWIGTYPE **":
     """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
@@ -845,96 +949,81 @@ 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):
+def svn_repos_verify_fs3(*args) -> "svn_error_t *":
     """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):
+def svn_repos_verify_fs2(*args) -> "svn_error_t *":
     """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, void * notify_baton, svn_cancel_func_t cancel, void * cancel_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_verify_fs2(*args)
 
-def svn_repos_verify_fs(*args):
+def svn_repos_verify_fs(*args) -> "svn_error_t *":
     """svn_repos_verify_fs(svn_repos_t * repos, svn_stream_t * feedback_stream, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_verify_fs(*args)
 
-def svn_repos_dump_fs4(*args):
+def svn_repos_dump_fs4(*args) -> "svn_error_t *":
     """svn_repos_dump_fs4(svn_repos_t * repos, svn_stream_t * stream, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t incremental, svn_boolean_t use_deltas, svn_boolean_t include_revprops, svn_boolean_t include_changes, svn_repos_notify_func_t notify_func, void * notify_baton, svn_repos_dump_filter_func_t filter_func, void * filter_baton, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_dump_fs4(*args)
 
-def svn_repos_dump_fs3(*args):
+def svn_repos_dump_fs3(*args) -> "svn_error_t *":
     """svn_repos_dump_fs3(svn_repos_t * repos, svn_stream_t * dumpstream, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t incremental, svn_boolean_t use_deltas, 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_dump_fs3(*args)
 
-def svn_repos_dump_fs2(*args):
+def svn_repos_dump_fs2(*args) -> "svn_error_t *":
     """svn_repos_dump_fs2(svn_repos_t * repos, svn_stream_t * dumpstream, svn_stream_t * feedback_stream, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t incremental, svn_boolean_t use_deltas, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_dump_fs2(*args)
 
-def svn_repos_dump_fs(*args):
+def svn_repos_dump_fs(*args) -> "svn_error_t *":
     """svn_repos_dump_fs(svn_repos_t * repos, svn_stream_t * dumpstream, svn_stream_t * feedback_stream, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t incremental, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_dump_fs(*args)
 
-def svn_repos_load_fs6(*args):
+def svn_repos_load_fs6(*args) -> "svn_error_t *":
     """svn_repos_load_fs6(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_boolean_t normalize_props, 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_fs6(*args)
 
-def svn_repos_load_fs5(*args):
+def svn_repos_load_fs5(*args) -> "svn_error_t *":
     """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):
+def svn_repos_load_fs4(*args) -> "svn_error_t *":
     """svn_repos_load_fs4(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_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_fs4(*args)
 
-def svn_repos_load_fs3(*args):
+def svn_repos_load_fs3(*args) -> "svn_error_t *":
     """svn_repos_load_fs3(svn_repos_t * repos, svn_stream_t * dumpstream, 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_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_fs3(*args)
 
-def svn_repos_load_fs2(*args):
+def svn_repos_load_fs2(*args) -> "svn_error_t *":
     """svn_repos_load_fs2(svn_repos_t * repos, svn_stream_t * dumpstream, svn_stream_t * feedback_stream, 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_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_load_fs2(*args)
 
-def svn_repos_load_fs(*args):
+def svn_repos_load_fs(*args) -> "svn_error_t *":
     """svn_repos_load_fs(svn_repos_t * repos, svn_stream_t * dumpstream, svn_stream_t * feedback_stream, enum svn_repos_load_uuid uuid_action, char const * parent_dir, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_load_fs(*args)
 
-def svn_repos_load_fs_revprops(*args):
+def svn_repos_load_fs_revprops(*args) -> "svn_error_t *":
     """svn_repos_load_fs_revprops(svn_repos_t * repos, svn_stream_t * dumpstream, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t validate_props, svn_boolean_t ignore_dates, svn_boolean_t normalize_props, 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_load_fs_revprops(*args)
-class svn_repos_parse_fns3_t:
+class svn_repos_parse_fns3_t(object):
     """Proxy of C svn_repos_parse_fns3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_parse_fns3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_parse_fns3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["magic_header_record"] = _repos.svn_repos_parse_fns3_t_magic_header_record_set
-    __swig_getmethods__["magic_header_record"] = _repos.svn_repos_parse_fns3_t_magic_header_record_get
-    __swig_setmethods__["uuid_record"] = _repos.svn_repos_parse_fns3_t_uuid_record_set
-    __swig_getmethods__["uuid_record"] = _repos.svn_repos_parse_fns3_t_uuid_record_get
-    __swig_setmethods__["new_revision_record"] = _repos.svn_repos_parse_fns3_t_new_revision_record_set
-    __swig_getmethods__["new_revision_record"] = _repos.svn_repos_parse_fns3_t_new_revision_record_get
-    __swig_setmethods__["new_node_record"] = _repos.svn_repos_parse_fns3_t_new_node_record_set
-    __swig_getmethods__["new_node_record"] = _repos.svn_repos_parse_fns3_t_new_node_record_get
-    __swig_setmethods__["set_revision_property"] = _repos.svn_repos_parse_fns3_t_set_revision_property_set
-    __swig_getmethods__["set_revision_property"] = _repos.svn_repos_parse_fns3_t_set_revision_property_get
-    __swig_setmethods__["set_node_property"] = _repos.svn_repos_parse_fns3_t_set_node_property_set
-    __swig_getmethods__["set_node_property"] = _repos.svn_repos_parse_fns3_t_set_node_property_get
-    __swig_setmethods__["delete_node_property"] = _repos.svn_repos_parse_fns3_t_delete_node_property_set
-    __swig_getmethods__["delete_node_property"] = _repos.svn_repos_parse_fns3_t_delete_node_property_get
-    __swig_setmethods__["remove_node_props"] = _repos.svn_repos_parse_fns3_t_remove_node_props_set
-    __swig_getmethods__["remove_node_props"] = _repos.svn_repos_parse_fns3_t_remove_node_props_get
-    __swig_setmethods__["set_fulltext"] = _repos.svn_repos_parse_fns3_t_set_fulltext_set
-    __swig_getmethods__["set_fulltext"] = _repos.svn_repos_parse_fns3_t_set_fulltext_get
-    __swig_setmethods__["apply_textdelta"] = _repos.svn_repos_parse_fns3_t_apply_textdelta_set
-    __swig_getmethods__["apply_textdelta"] = _repos.svn_repos_parse_fns3_t_apply_textdelta_get
-    __swig_setmethods__["close_node"] = _repos.svn_repos_parse_fns3_t_close_node_set
-    __swig_getmethods__["close_node"] = _repos.svn_repos_parse_fns3_t_close_node_get
-    __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
+    magic_header_record = _swig_property(_repos.svn_repos_parse_fns3_t_magic_header_record_get, _repos.svn_repos_parse_fns3_t_magic_header_record_set)
+    uuid_record = _swig_property(_repos.svn_repos_parse_fns3_t_uuid_record_get, _repos.svn_repos_parse_fns3_t_uuid_record_set)
+    new_revision_record = _swig_property(_repos.svn_repos_parse_fns3_t_new_revision_record_get, _repos.svn_repos_parse_fns3_t_new_revision_record_set)
+    new_node_record = _swig_property(_repos.svn_repos_parse_fns3_t_new_node_record_get, _repos.svn_repos_parse_fns3_t_new_node_record_set)
+    set_revision_property = _swig_property(_repos.svn_repos_parse_fns3_t_set_revision_property_get, _repos.svn_repos_parse_fns3_t_set_revision_property_set)
+    set_node_property = _swig_property(_repos.svn_repos_parse_fns3_t_set_node_property_get, _repos.svn_repos_parse_fns3_t_set_node_property_set)
+    delete_node_property = _swig_property(_repos.svn_repos_parse_fns3_t_delete_node_property_get, _repos.svn_repos_parse_fns3_t_delete_node_property_set)
+    remove_node_props = _swig_property(_repos.svn_repos_parse_fns3_t_remove_node_props_get, _repos.svn_repos_parse_fns3_t_remove_node_props_set)
+    set_fulltext = _swig_property(_repos.svn_repos_parse_fns3_t_set_fulltext_get, _repos.svn_repos_parse_fns3_t_set_fulltext_set)
+    apply_textdelta = _swig_property(_repos.svn_repos_parse_fns3_t_apply_textdelta_get, _repos.svn_repos_parse_fns3_t_apply_textdelta_set)
+    close_node = _swig_property(_repos.svn_repos_parse_fns3_t_close_node_get, _repos.svn_repos_parse_fns3_t_close_node_set)
+    close_revision = _swig_property(_repos.svn_repos_parse_fns3_t_close_revision_get, _repos.svn_repos_parse_fns3_t_close_revision_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -949,23 +1038,57 @@ class svn_repos_parse_fns3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -975,7 +1098,7 @@ class svn_repos_parse_fns3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def magic_header_record(self, *args):
@@ -1029,54 +1152,40 @@ svn_repos_parse_fns3_t_swigregister = _repos.svn_repos_parse_fns3_t_swigregister
 svn_repos_parse_fns3_t_swigregister(svn_repos_parse_fns3_t)
 
 
-def svn_repos_parse_dumpstream3(*args):
+def svn_repos_parse_dumpstream3(*args) -> "svn_error_t *":
     """svn_repos_parse_dumpstream3(svn_stream_t * stream, svn_repos_parse_fns3_t parse_fns, void * parse_baton, svn_boolean_t deltas_are_text, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_dumpstream3(*args)
 
-def svn_repos_get_fs_build_parser6(*args):
+def svn_repos_get_fs_build_parser6(*args) -> "svn_repos_parse_fns3_t const **, void **":
     """svn_repos_get_fs_build_parser6(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_boolean_t normalize_props, svn_repos_notify_func_t notify_func, void * notify_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_fs_build_parser6(*args)
 
-def svn_repos_get_fs_build_parser5(*args):
+def svn_repos_get_fs_build_parser5(*args) -> "svn_repos_parse_fns3_t const **, void **":
     """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):
+def svn_repos_get_fs_build_parser4(*args) -> "svn_repos_parse_fns3_t const **, void **":
     """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, svn_boolean_t validate_props, enum svn_repos_load_uuid uuid_action, char const * parent_dir, svn_repos_notify_func_t notify_func, void * notify_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_fs_build_parser4(*args)
-class svn_repos_parse_fns2_t:
+class svn_repos_parse_fns2_t(object):
     """Proxy of C svn_repos_parse_fns2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_parse_fns2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_parse_fns2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["new_revision_record"] = _repos.svn_repos_parse_fns2_t_new_revision_record_set
-    __swig_getmethods__["new_revision_record"] = _repos.svn_repos_parse_fns2_t_new_revision_record_get
-    __swig_setmethods__["uuid_record"] = _repos.svn_repos_parse_fns2_t_uuid_record_set
-    __swig_getmethods__["uuid_record"] = _repos.svn_repos_parse_fns2_t_uuid_record_get
-    __swig_setmethods__["new_node_record"] = _repos.svn_repos_parse_fns2_t_new_node_record_set
-    __swig_getmethods__["new_node_record"] = _repos.svn_repos_parse_fns2_t_new_node_record_get
-    __swig_setmethods__["set_revision_property"] = _repos.svn_repos_parse_fns2_t_set_revision_property_set
-    __swig_getmethods__["set_revision_property"] = _repos.svn_repos_parse_fns2_t_set_revision_property_get
-    __swig_setmethods__["set_node_property"] = _repos.svn_repos_parse_fns2_t_set_node_property_set
-    __swig_getmethods__["set_node_property"] = _repos.svn_repos_parse_fns2_t_set_node_property_get
-    __swig_setmethods__["delete_node_property"] = _repos.svn_repos_parse_fns2_t_delete_node_property_set
-    __swig_getmethods__["delete_node_property"] = _repos.svn_repos_parse_fns2_t_delete_node_property_get
-    __swig_setmethods__["remove_node_props"] = _repos.svn_repos_parse_fns2_t_remove_node_props_set
-    __swig_getmethods__["remove_node_props"] = _repos.svn_repos_parse_fns2_t_remove_node_props_get
-    __swig_setmethods__["set_fulltext"] = _repos.svn_repos_parse_fns2_t_set_fulltext_set
-    __swig_getmethods__["set_fulltext"] = _repos.svn_repos_parse_fns2_t_set_fulltext_get
-    __swig_setmethods__["apply_textdelta"] = _repos.svn_repos_parse_fns2_t_apply_textdelta_set
-    __swig_getmethods__["apply_textdelta"] = _repos.svn_repos_parse_fns2_t_apply_textdelta_get
-    __swig_setmethods__["close_node"] = _repos.svn_repos_parse_fns2_t_close_node_set
-    __swig_getmethods__["close_node"] = _repos.svn_repos_parse_fns2_t_close_node_get
-    __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
+    new_revision_record = _swig_property(_repos.svn_repos_parse_fns2_t_new_revision_record_get, _repos.svn_repos_parse_fns2_t_new_revision_record_set)
+    uuid_record = _swig_property(_repos.svn_repos_parse_fns2_t_uuid_record_get, _repos.svn_repos_parse_fns2_t_uuid_record_set)
+    new_node_record = _swig_property(_repos.svn_repos_parse_fns2_t_new_node_record_get, _repos.svn_repos_parse_fns2_t_new_node_record_set)
+    set_revision_property = _swig_property(_repos.svn_repos_parse_fns2_t_set_revision_property_get, _repos.svn_repos_parse_fns2_t_set_revision_property_set)
+    set_node_property = _swig_property(_repos.svn_repos_parse_fns2_t_set_node_property_get, _repos.svn_repos_parse_fns2_t_set_node_property_set)
+    delete_node_property = _swig_property(_repos.svn_repos_parse_fns2_t_delete_node_property_get, _repos.svn_repos_parse_fns2_t_delete_node_property_set)
+    remove_node_props = _swig_property(_repos.svn_repos_parse_fns2_t_remove_node_props_get, _repos.svn_repos_parse_fns2_t_remove_node_props_set)
+    set_fulltext = _swig_property(_repos.svn_repos_parse_fns2_t_set_fulltext_get, _repos.svn_repos_parse_fns2_t_set_fulltext_set)
+    apply_textdelta = _swig_property(_repos.svn_repos_parse_fns2_t_apply_textdelta_get, _repos.svn_repos_parse_fns2_t_apply_textdelta_set)
+    close_node = _swig_property(_repos.svn_repos_parse_fns2_t_close_node_get, _repos.svn_repos_parse_fns2_t_close_node_set)
+    close_revision = _swig_property(_repos.svn_repos_parse_fns2_t_close_revision_get, _repos.svn_repos_parse_fns2_t_close_revision_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1091,23 +1200,57 @@ class svn_repos_parse_fns2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1117,7 +1260,7 @@ class svn_repos_parse_fns2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def new_revision_record(self, *args):
@@ -1166,35 +1309,23 @@ class svn_repos_parse_fns2_t:
 svn_repos_parse_fns2_t_swigregister = _repos.svn_repos_parse_fns2_t_swigregister
 svn_repos_parse_fns2_t_swigregister(svn_repos_parse_fns2_t)
 
-class svn_repos_parser_fns_t:
+class svn_repos_parser_fns_t(object):
     """Proxy of C svn_repos_parse_fns_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_parser_fns_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_parser_fns_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    __swig_setmethods__["new_revision_record"] = _repos.svn_repos_parser_fns_t_new_revision_record_set
-    __swig_getmethods__["new_revision_record"] = _repos.svn_repos_parser_fns_t_new_revision_record_get
-    __swig_setmethods__["uuid_record"] = _repos.svn_repos_parser_fns_t_uuid_record_set
-    __swig_getmethods__["uuid_record"] = _repos.svn_repos_parser_fns_t_uuid_record_get
-    __swig_setmethods__["new_node_record"] = _repos.svn_repos_parser_fns_t_new_node_record_set
-    __swig_getmethods__["new_node_record"] = _repos.svn_repos_parser_fns_t_new_node_record_get
-    __swig_setmethods__["set_revision_property"] = _repos.svn_repos_parser_fns_t_set_revision_property_set
-    __swig_getmethods__["set_revision_property"] = _repos.svn_repos_parser_fns_t_set_revision_property_get
-    __swig_setmethods__["set_node_property"] = _repos.svn_repos_parser_fns_t_set_node_property_set
-    __swig_getmethods__["set_node_property"] = _repos.svn_repos_parser_fns_t_set_node_property_get
-    __swig_setmethods__["remove_node_props"] = _repos.svn_repos_parser_fns_t_remove_node_props_set
-    __swig_getmethods__["remove_node_props"] = _repos.svn_repos_parser_fns_t_remove_node_props_get
-    __swig_setmethods__["set_fulltext"] = _repos.svn_repos_parser_fns_t_set_fulltext_set
-    __swig_getmethods__["set_fulltext"] = _repos.svn_repos_parser_fns_t_set_fulltext_get
-    __swig_setmethods__["close_node"] = _repos.svn_repos_parser_fns_t_close_node_set
-    __swig_getmethods__["close_node"] = _repos.svn_repos_parser_fns_t_close_node_get
-    __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
+    new_revision_record = _swig_property(_repos.svn_repos_parser_fns_t_new_revision_record_get, _repos.svn_repos_parser_fns_t_new_revision_record_set)
+    uuid_record = _swig_property(_repos.svn_repos_parser_fns_t_uuid_record_get, _repos.svn_repos_parser_fns_t_uuid_record_set)
+    new_node_record = _swig_property(_repos.svn_repos_parser_fns_t_new_node_record_get, _repos.svn_repos_parser_fns_t_new_node_record_set)
+    set_revision_property = _swig_property(_repos.svn_repos_parser_fns_t_set_revision_property_get, _repos.svn_repos_parser_fns_t_set_revision_property_set)
+    set_node_property = _swig_property(_repos.svn_repos_parser_fns_t_set_node_property_get, _repos.svn_repos_parser_fns_t_set_node_property_set)
+    remove_node_props = _swig_property(_repos.svn_repos_parser_fns_t_remove_node_props_get, _repos.svn_repos_parser_fns_t_remove_node_props_set)
+    set_fulltext = _swig_property(_repos.svn_repos_parser_fns_t_set_fulltext_get, _repos.svn_repos_parser_fns_t_set_fulltext_set)
+    close_node = _swig_property(_repos.svn_repos_parser_fns_t_close_node_get, _repos.svn_repos_parser_fns_t_close_node_set)
+    close_revision = _swig_property(_repos.svn_repos_parser_fns_t_close_revision_get, _repos.svn_repos_parser_fns_t_close_revision_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1209,23 +1340,57 @@ class svn_repos_parser_fns_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1235,77 +1400,74 @@ class svn_repos_parser_fns_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_repos_parser_fns_t_swigregister = _repos.svn_repos_parser_fns_t_swigregister
 svn_repos_parser_fns_t_swigregister(svn_repos_parser_fns_t)
 
 
-def svn_repos_parse_dumpstream2(*args):
+def svn_repos_parse_dumpstream2(*args) -> "svn_error_t *":
     """svn_repos_parse_dumpstream2(svn_stream_t * stream, svn_repos_parse_fns2_t parse_fns, void * parse_baton, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_dumpstream2(*args)
 
-def svn_repos_parse_dumpstream(*args):
+def svn_repos_parse_dumpstream(*args) -> "svn_error_t *":
     """svn_repos_parse_dumpstream(svn_stream_t * stream, svn_repos_parser_fns_t parse_fns, void * parse_baton, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_dumpstream(*args)
 
-def svn_repos_get_fs_build_parser3(*args):
+def svn_repos_get_fs_build_parser3(*args) -> "SWIGTYPE **, void **":
     """svn_repos_get_fs_build_parser3(svn_repos_t * repos, svn_boolean_t use_history, svn_boolean_t validate_props, enum svn_repos_load_uuid uuid_action, char const * parent_dir, svn_repos_notify_func_t notify_func, void * notify_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_fs_build_parser3(*args)
 
-def svn_repos_get_fs_build_parser2(*args):
+def svn_repos_get_fs_build_parser2(*args) -> "SWIGTYPE **, void **":
     """svn_repos_get_fs_build_parser2(svn_repos_t * repos, svn_boolean_t use_history, enum svn_repos_load_uuid uuid_action, svn_stream_t * outstream, char const * parent_dir, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_fs_build_parser2(*args)
 
-def svn_repos_get_fs_build_parser(*args):
+def svn_repos_get_fs_build_parser(*args) -> "svn_repos_parser_fns_t const **, void **":
     """svn_repos_get_fs_build_parser(svn_repos_t * repos, svn_boolean_t use_history, enum svn_repos_load_uuid uuid_action, svn_stream_t * outstream, char const * parent_dir, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_get_fs_build_parser(*args)
 
-def svn_repos_authz_initialize(*args):
+def svn_repos_authz_initialize(*args) -> "svn_error_t *":
     """svn_repos_authz_initialize(apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_authz_initialize(*args)
 
-def svn_repos_authz_read4(*args):
+def svn_repos_authz_read4(*args) -> "svn_authz_t **":
     """svn_repos_authz_read4(char const * path, char const * groups_path, svn_boolean_t must_exist, svn_repos_t * repos_hint, svn_repos_authz_warning_func_t warning_func, void * warning_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_authz_read4(*args)
 
-def svn_repos_authz_read3(*args):
+def svn_repos_authz_read3(*args) -> "svn_authz_t **":
     """svn_repos_authz_read3(char const * path, char const * groups_path, svn_boolean_t must_exist, svn_repos_t * repos_hint, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_authz_read3(*args)
 
-def svn_repos_authz_read2(*args):
+def svn_repos_authz_read2(*args) -> "svn_authz_t **":
     """svn_repos_authz_read2(char const * path, char const * groups_path, svn_boolean_t must_exist, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_authz_read2(*args)
 
-def svn_repos_authz_read(*args):
+def svn_repos_authz_read(*args) -> "svn_authz_t **":
     """svn_repos_authz_read(char const * file, svn_boolean_t must_exist, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_authz_read(*args)
 
-def svn_repos_authz_parse2(*args):
+def svn_repos_authz_parse2(*args) -> "svn_authz_t **":
     """svn_repos_authz_parse2(svn_stream_t * stream, svn_stream_t * groups_stream, svn_repos_authz_warning_func_t warning_func, void * warning_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_authz_parse2(*args)
 
-def svn_repos_authz_parse(*args):
+def svn_repos_authz_parse(*args) -> "svn_authz_t **":
     """svn_repos_authz_parse(svn_stream_t * stream, svn_stream_t * groups_stream, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_authz_parse(*args)
 
-def svn_repos_authz_check_access(*args):
+def svn_repos_authz_check_access(*args) -> "svn_boolean_t *":
     """svn_repos_authz_check_access(svn_authz_t * authz, char const * repos_name, char const * path, char const * user, svn_repos_authz_access_t required_access, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_authz_check_access(*args)
 svn_repos_revision_access_none = _repos.svn_repos_revision_access_none
 svn_repos_revision_access_partial = _repos.svn_repos_revision_access_partial
 svn_repos_revision_access_full = _repos.svn_repos_revision_access_full
 
-def svn_repos_check_revision_access(*args):
+def svn_repos_check_revision_access(*args) -> "svn_error_t *":
     """svn_repos_check_revision_access(svn_repos_revision_access_level_t * access_level, svn_repos_t * repos, svn_revnum_t revision, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_check_revision_access(*args)
-class svn_repos_t:
+class svn_repos_t(object):
     """Proxy of C svn_repos_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1324,23 +1486,57 @@ class svn_repos_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1350,18 +1546,15 @@ class svn_repos_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_repos_t_swigregister = _repos.svn_repos_t_swigregister
 svn_repos_t_swigregister(svn_repos_t)
 
-class svn_authz_t:
+class svn_authz_t(object):
     """Proxy of C svn_authz_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_authz_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_authz_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1380,23 +1573,57 @@ class svn_authz_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1406,154 +1633,151 @@ class svn_authz_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_authz_t_swigregister = _repos.svn_authz_t_swigregister
 svn_authz_t_swigregister(svn_authz_t)
 
 
-def svn_repos_parse_fns3_invoke_magic_header_record(*args):
+def svn_repos_parse_fns3_invoke_magic_header_record(*args) -> "svn_error_t *":
     """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"""
     return _repos.svn_repos_parse_fns3_invoke_magic_header_record(*args)
 
-def svn_repos_parse_fns3_invoke_uuid_record(*args):
+def svn_repos_parse_fns3_invoke_uuid_record(*args) -> "svn_error_t *":
     """svn_repos_parse_fns3_invoke_uuid_record(svn_repos_parse_fns3_t _obj, char const * uuid, void * parse_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_uuid_record(*args)
 
-def svn_repos_parse_fns3_invoke_new_revision_record(*args):
+def svn_repos_parse_fns3_invoke_new_revision_record(*args) -> "void **":
     """svn_repos_parse_fns3_invoke_new_revision_record(svn_repos_parse_fns3_t _obj, apr_hash_t headers, void * parse_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_new_revision_record(*args)
 
-def svn_repos_parse_fns3_invoke_new_node_record(*args):
+def svn_repos_parse_fns3_invoke_new_node_record(*args) -> "void **":
     """svn_repos_parse_fns3_invoke_new_node_record(svn_repos_parse_fns3_t _obj, apr_hash_t headers, void * revision_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_new_node_record(*args)
 
-def svn_repos_parse_fns3_invoke_set_revision_property(_obj, revision_baton, name, value):
+def svn_repos_parse_fns3_invoke_set_revision_property(_obj: 'svn_repos_parse_fns3_t', revision_baton: 'void *', name: 'char const *', value: 'svn_string_t const *') -> "svn_error_t *":
     """svn_repos_parse_fns3_invoke_set_revision_property(svn_repos_parse_fns3_t _obj, void * revision_baton, char const * name, svn_string_t const * value) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_set_revision_property(_obj, revision_baton, name, value)
 
-def svn_repos_parse_fns3_invoke_set_node_property(_obj, node_baton, name, value):
+def svn_repos_parse_fns3_invoke_set_node_property(_obj: 'svn_repos_parse_fns3_t', node_baton: 'void *', name: 'char const *', value: 'svn_string_t const *') -> "svn_error_t *":
     """svn_repos_parse_fns3_invoke_set_node_property(svn_repos_parse_fns3_t _obj, void * node_baton, char const * name, svn_string_t const * value) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_set_node_property(_obj, node_baton, name, value)
 
-def svn_repos_parse_fns3_invoke_delete_node_property(_obj, node_baton, name):
+def svn_repos_parse_fns3_invoke_delete_node_property(_obj: 'svn_repos_parse_fns3_t', node_baton: 'void *', name: 'char const *') -> "svn_error_t *":
     """svn_repos_parse_fns3_invoke_delete_node_property(svn_repos_parse_fns3_t _obj, void * node_baton, char const * name) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_delete_node_property(_obj, node_baton, name)
 
-def svn_repos_parse_fns3_invoke_remove_node_props(_obj, node_baton):
+def svn_repos_parse_fns3_invoke_remove_node_props(_obj: 'svn_repos_parse_fns3_t', node_baton: 'void *') -> "svn_error_t *":
     """svn_repos_parse_fns3_invoke_remove_node_props(svn_repos_parse_fns3_t _obj, void * node_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_remove_node_props(_obj, node_baton)
 
-def svn_repos_parse_fns3_invoke_set_fulltext(_obj, node_baton):
+def svn_repos_parse_fns3_invoke_set_fulltext(_obj: 'svn_repos_parse_fns3_t', node_baton: 'void *') -> "svn_stream_t **":
     """svn_repos_parse_fns3_invoke_set_fulltext(svn_repos_parse_fns3_t _obj, void * node_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_set_fulltext(_obj, node_baton)
 
-def svn_repos_parse_fns3_invoke_apply_textdelta(_obj, node_baton):
+def svn_repos_parse_fns3_invoke_apply_textdelta(_obj: 'svn_repos_parse_fns3_t', node_baton: 'void *') -> "svn_txdelta_window_handler_t *, void **":
     """svn_repos_parse_fns3_invoke_apply_textdelta(svn_repos_parse_fns3_t _obj, void * node_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_apply_textdelta(_obj, node_baton)
 
-def svn_repos_parse_fns3_invoke_close_node(_obj, node_baton):
+def svn_repos_parse_fns3_invoke_close_node(_obj: 'svn_repos_parse_fns3_t', node_baton: 'void *') -> "svn_error_t *":
     """svn_repos_parse_fns3_invoke_close_node(svn_repos_parse_fns3_t _obj, void * node_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_close_node(_obj, node_baton)
 
-def svn_repos_parse_fns3_invoke_close_revision(_obj, revision_baton):
+def svn_repos_parse_fns3_invoke_close_revision(_obj: 'svn_repos_parse_fns3_t', revision_baton: 'void *') -> "svn_error_t *":
     """svn_repos_parse_fns3_invoke_close_revision(svn_repos_parse_fns3_t _obj, void * revision_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns3_invoke_close_revision(_obj, revision_baton)
 
-def svn_repos_parse_fns2_invoke_new_revision_record(*args):
+def svn_repos_parse_fns2_invoke_new_revision_record(*args) -> "void **":
     """svn_repos_parse_fns2_invoke_new_revision_record(svn_repos_parse_fns2_t _obj, apr_hash_t headers, void * parse_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_new_revision_record(*args)
 
-def svn_repos_parse_fns2_invoke_uuid_record(*args):
+def svn_repos_parse_fns2_invoke_uuid_record(*args) -> "svn_error_t *":
     """svn_repos_parse_fns2_invoke_uuid_record(svn_repos_parse_fns2_t _obj, char const * uuid, void * parse_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_uuid_record(*args)
 
-def svn_repos_parse_fns2_invoke_new_node_record(*args):
+def svn_repos_parse_fns2_invoke_new_node_record(*args) -> "void **":
     """svn_repos_parse_fns2_invoke_new_node_record(svn_repos_parse_fns2_t _obj, apr_hash_t headers, void * revision_baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_new_node_record(*args)
 
-def svn_repos_parse_fns2_invoke_set_revision_property(_obj, revision_baton, name, value):
+def svn_repos_parse_fns2_invoke_set_revision_property(_obj: 'svn_repos_parse_fns2_t', revision_baton: 'void *', name: 'char const *', value: 'svn_string_t const *') -> "svn_error_t *":
     """svn_repos_parse_fns2_invoke_set_revision_property(svn_repos_parse_fns2_t _obj, void * revision_baton, char const * name, svn_string_t const * value) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_set_revision_property(_obj, revision_baton, name, value)
 
-def svn_repos_parse_fns2_invoke_set_node_property(_obj, node_baton, name, value):
+def svn_repos_parse_fns2_invoke_set_node_property(_obj: 'svn_repos_parse_fns2_t', node_baton: 'void *', name: 'char const *', value: 'svn_string_t const *') -> "svn_error_t *":
     """svn_repos_parse_fns2_invoke_set_node_property(svn_repos_parse_fns2_t _obj, void * node_baton, char const * name, svn_string_t const * value) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_set_node_property(_obj, node_baton, name, value)
 
-def svn_repos_parse_fns2_invoke_delete_node_property(_obj, node_baton, name):
+def svn_repos_parse_fns2_invoke_delete_node_property(_obj: 'svn_repos_parse_fns2_t', node_baton: 'void *', name: 'char const *') -> "svn_error_t *":
     """svn_repos_parse_fns2_invoke_delete_node_property(svn_repos_parse_fns2_t _obj, void * node_baton, char const * name) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_delete_node_property(_obj, node_baton, name)
 
-def svn_repos_parse_fns2_invoke_remove_node_props(_obj, node_baton):
+def svn_repos_parse_fns2_invoke_remove_node_props(_obj: 'svn_repos_parse_fns2_t', node_baton: 'void *') -> "svn_error_t *":
     """svn_repos_parse_fns2_invoke_remove_node_props(svn_repos_parse_fns2_t _obj, void * node_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_remove_node_props(_obj, node_baton)
 
-def svn_repos_parse_fns2_invoke_set_fulltext(_obj, node_baton):
+def svn_repos_parse_fns2_invoke_set_fulltext(_obj: 'svn_repos_parse_fns2_t', node_baton: 'void *') -> "svn_stream_t **":
     """svn_repos_parse_fns2_invoke_set_fulltext(svn_repos_parse_fns2_t _obj, void * node_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_set_fulltext(_obj, node_baton)
 
-def svn_repos_parse_fns2_invoke_apply_textdelta(_obj, node_baton):
+def svn_repos_parse_fns2_invoke_apply_textdelta(_obj: 'svn_repos_parse_fns2_t', node_baton: 'void *') -> "svn_txdelta_window_handler_t *, void **":
     """svn_repos_parse_fns2_invoke_apply_textdelta(svn_repos_parse_fns2_t _obj, void * node_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_apply_textdelta(_obj, node_baton)
 
-def svn_repos_parse_fns2_invoke_close_node(_obj, node_baton):
+def svn_repos_parse_fns2_invoke_close_node(_obj: 'svn_repos_parse_fns2_t', node_baton: 'void *') -> "svn_error_t *":
     """svn_repos_parse_fns2_invoke_close_node(svn_repos_parse_fns2_t _obj, void * node_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_close_node(_obj, node_baton)
 
-def svn_repos_parse_fns2_invoke_close_revision(_obj, revision_baton):
+def svn_repos_parse_fns2_invoke_close_revision(_obj: 'svn_repos_parse_fns2_t', revision_baton: 'void *') -> "svn_error_t *":
     """svn_repos_parse_fns2_invoke_close_revision(svn_repos_parse_fns2_t _obj, void * revision_baton) -> svn_error_t"""
     return _repos.svn_repos_parse_fns2_invoke_close_revision(_obj, revision_baton)
 
-def svn_repos_invoke_authz_func(*args):
+def svn_repos_invoke_authz_func(*args) -> "svn_boolean_t *":
     """svn_repos_invoke_authz_func(svn_repos_authz_func_t _obj, svn_fs_root_t * root, char const * path, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_invoke_authz_func(*args)
 
-def svn_repos_invoke_authz_callback(*args):
+def svn_repos_invoke_authz_callback(*args) -> "svn_boolean_t *":
     """svn_repos_invoke_authz_callback(svn_repos_authz_callback_t _obj, svn_repos_authz_access_t required, svn_fs_root_t * root, char const * path, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_invoke_authz_callback(*args)
 
-def svn_repos_invoke_notify_func(*args):
+def svn_repos_invoke_notify_func(*args) -> "void":
     """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)
 
-def svn_repos_invoke_dump_filter_func(*args):
+def svn_repos_invoke_dump_filter_func(*args) -> "svn_boolean_t *":
     """svn_repos_invoke_dump_filter_func(svn_repos_dump_filter_func_t _obj, svn_fs_root_t * root, char const * path, void * baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_invoke_dump_filter_func(*args)
 
-def svn_repos_invoke_freeze_func(*args):
+def svn_repos_invoke_freeze_func(*args) -> "svn_error_t *":
     """svn_repos_invoke_freeze_func(svn_repos_freeze_func_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_invoke_freeze_func(*args)
 
-def svn_repos_invoke_history_func(*args):
+def svn_repos_invoke_history_func(*args) -> "svn_error_t *":
     """svn_repos_invoke_history_func(svn_repos_history_func_t _obj, void * baton, char const * path, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
     return _repos.svn_repos_invoke_history_func(*args)
 
-def svn_repos_invoke_path_change_receiver(*args):
+def svn_repos_invoke_path_change_receiver(*args) -> "svn_error_t *":
     """svn_repos_invoke_path_change_receiver(svn_repos_path_change_receiver_t _obj, void * baton, svn_fs_path_change3_t change, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_invoke_path_change_receiver(*args)
 
-def svn_repos_invoke_log_entry_receiver(*args):
+def svn_repos_invoke_log_entry_receiver(*args) -> "svn_error_t *":
     """svn_repos_invoke_log_entry_receiver(svn_repos_log_entry_receiver_t _obj, void * baton, svn_repos_log_entry_t log_entry, apr_pool_t scratch_pool) -> svn_error_t"""
     return _repos.svn_repos_invoke_log_entry_receiver(*args)
 
-def svn_repos_invoke_file_rev_handler(*args):
+def svn_repos_invoke_file_rev_handler(*args) -> "svn_txdelta_window_handler_t *, void **":
     """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):
+def svn_repos_invoke_verify_callback(*args) -> "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) -> svn_error_t"""
     return _repos.svn_repos_invoke_verify_callback(*args)
 
-def svn_repos_invoke_authz_warning_func(*args):
+def svn_repos_invoke_authz_warning_func(*args) -> "void":
     """svn_repos_invoke_authz_warning_func(svn_repos_authz_warning_func_t _obj, void * baton, svn_error_t error, apr_pool_t scratch_pool)"""
     return _repos.svn_repos_invoke_authz_warning_func(*args)
-class svn_repos_authz_func_t:
+class svn_repos_authz_func_t(object):
     """Proxy of C svn_repos_authz_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_authz_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_authz_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1572,23 +1796,57 @@ class svn_repos_authz_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1598,7 +1856,7 @@ class svn_repos_authz_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1607,13 +1865,10 @@ class svn_repos_authz_func_t:
 svn_repos_authz_func_t_swigregister = _repos.svn_repos_authz_func_t_swigregister
 svn_repos_authz_func_t_swigregister(svn_repos_authz_func_t)
 
-class svn_repos_authz_callback_t:
+class svn_repos_authz_callback_t(object):
     """Proxy of C svn_repos_authz_callback_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_authz_callback_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_authz_callback_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1632,23 +1887,57 @@ class svn_repos_authz_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1658,7 +1947,7 @@ class svn_repos_authz_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1667,13 +1956,10 @@ 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_notify_func_t:
+class svn_repos_notify_func_t(object):
     """Proxy of C svn_repos_notify_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __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_notify_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1692,23 +1978,57 @@ class svn_repos_notify_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1718,7 +2038,7 @@ class svn_repos_notify_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1727,13 +2047,10 @@ class svn_repos_notify_func_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_dump_filter_func_t:
+class svn_repos_dump_filter_func_t(object):
     """Proxy of C svn_repos_dump_filter_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_dump_filter_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_dump_filter_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1752,23 +2069,57 @@ class svn_repos_dump_filter_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1778,7 +2129,7 @@ class svn_repos_dump_filter_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1787,13 +2138,10 @@ class svn_repos_dump_filter_func_t:
 svn_repos_dump_filter_func_t_swigregister = _repos.svn_repos_dump_filter_func_t_swigregister
 svn_repos_dump_filter_func_t_swigregister(svn_repos_dump_filter_func_t)
 
-class svn_repos_freeze_func_t:
+class svn_repos_freeze_func_t(object):
     """Proxy of C svn_repos_freeze_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __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_freeze_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1812,23 +2160,57 @@ class svn_repos_freeze_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1838,7 +2220,7 @@ class svn_repos_freeze_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1847,13 +2229,10 @@ class svn_repos_freeze_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_history_func_t:
+class svn_repos_history_func_t(object):
     """Proxy of C svn_repos_history_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __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_history_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1872,23 +2251,57 @@ class svn_repos_history_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1898,7 +2311,7 @@ class svn_repos_history_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1907,13 +2320,10 @@ class svn_repos_history_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_path_change_receiver_t:
+class svn_repos_path_change_receiver_t(object):
     """Proxy of C svn_repos_path_change_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_path_change_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_path_change_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1932,23 +2342,57 @@ class svn_repos_path_change_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1958,7 +2402,7 @@ class svn_repos_path_change_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -1967,13 +2411,10 @@ class svn_repos_path_change_receiver_t:
 svn_repos_path_change_receiver_t_swigregister = _repos.svn_repos_path_change_receiver_t_swigregister
 svn_repos_path_change_receiver_t_swigregister(svn_repos_path_change_receiver_t)
 
-class svn_repos_log_entry_receiver_t:
+class svn_repos_log_entry_receiver_t(object):
     """Proxy of C svn_repos_log_entry_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_log_entry_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_log_entry_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -1992,23 +2433,57 @@ class svn_repos_log_entry_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2018,7 +2493,7 @@ class svn_repos_log_entry_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2027,13 +2502,10 @@ class svn_repos_log_entry_receiver_t:
 svn_repos_log_entry_receiver_t_swigregister = _repos.svn_repos_log_entry_receiver_t_swigregister
 svn_repos_log_entry_receiver_t_swigregister(svn_repos_log_entry_receiver_t)
 
-class svn_repos_file_rev_handler_t:
+class svn_repos_file_rev_handler_t(object):
     """Proxy of C svn_repos_file_rev_handler_t struct."""
 
-    __swig_setmethods__ = {}
-    __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_file_rev_handler_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2052,23 +2524,57 @@ class svn_repos_file_rev_handler_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2078,7 +2584,7 @@ class svn_repos_file_rev_handler_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2087,13 +2593,10 @@ class svn_repos_file_rev_handler_t:
 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:
+class svn_repos_verify_callback_t(object):
     """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)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2112,23 +2615,57 @@ class svn_repos_verify_callback_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2138,7 +2675,7 @@ class svn_repos_verify_callback_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -2147,13 +2684,10 @@ class svn_repos_verify_callback_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)
 
-class svn_repos_authz_warning_func_t:
+class svn_repos_authz_warning_func_t(object):
     """Proxy of C svn_repos_authz_warning_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_authz_warning_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_authz_warning_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2172,23 +2706,57 @@ class svn_repos_authz_warning_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2198,7 +2766,7 @@ class svn_repos_authz_warning_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
diff --git a/subversion/bindings/swig/python/svn/client.py b/subversion/bindings/swig/python/svn/client.py
index 5fb7aa5..0f1f01b 100644
--- a/subversion/bindings/swig/python/svn/client.py
+++ b/subversion/bindings/swig/python/svn/client.py
@@ -24,8 +24,8 @@
 ######################################################################
 
 from libsvn.client import *
-from svn.core import _unprefix_names
+from svn.core import _unprefix_names, _as_list
 _unprefix_names(locals(), 'svn_client_')
 _unprefix_names(locals(), 'SVN_CLIENT_')
-__all__ = filter(lambda x: x.lower().startswith('svn_'), locals().keys())
+__all__ = [x for x in _as_list(locals()) if x.lower().startswith('svn_')]
 del _unprefix_names
diff --git a/subversion/bindings/swig/python/svn/core.py b/subversion/bindings/swig/python/svn/core.py
index bbf8b28..0e4f374 100644
--- a/subversion/bindings/swig/python/svn/core.py
+++ b/subversion/bindings/swig/python/svn/core.py
@@ -27,8 +27,8 @@ from libsvn.core import *
 import libsvn.core as _libsvncore
 import atexit as _atexit
 import sys
-# __all__ is defined later, since some svn_* functions are implemented below.
 
+# __all__ is defined later, since some svn_* functions are implemented below.
 
 class SubversionException(Exception):
 
@@ -89,6 +89,20 @@ class SubversionException(Exception):
       child = cls(message, apr_err, child, file, line)
     return child
 
+# This function is useful for common Python 2/3 code. It prevents the double
+# memory hit of simply wrapping values/keys/items calls on dictionaries on
+# python 2, but ensuring an independent list is returned in Python 3.
+def _as_list(seq):
+  """Returns the given sequence or iterator as a list.
+
+  If already a list, simply returns the list, otherwise a list is constructed
+  using the given object.
+  """
+  if isinstance(seq, list):
+    return seq
+
+  return list(seq)
+
 def _cleanup_application_pool():
   """Cleanup the application pool before exiting"""
   if application_pool and application_pool.valid():
@@ -96,7 +110,7 @@ def _cleanup_application_pool():
 _atexit.register(_cleanup_application_pool)
 
 def _unprefix_names(symbol_dict, from_prefix, to_prefix = ''):
-  for name, value in symbol_dict.items():
+  for name, value in _as_list(symbol_dict.items()):
     if name.startswith(from_prefix):
       symbol_dict[to_prefix + name[len(from_prefix):]] = value
 
@@ -141,7 +155,7 @@ def svn_path_compare_paths(path1, path2):
 
   # Common prefix was skipped above, next character is compared to
   # determine order
-  return cmp(char1, char2)
+  return (char1 > char2) - (char1 < char2)
 
 def svn_mergeinfo_merge(mergeinfo, changes):
   return _libsvncore.svn_swig_mergeinfo_merge(mergeinfo, changes)
@@ -171,7 +185,7 @@ class Stream:
         if not data:
           break
         chunks.append(data)
-      return ''.join(chunks)
+      return b''.join(chunks)
 
     # read the amount specified
     return svn_stream_read(self._stream, int(amt))
@@ -194,7 +208,7 @@ def secs_from_timestr(svn_datetime, pool=None):
   # ### convert to a time_t; this requires intimate knowledge of
   # ### the apr_time_t type
   # ### aprtime is microseconds; turn it into seconds
-  return aprtime / 1000000
+  return aprtime // 1000000
 
 
 # ============================================================================
@@ -319,10 +333,10 @@ def run_app(func, *args, **kw):
 # 'run_app'
 # '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())
+__all__ = [s for s in _as_list(locals())
+           if (s.startswith('svn_')
+               or s.startswith('SVN_')
+               or s.startswith('SVNSYNC_')
+               or s in ('Pool', 'SubversionException'))
+           and '__' not in s]
 
diff --git a/subversion/bindings/swig/python/svn/delta.py b/subversion/bindings/swig/python/svn/delta.py
index 664974b..0a712cd 100644
--- a/subversion/bindings/swig/python/svn/delta.py
+++ b/subversion/bindings/swig/python/svn/delta.py
@@ -24,10 +24,10 @@
 ######################################################################
 
 from libsvn.delta import *
-from svn.core import _unprefix_names
+from svn.core import _unprefix_names, _as_list
 _unprefix_names(locals(), 'svn_delta_')
 _unprefix_names(locals(), 'svn_txdelta_', 'tx_')
-__all__ = filter(lambda x: x.lower().startswith('svn_'), locals().keys())
+__all__ = [x for x in _as_list(locals()) if x.lower().startswith('svn_')]
 del _unprefix_names
 
 class Editor:
diff --git a/subversion/bindings/swig/python/svn/diff.py b/subversion/bindings/swig/python/svn/diff.py
index d7317ab..7655a0b 100644
--- a/subversion/bindings/swig/python/svn/diff.py
+++ b/subversion/bindings/swig/python/svn/diff.py
@@ -24,7 +24,7 @@
 ######################################################################
 
 from libsvn.diff import *
-from svn.core import _unprefix_names
+from svn.core import _unprefix_names, _as_list
 _unprefix_names(locals(), 'svn_diff_')
-__all__ = filter(lambda x: x.lower().startswith('svn_'), locals().keys())
+__all__ = [x for x in _as_list(locals()) if x.lower().startswith('svn_')]
 del _unprefix_names
diff --git a/subversion/bindings/swig/python/svn/fs.py b/subversion/bindings/swig/python/svn/fs.py
index 408e538..13acc04 100644
--- a/subversion/bindings/swig/python/svn/fs.py
+++ b/subversion/bindings/swig/python/svn/fs.py
@@ -24,10 +24,10 @@
 ######################################################################
 
 from libsvn.fs import *
-from svn.core import _unprefix_names, Pool
+from svn.core import _unprefix_names, Pool, _as_list
 _unprefix_names(locals(), 'svn_fs_')
 _unprefix_names(locals(), 'SVN_FS_')
-__all__ = filter(lambda x: x.lower().startswith('svn_'), locals().keys())
+__all__ = [x for x in _as_list(locals()) if x.lower().startswith('svn_')]
 del _unprefix_names
 
 
@@ -48,10 +48,30 @@ import svn.diff as _svndiff
 def entries(root, path, pool=None):
   "Call dir_entries returning a dictionary mappings names to IDs."
   e = dir_entries(root, path, pool)
-  for name, entry in e.items():
+  for name, entry in _as_list(e.items()):
     e[name] = dirent_t_id_get(entry)
   return e
 
+class _PopenStdoutWrapper(object):
+  "Private wrapper object of _subprocess.Popen.stdout to clean up sub process"
+  def __init__(self, pobject):
+    self._pobject = pobject
+  def __getattr__(self, name):
+    return getattr(self._pobject.stdout, name)
+  def close(self):
+    self._pobject.stdout.close()
+    if self._pobject.poll() is None:
+        self._pobject.terminate()
+  def __del__(self):
+    if not self.closed:
+      self.close()
+    if self._pobject.poll() is None:
+        self._pobject.terminate()
+        if _sys.hexversion >= 0x030300F0:
+          try:
+            self._pobject.wait(10)
+          except _subprocess.TimeoutExpired:
+            self._pobject.kill()
 
 class FileDiff:
   def __init__(self, root1, path1, root2, path2, pool=None, diffoptions=[]):
@@ -124,7 +144,7 @@ class FileDiff:
       # open the pipe, and return the file object for reading from the child.
       p = _subprocess.Popen(cmd, stdout=_subprocess.PIPE, bufsize=-1,
                             close_fds=_sys.platform != "win32")
-      return p.stdout
+      return _PopenStdoutWrapper(p)
 
     else:
       if self.difftemp is None:
@@ -132,16 +152,16 @@ class FileDiff:
 
         with builtins.open(self.difftemp, "wb") as fp:
           diffopt = _svndiff.file_options_create()
-          diffobj = _svndiff.file_diff_2(self.tempfile1,
-                                         self.tempfile2,
+          diffobj = _svndiff.file_diff_2(self.tempfile1.encode('UTF-8'),
+                                         self.tempfile2.encode('UTF-8'),
                                          diffopt)
 
           _svndiff.file_output_unified4(fp,
                                         diffobj,
-                                        self.tempfile1,
-                                        self.tempfile2,
+                                        self.tempfile1.encode('UTF-8'),
+                                        self.tempfile2.encode('UTF-8'),
                                         None, None,
-                                        "utf8",
+                                        b"utf8",
                                         None,
                                         diffopt.show_c_function,
                                         diffopt.context_size,
diff --git a/subversion/bindings/swig/python/svn/ra.py b/subversion/bindings/swig/python/svn/ra.py
index 6cfd61d..ef9f7e8 100644
--- a/subversion/bindings/swig/python/svn/ra.py
+++ b/subversion/bindings/swig/python/svn/ra.py
@@ -24,10 +24,10 @@
 ######################################################################
 
 from libsvn.ra import *
-from svn.core import _unprefix_names
+from svn.core import _unprefix_names, _as_list
 _unprefix_names(locals(), 'svn_ra_')
 _unprefix_names(locals(), 'SVN_RA_')
-__all__ = filter(lambda x: x.lower().startswith('svn_'), locals().keys())
+__all__ = [x for x in _as_list(locals()) if x.lower().startswith('svn_')]
 del _unprefix_names
 
 class Callbacks:
@@ -58,7 +58,7 @@ class Callbacks:
                                       svn.core.SVN_AUTH_PARAM_DEFAULT_PASSWORD,
                                       password)
     def open_tmp_file(self, pool):
-      path = '/'.join([self.wc, svn.wc.get_adm_dir(pool), 'tmp'])
+      path = b'/'.join([self.wc, svn.wc.get_adm_dir(pool), b'tmp'])
       (fd, fn) = tempfile.mkstemp(dir=path)
       os.close(fd)
       return fn
diff --git a/subversion/bindings/swig/python/svn/repos.py b/subversion/bindings/swig/python/svn/repos.py
index 1951aed..486a850 100644
--- a/subversion/bindings/swig/python/svn/repos.py
+++ b/subversion/bindings/swig/python/svn/repos.py
@@ -24,10 +24,10 @@
 ######################################################################
 
 from libsvn.repos import *
-from svn.core import _unprefix_names, Pool
+from svn.core import _unprefix_names, Pool, _as_list
 _unprefix_names(locals(), 'svn_repos_')
 _unprefix_names(locals(), 'SVN_REPOS_')
-__all__ = filter(lambda x: x.lower().startswith('svn_'), locals().keys())
+__all__ = [x for x in _as_list(locals()) if x.lower().startswith('svn_')]
 del _unprefix_names
 
 
@@ -126,9 +126,9 @@ class ChangeCollector(_svndelta.Editor):
         self.notify_cb(change)
 
   def _make_base_path(self, parent_path, path):
-    idx = path.rfind('/')
+    idx = path.rfind(b'/')
     if parent_path:
-      parent_path = parent_path + '/'
+      parent_path = parent_path + b'/'
     if idx == -1:
       return parent_path + path
     return parent_path + path[idx+1:]
@@ -142,7 +142,7 @@ class ChangeCollector(_svndelta.Editor):
     return root
 
   def open_root(self, base_revision, dir_pool=None):
-    return ('', '', self.base_rev)  # dir_baton
+    return (b'', b'', self.base_rev)  # dir_baton
 
   def delete_entry(self, path, revision, parent_baton, pool=None):
     base_path = self._make_base_path(parent_baton[1], path)
@@ -281,9 +281,9 @@ class RevisionChangeCollector(ChangeCollector):
     ChangeCollector.__init__(self, fs_ptr, root, pool, notify_cb)
 
   def _make_base_path(self, parent_path, path):
-    idx = path.rfind('/')
+    idx = path.rfind(b'/')
     if idx == -1:
-      return parent_path + '/' + path
+      return parent_path + b'/' + path
     return parent_path + path[idx:]
 
 
diff --git a/subversion/bindings/swig/python/svn/wc.py b/subversion/bindings/swig/python/svn/wc.py
index bb491b5..95cb74a 100644
--- a/subversion/bindings/swig/python/svn/wc.py
+++ b/subversion/bindings/swig/python/svn/wc.py
@@ -24,10 +24,10 @@
 ######################################################################
 
 from libsvn.wc import *
-from svn.core import _unprefix_names
+from svn.core import _unprefix_names, _as_list
 _unprefix_names(locals(), 'svn_wc_')
 _unprefix_names(locals(), 'SVN_WC_')
-__all__ = filter(lambda x: x.lower().startswith('svn_'), locals().keys())
+__all__ = [x for x in _as_list(locals()) if x.lower().startswith('svn_')]
 del _unprefix_names
 
 
diff --git a/subversion/bindings/swig/python/svn_client.c b/subversion/bindings/swig/python/svn_client.c
index 1472f06..295ecee 100644
--- a/subversion/bindings/swig/python/svn_client.c
+++ b/subversion/bindings/swig/python/svn_client.c
@@ -8,13 +8,15 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+
+
 
 #ifndef SWIGPYTHON
 #define SWIGPYTHON
 #endif
 
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#define SWIG_PYTHON_CLASSIC
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -3021,178 +3023,170 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #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[35]
 #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[36]
 #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[37]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[40]
-#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[41]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[42]
-#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[43]
-#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[44]
-#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_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_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[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_hash_t swig_types[51]
-#define SWIGTYPE_p_p_char swig_types[52]
-#define SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void swig_types[53]
-#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[54]
-#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[55]
-#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[56]
-#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[57]
-#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[58]
-#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[59]
-#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[60]
-#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[61]
-#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[62]
-#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[63]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char__int swig_types[64]
-#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[65]
-#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[66]
-#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[67]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_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__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[69]
-#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[70]
-#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[71]
-#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[72]
-#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[73]
-#define 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 swig_types[74]
-#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[75]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[76]
-#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[77]
-#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[78]
-#define SWIGTYPE_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[79]
-#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[80]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[81]
-#define SWIGTYPE_p_p_svn_client__shelf_t swig_types[82]
-#define SWIGTYPE_p_p_svn_client__shelf_version_t swig_types[83]
-#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[84]
-#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[85]
-#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[86]
-#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[87]
-#define SWIGTYPE_p_p_svn_commit_info_t swig_types[88]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[89]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[90]
-#define SWIGTYPE_p_p_svn_string_t swig_types[91]
-#define SWIGTYPE_p_p_void swig_types[92]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[93]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[94]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[95]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[96]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[97]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[98]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[99]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[100]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[101]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[102]
-#define SWIGTYPE_p_svn_cache_config_t swig_types[103]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[104]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[105]
-#define SWIGTYPE_p_svn_checksum_t swig_types[106]
-#define SWIGTYPE_p_svn_client__shelf_info_t swig_types[107]
-#define SWIGTYPE_p_svn_client__shelf_t swig_types[108]
-#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[109]
-#define SWIGTYPE_p_svn_client_commit_info_t swig_types[110]
-#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[111]
-#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[112]
-#define SWIGTYPE_p_svn_client_commit_item_t swig_types[113]
-#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[114]
-#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[115]
-#define SWIGTYPE_p_svn_client_conflict_t swig_types[116]
-#define SWIGTYPE_p_svn_client_copy_source_t swig_types[117]
-#define SWIGTYPE_p_svn_client_ctx_t swig_types[118]
-#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[119]
-#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[120]
-#define SWIGTYPE_p_svn_client_info2_t swig_types[121]
-#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[122]
-#define SWIGTYPE_p_svn_client_status_t swig_types[123]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[124]
-#define SWIGTYPE_p_svn_config_t swig_types[125]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[126]
-#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[127]
-#define SWIGTYPE_p_svn_depth_t swig_types[128]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[129]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[130]
-#define SWIGTYPE_p_svn_dirent_t swig_types[131]
-#define SWIGTYPE_p_svn_errno_t swig_types[132]
-#define SWIGTYPE_p_svn_error_t swig_types[133]
-#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[134]
-#define SWIGTYPE_p_svn_info_t swig_types[135]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[136]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[137]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[138]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[139]
-#define SWIGTYPE_p_svn_lock_t swig_types[140]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[141]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[142]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[143]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[144]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[145]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[146]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[147]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[148]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[149]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[150]
-#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[151]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[152]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[153]
-#define SWIGTYPE_p_svn_prop_kind swig_types[154]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[155]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[156]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[157]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[158]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[159]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[160]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[161]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[162]
-#define SWIGTYPE_p_svn_stream_t swig_types[163]
-#define SWIGTYPE_p_svn_string_t swig_types[164]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[165]
-#define SWIGTYPE_p_svn_tristate_t swig_types[166]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[167]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[168]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[169]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[170]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[171]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[172]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[173]
-#define SWIGTYPE_p_svn_version_t swig_types[174]
-#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[175]
-#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[176]
-#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[177]
-#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[178]
-#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[179]
-#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[180]
-#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[181]
-#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[182]
-#define SWIGTYPE_p_svn_wc_context_t swig_types[183]
-#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[184]
-#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[185]
-#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[186]
-#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[187]
-#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[188]
-#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[189]
-#define SWIGTYPE_p_svn_wc_entry_t swig_types[190]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[191]
-#define SWIGTYPE_p_svn_wc_external_item_t swig_types[192]
-#define SWIGTYPE_p_svn_wc_info_t swig_types[193]
-#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[194]
-#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[195]
-#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[196]
-#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[197]
-#define SWIGTYPE_p_svn_wc_notify_t swig_types[198]
-#define SWIGTYPE_p_svn_wc_operation_t swig_types[199]
-#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[200]
-#define SWIGTYPE_p_svn_wc_schedule_t swig_types[201]
-#define SWIGTYPE_p_svn_wc_status2_t swig_types[202]
-#define SWIGTYPE_p_svn_wc_status3_t swig_types[203]
-#define SWIGTYPE_p_svn_wc_status_t swig_types[204]
-#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[205]
-#define SWIGTYPE_p_unsigned_long swig_types[206]
-#define SWIGTYPE_p_void swig_types[207]
-static swig_type_info *swig_types[209];
-static swig_module_info swig_module = {swig_types, 208, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[39]
+#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[40]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[41]
+#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[42]
+#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[43]
+#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_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_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[46]
+#define SWIGTYPE_p_int swig_types[47]
+#define SWIGTYPE_p_long swig_types[48]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[49]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[50]
+#define SWIGTYPE_p_p_char swig_types[51]
+#define SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void swig_types[52]
+#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[53]
+#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[54]
+#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[55]
+#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[56]
+#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[57]
+#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[58]
+#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[59]
+#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[60]
+#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[61]
+#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[62]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char__int swig_types[63]
+#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[64]
+#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[65]
+#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[66]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_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__svn_client_info2_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__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[69]
+#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[70]
+#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[71]
+#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[72]
+#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[73]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[74]
+#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[75]
+#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[76]
+#define SWIGTYPE_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[77]
+#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[78]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[79]
+#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[80]
+#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[81]
+#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[82]
+#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[83]
+#define SWIGTYPE_p_p_svn_commit_info_t swig_types[84]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[85]
+#define SWIGTYPE_p_p_svn_string_t swig_types[86]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[87]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[88]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[89]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[90]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[91]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[92]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[93]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[94]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[95]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[96]
+#define SWIGTYPE_p_svn_cache_config_t swig_types[97]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[98]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[99]
+#define SWIGTYPE_p_svn_checksum_t swig_types[100]
+#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[101]
+#define SWIGTYPE_p_svn_client_commit_info_t swig_types[102]
+#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[103]
+#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[104]
+#define SWIGTYPE_p_svn_client_commit_item_t swig_types[105]
+#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[106]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[107]
+#define SWIGTYPE_p_svn_client_conflict_t swig_types[108]
+#define SWIGTYPE_p_svn_client_copy_source_t swig_types[109]
+#define SWIGTYPE_p_svn_client_ctx_t swig_types[110]
+#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[111]
+#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[112]
+#define SWIGTYPE_p_svn_client_info2_t swig_types[113]
+#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[114]
+#define SWIGTYPE_p_svn_client_status_t swig_types[115]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[116]
+#define SWIGTYPE_p_svn_config_t swig_types[117]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[118]
+#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[119]
+#define SWIGTYPE_p_svn_depth_t swig_types[120]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[121]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[122]
+#define SWIGTYPE_p_svn_dirent_t swig_types[123]
+#define SWIGTYPE_p_svn_errno_t swig_types[124]
+#define SWIGTYPE_p_svn_error_t swig_types[125]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[126]
+#define SWIGTYPE_p_svn_info_t swig_types[127]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[128]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[129]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[130]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[131]
+#define SWIGTYPE_p_svn_lock_t swig_types[132]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[133]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[134]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[135]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[136]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[137]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[138]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[139]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[140]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[141]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[142]
+#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[143]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[144]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[145]
+#define SWIGTYPE_p_svn_prop_kind swig_types[146]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[147]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[148]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[149]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[150]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[151]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[152]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[153]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[154]
+#define SWIGTYPE_p_svn_stream_t swig_types[155]
+#define SWIGTYPE_p_svn_string_t swig_types[156]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[157]
+#define SWIGTYPE_p_svn_tristate_t swig_types[158]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[159]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[160]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[161]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[162]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[163]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[164]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[165]
+#define SWIGTYPE_p_svn_version_t swig_types[166]
+#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[167]
+#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[168]
+#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[169]
+#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[170]
+#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[171]
+#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[172]
+#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[173]
+#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[174]
+#define SWIGTYPE_p_svn_wc_context_t swig_types[175]
+#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[176]
+#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[177]
+#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[178]
+#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[179]
+#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[180]
+#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[181]
+#define SWIGTYPE_p_svn_wc_entry_t swig_types[182]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[183]
+#define SWIGTYPE_p_svn_wc_external_item_t swig_types[184]
+#define SWIGTYPE_p_svn_wc_info_t swig_types[185]
+#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[186]
+#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[187]
+#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[188]
+#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[189]
+#define SWIGTYPE_p_svn_wc_notify_t swig_types[190]
+#define SWIGTYPE_p_svn_wc_operation_t swig_types[191]
+#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[192]
+#define SWIGTYPE_p_svn_wc_schedule_t swig_types[193]
+#define SWIGTYPE_p_svn_wc_status2_t swig_types[194]
+#define SWIGTYPE_p_svn_wc_status3_t swig_types[195]
+#define SWIGTYPE_p_svn_wc_status_t swig_types[196]
+#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[197]
+#define SWIGTYPE_p_unsigned_long swig_types[198]
+#define SWIGTYPE_p_void swig_types[199]
+static swig_type_info *swig_types[201];
+static swig_module_info swig_module = {swig_types, 200, 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)
 
@@ -3203,6 +3197,12 @@ static swig_module_info swig_module = {swig_types, 208, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
 
 /*-----------------------------------------------
               @(target):= _client.so
@@ -3229,6 +3229,7 @@ static swig_module_info swig_module = {swig_types, 208, 0, 0, 0, 0};
 
 
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 
 
 static PyObject * _global_py_pool = NULL;
@@ -3770,7 +3771,7 @@ SWIGINTERN PyObject *_wrap_svn_client_version(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_client_version")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_version",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3806,7 +3807,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_simple_prompt_provider(PyObject *SWIGU
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_get_simple_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_simple_prompt_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_auth_simple_prompt_func_t) svn_swig_py_auth_simple_prompt_func;
     arg3 = obj0;
@@ -3871,7 +3872,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_username_prompt_provider(PyObject *SWI
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_get_username_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_username_prompt_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_auth_username_prompt_func_t) svn_swig_py_auth_username_prompt_func;
     arg3 = obj0;
@@ -3931,7 +3932,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_simple_provider(PyObject *SWIGUNUSEDPA
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_client_get_simple_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_simple_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -3981,7 +3982,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_username_provider(PyObject *SWIGUNUSED
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_client_get_username_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_username_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -4031,7 +4032,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_server_trust_file_provider(PyObjec
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_client_get_ssl_server_trust_file_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_ssl_server_trust_file_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -4081,7 +4082,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_file_provider(PyObject
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_client_get_ssl_client_cert_file_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_ssl_client_cert_file_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -4131,7 +4132,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_pw_file_provider(PyObj
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_client_get_ssl_client_cert_pw_file_provider",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_ssl_client_cert_pw_file_provider",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -4184,7 +4185,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_server_trust_prompt_provider(PyObj
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_get_ssl_server_trust_prompt_provider",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_ssl_server_trust_prompt_provider",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_auth_ssl_server_trust_prompt_func_t) svn_swig_py_auth_ssl_server_trust_prompt_func;
     arg3 = obj0;
@@ -4243,7 +4244,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_prompt_provider(PyObje
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_get_ssl_client_cert_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_ssl_client_cert_prompt_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_auth_ssl_client_cert_prompt_func_t) svn_swig_py_auth_ssl_client_cert_prompt_func;
     arg3 = obj0;
@@ -4308,7 +4309,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_pw_prompt_provider(PyO
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_get_ssl_client_cert_pw_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_ssl_client_cert_pw_prompt_provider",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_auth_ssl_client_cert_pw_prompt_func_t) svn_swig_py_auth_ssl_client_cert_pw_prompt_func;
     arg3 = obj0;
@@ -4368,7 +4369,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist_item_dup(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_proplist_item_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_proplist_item_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4412,7 +4413,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_revision_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_info_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_info_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4439,7 +4440,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_revision_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_info_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_info_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4459,8 +4460,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_date_set(PyObject *SWIGUNUSE
   struct svn_client_commit_info_t *arg1 = (struct svn_client_commit_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_info_t_date_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_info_t_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4468,6 +4470,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_date_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_info_t_date_set", "date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->date) free((char *)arg1->date);
@@ -4488,7 +4494,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_date_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_info_t_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_info_t_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4508,8 +4514,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_author_set(PyObject *SWIGUNU
   struct svn_client_commit_info_t *arg1 = (struct svn_client_commit_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_info_t_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_info_t_author_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4517,6 +4524,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_author_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_info_t_author_set", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->author) free((char *)arg1->author);
@@ -4537,7 +4548,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_author_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_info_t_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_info_t_author_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4556,7 +4567,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_commit_info_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_client_commit_info_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_commit_info_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_commit_info_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4578,7 +4589,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_commit_info_t(PyObject *SWIGUNUSEDP
   struct svn_client_commit_info_t *arg1 = (struct svn_client_commit_info_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_commit_info_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_commit_info_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4602,7 +4613,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_commit_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_commit_info_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4612,8 +4623,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_path_set(PyObject *SWIGUNUS
   struct svn_client_commit_item3_t *arg1 = (struct svn_client_commit_item3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item3_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4621,6 +4633,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_path_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_item3_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -4641,7 +4657,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_path_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4663,7 +4679,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_kind_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4690,7 +4706,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_kind_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4710,8 +4726,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_url_set(PyObject *SWIGUNUSE
   struct svn_client_commit_item3_t *arg1 = (struct svn_client_commit_item3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item3_t_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4719,6 +4736,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_url_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_item3_t_url_set", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->url) free((char *)arg1->url);
@@ -4739,7 +4760,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_url_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4761,7 +4782,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_revision_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4788,7 +4809,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_revision_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4808,8 +4829,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_url_set(PyObject *
   struct svn_client_commit_item3_t *arg1 = (struct svn_client_commit_item3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_client_commit_item3_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_copyfrom_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4817,6 +4839,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_url_set(PyObject *
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_client_commit_item3_t_copyfrom_url_set", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_url) free((char *)arg1->copyfrom_url);
@@ -4837,7 +4863,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_url_get(PyObject *
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_copyfrom_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_copyfrom_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4859,7 +4885,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_rev_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4886,7 +4912,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_rev_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4908,7 +4934,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_state_flags_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_state_flags_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_state_flags_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4935,7 +4961,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_state_flags_get(PyObject *S
   PyObject * obj0 = 0 ;
   apr_byte_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_state_flags_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_state_flags_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4957,7 +4983,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_incoming_prop_changes_set(P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_incoming_prop_changes_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_incoming_prop_changes_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4984,7 +5010,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_incoming_prop_changes_get(P
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_incoming_prop_changes_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_incoming_prop_changes_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5007,7 +5033,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_outgoing_prop_changes_set(P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_outgoing_prop_changes_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_outgoing_prop_changes_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5034,7 +5060,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_outgoing_prop_changes_get(P
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_outgoing_prop_changes_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_outgoing_prop_changes_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5055,8 +5081,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_session_relpath_set(PyObjec
   struct svn_client_commit_item3_t *arg1 = (struct svn_client_commit_item3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item3_t_session_relpath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_session_relpath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5064,6 +5091,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_session_relpath_set(PyObjec
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_item3_t_session_relpath_set", "session_relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->session_relpath) free((char *)arg1->session_relpath);
@@ -5084,7 +5115,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_session_relpath_get(PyObjec
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_session_relpath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_session_relpath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5104,8 +5135,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_moved_from_abspath_set(PyOb
   struct svn_client_commit_item3_t *arg1 = (struct svn_client_commit_item3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item3_t_moved_from_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_moved_from_abspath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5113,6 +5145,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_moved_from_abspath_set(PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_item3_t_moved_from_abspath_set", "moved_from_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->moved_from_abspath) free((char *)arg1->moved_from_abspath);
@@ -5133,7 +5169,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_moved_from_abspath_get(PyOb
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_moved_from_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_t_moved_from_abspath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5152,7 +5188,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_commit_item3_t(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   struct svn_client_commit_item3_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_commit_item3_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_commit_item3_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -5174,7 +5210,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_commit_item3_t(PyObject *SWIGUNUSED
   struct svn_client_commit_item3_t *arg1 = (struct svn_client_commit_item3_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_commit_item3_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_commit_item3_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5198,7 +5234,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_commit_item3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_commit_item3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5208,8 +5244,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_path_set(PyObject *SWIGUNUS
   struct svn_client_commit_item2_t *arg1 = (struct svn_client_commit_item2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item2_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5217,6 +5254,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_path_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_item2_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -5237,7 +5278,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_path_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5259,7 +5300,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_kind_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5286,7 +5327,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_kind_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5306,8 +5347,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_url_set(PyObject *SWIGUNUSE
   struct svn_client_commit_item2_t *arg1 = (struct svn_client_commit_item2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item2_t_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5315,6 +5357,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_url_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_item2_t_url_set", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->url) free((char *)arg1->url);
@@ -5335,7 +5381,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_url_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5357,7 +5403,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_revision_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5384,7 +5430,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_revision_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5404,8 +5450,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_url_set(PyObject *
   struct svn_client_commit_item2_t *arg1 = (struct svn_client_commit_item2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_client_commit_item2_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_copyfrom_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5413,6 +5460,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_url_set(PyObject *
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_client_commit_item2_t_copyfrom_url_set", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_url) free((char *)arg1->copyfrom_url);
@@ -5433,7 +5484,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_url_get(PyObject *
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_copyfrom_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_copyfrom_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5455,7 +5506,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_rev_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5482,7 +5533,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_rev_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5504,7 +5555,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_state_flags_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_state_flags_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_state_flags_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5531,7 +5582,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_state_flags_get(PyObject *S
   PyObject * obj0 = 0 ;
   apr_byte_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_state_flags_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_state_flags_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5555,7 +5606,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_wcprop_changes_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_wcprop_changes_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_wcprop_changes_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5589,7 +5640,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_wcprop_changes_get(PyObject
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_wcprop_changes_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_t_wcprop_changes_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5609,7 +5660,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_commit_item2_t(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   struct svn_client_commit_item2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_commit_item2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_commit_item2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -5631,7 +5682,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_commit_item2_t(PyObject *SWIGUNUSED
   struct svn_client_commit_item2_t *arg1 = (struct svn_client_commit_item2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_commit_item2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_commit_item2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5655,7 +5706,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_commit_item2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_commit_item2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5665,8 +5716,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_path_set(PyObject *SWIGUNUSE
   struct svn_client_commit_item_t *arg1 = (struct svn_client_commit_item_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5674,6 +5726,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_path_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_item_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -5694,7 +5750,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_path_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5716,7 +5772,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_kind_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5743,7 +5799,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_kind_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5763,8 +5819,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_url_set(PyObject *SWIGUNUSED
   struct svn_client_commit_item_t *arg1 = (struct svn_client_commit_item_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item_t_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5772,6 +5829,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_url_set(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_commit_item_t_url_set", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->url) free((char *)arg1->url);
@@ -5792,7 +5853,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_url_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5814,7 +5875,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_revision_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5841,7 +5902,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_revision_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5861,8 +5922,9 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_copyfrom_url_set(PyObject *S
   struct svn_client_commit_item_t *arg1 = (struct svn_client_commit_item_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_client_commit_item_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_copyfrom_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5870,6 +5932,10 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_copyfrom_url_set(PyObject *S
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_client_commit_item_t_copyfrom_url_set", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_url) free((char *)arg1->copyfrom_url);
@@ -5890,7 +5956,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_copyfrom_url_get(PyObject *S
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_copyfrom_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_copyfrom_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5912,7 +5978,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_state_flags_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item_t_state_flags_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_state_flags_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5939,7 +6005,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_state_flags_get(PyObject *SW
   PyObject * obj0 = 0 ;
   apr_byte_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_state_flags_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_state_flags_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5963,7 +6029,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_wcprop_changes_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item_t_wcprop_changes_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_wcprop_changes_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5997,7 +6063,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_wcprop_changes_get(PyObject
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_wcprop_changes_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_t_wcprop_changes_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6017,7 +6083,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_commit_item_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_client_commit_item_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_commit_item_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_commit_item_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -6039,7 +6105,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_commit_item_t(PyObject *SWIGUNUSEDP
   struct svn_client_commit_item_t *arg1 = (struct svn_client_commit_item_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_commit_item_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_commit_item_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6063,7 +6129,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_commit_item_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_commit_item_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6080,7 +6146,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_create(PyObject *SWIGUNUSEDPA
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_client_commit_item3_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6126,7 +6192,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_create(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_client_commit_item_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6186,7 +6252,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_dup(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_commit_item3_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item3_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6237,7 +6303,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_dup(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_commit_item2_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit_item2_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6279,8 +6345,9 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_path_set(PyObject *SWIGUN
   struct svn_client_diff_summarize_t *arg1 = (struct svn_client_diff_summarize_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_diff_summarize_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6288,6 +6355,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_path_set(PyObject *SWIGUN
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff_summarize_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -6308,7 +6379,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_path_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_diff_summarize_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6330,7 +6401,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_summarize_kind_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_diff_summarize_t_summarize_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_t_summarize_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6357,7 +6428,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_summarize_kind_get(PyObje
   PyObject * obj0 = 0 ;
   svn_client_diff_summarize_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_diff_summarize_t_summarize_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_t_summarize_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6379,7 +6450,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_prop_changed_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_diff_summarize_t_prop_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_t_prop_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6406,7 +6477,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_prop_changed_get(PyObject
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_diff_summarize_t_prop_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_t_prop_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6428,7 +6499,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_node_kind_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_diff_summarize_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_t_node_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6455,7 +6526,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_node_kind_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_diff_summarize_t_node_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_t_node_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6474,7 +6545,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_diff_summarize_t(PyObject *SWIGUNUSEDP
   PyObject *resultobj = 0;
   struct svn_client_diff_summarize_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_diff_summarize_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_diff_summarize_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -6496,7 +6567,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_diff_summarize_t(PyObject *SWIGUNUS
   struct svn_client_diff_summarize_t *arg1 = (struct svn_client_diff_summarize_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_diff_summarize_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_diff_summarize_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6520,7 +6591,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_diff_summarize_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_diff_summarize_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6539,7 +6610,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_dup(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_diff_summarize_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6583,7 +6654,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_auth_baton_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_auth_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_auth_baton_set",2,2,&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()) {
@@ -6610,7 +6681,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_auth_baton_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_auth_baton_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_auth_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_auth_baton_get",1,1,&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()) {
@@ -6633,7 +6704,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_notify_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_notify_func_set",2,2,&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()) {
@@ -6662,7 +6733,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_wc_notify_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_notify_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_notify_func_get",1,1,&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()) {
@@ -6703,7 +6774,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_notify_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_notify_baton_set",2,2,&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()) {
@@ -6732,7 +6803,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_notify_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_notify_baton_get",1,1,&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()) {
@@ -6778,7 +6849,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_func_set",2,2,&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()) {
@@ -6807,7 +6878,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_client_get_commit_log_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_func_get",1,1,&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()) {
@@ -6848,7 +6919,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_baton_set",2,2,&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()) {
@@ -6877,7 +6948,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_baton_get",1,1,&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()) {
@@ -6925,7 +6996,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_config_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_config_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_config_set",2,2,&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()) {
@@ -6959,7 +7030,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_config_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_config_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_config_get",1,1,&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()) {
@@ -7000,7 +7071,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_func_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_cancel_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_cancel_func_set",2,2,&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()) {
@@ -7029,7 +7100,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_func_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_cancel_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_cancel_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_cancel_func_get",1,1,&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()) {
@@ -7070,7 +7141,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_baton_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_cancel_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_cancel_baton_set",2,2,&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()) {
@@ -7099,7 +7170,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_baton_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_cancel_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_cancel_baton_get",1,1,&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()) {
@@ -7145,7 +7216,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func2_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_notify_func2_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_notify_func2_set",2,2,&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()) {
@@ -7174,7 +7245,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func2_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_wc_notify_func2_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_notify_func2_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_notify_func2_get",1,1,&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()) {
@@ -7215,7 +7286,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton2_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_notify_baton2_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_notify_baton2_set",2,2,&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()) {
@@ -7244,7 +7315,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton2_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_notify_baton2_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_notify_baton2_get",1,1,&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()) {
@@ -7290,7 +7361,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func2_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_func2_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_func2_set",2,2,&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()) {
@@ -7319,7 +7390,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func2_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_client_get_commit_log2_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_func2_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_func2_get",1,1,&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()) {
@@ -7360,7 +7431,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton2_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_baton2_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_baton2_set",2,2,&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()) {
@@ -7389,7 +7460,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton2_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_baton2_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_baton2_get",1,1,&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()) {
@@ -7435,7 +7506,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_func_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_progress_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_progress_func_set",2,2,&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()) {
@@ -7464,7 +7535,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_func_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_ra_progress_notify_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_progress_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_progress_func_get",1,1,&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()) {
@@ -7505,7 +7576,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_baton_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_progress_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_progress_baton_set",2,2,&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()) {
@@ -7534,7 +7605,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_baton_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_progress_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_progress_baton_get",1,1,&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()) {
@@ -7580,7 +7651,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func3_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_func3_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_func3_set",2,2,&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()) {
@@ -7609,7 +7680,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func3_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_client_get_commit_log3_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_func3_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_func3_get",1,1,&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()) {
@@ -7650,7 +7721,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton3_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_baton3_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_baton3_set",2,2,&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()) {
@@ -7679,7 +7750,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton3_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_baton3_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_log_msg_baton3_get",1,1,&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()) {
@@ -7725,7 +7796,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_mimetypes_map_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_mimetypes_map_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_mimetypes_map_set",2,2,&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()) {
@@ -7752,7 +7823,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_mimetypes_map_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_mimetypes_map_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_mimetypes_map_get",1,1,&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()) {
@@ -7775,7 +7846,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_conflict_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_conflict_func_set",2,2,&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()) {
@@ -7804,7 +7875,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_wc_conflict_resolver_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_conflict_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_conflict_func_get",1,1,&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()) {
@@ -7845,7 +7916,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_conflict_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_conflict_baton_set",2,2,&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()) {
@@ -7874,7 +7945,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_conflict_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_conflict_baton_get",1,1,&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()) {
@@ -7918,8 +7989,9 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_client_name_set(PyObject *SWIGUNUSED
   struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_ctx_t_client_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_client_name_set",2,2,&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()) {
@@ -7927,6 +7999,10 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_client_name_set(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_ctx_t_client_name_set", "client_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->client_name) free((char *)arg1->client_name);
@@ -7947,7 +8023,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_client_name_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_client_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_client_name_get",1,1,&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()) {
@@ -7969,7 +8045,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func2_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_conflict_func2_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_conflict_func2_set",2,2,&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()) {
@@ -7998,7 +8074,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func2_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_wc_conflict_resolver_func2_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_conflict_func2_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_conflict_func2_get",1,1,&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()) {
@@ -8039,7 +8115,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton2_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_conflict_baton2_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_conflict_baton2_set",2,2,&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()) {
@@ -8068,7 +8144,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton2_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_conflict_baton2_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_conflict_baton2_get",1,1,&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()) {
@@ -8114,7 +8190,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_wc_ctx_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_wc_ctx_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_wc_ctx_set",2,2,&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()) {
@@ -8141,7 +8217,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_wc_ctx_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_wc_context_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_wc_ctx_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_wc_ctx_get",1,1,&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()) {
@@ -8164,7 +8240,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_check_tunnel_func_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_check_tunnel_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_check_tunnel_func_set",2,2,&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()) {
@@ -8193,7 +8269,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_check_tunnel_func_get(PyObject *SWIG
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_check_tunnel_func_get",1,1,&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()) {
@@ -8234,7 +8310,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_open_tunnel_func_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_open_tunnel_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_open_tunnel_func_set",2,2,&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()) {
@@ -8263,7 +8339,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_open_tunnel_func_get(PyObject *SWIGU
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_open_tunnel_func_get",1,1,&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()) {
@@ -8304,7 +8380,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_tunnel_baton_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_tunnel_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_tunnel_baton_set",2,2,&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()) {
@@ -8333,7 +8409,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_tunnel_baton_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_tunnel_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ctx_t_tunnel_baton_get",1,1,&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()) {
@@ -8376,7 +8452,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_ctx_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_client_ctx_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_ctx_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_ctx_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -8398,7 +8474,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_ctx_t(PyObject *SWIGUNUSEDPARM(self
   struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_ctx_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_ctx_t",1,1,&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()) {
@@ -8422,7 +8498,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_ctx_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_ctx_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8444,7 +8520,7 @@ SWIGINTERN PyObject *_wrap_svn_client_create_context2(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_create_context2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_create_context2",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8511,7 +8587,7 @@ SWIGINTERN PyObject *_wrap_svn_client_create_context(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_client_create_context",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_create_context",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -8580,7 +8656,7 @@ SWIGINTERN PyObject *_wrap_svn_client_args_to_target_array2(PyObject *SWIGUNUSED
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_args_to_target_array2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_args_to_target_array2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8668,7 +8744,7 @@ SWIGINTERN PyObject *_wrap_svn_client_args_to_target_array(PyObject *SWIGUNUSEDP
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_args_to_target_array",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_args_to_target_array",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8745,6 +8821,8 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout3(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -8759,7 +8837,15 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout3(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg10 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOOO|O:svn_client_checkout3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_checkout3",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_checkout3", "URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_checkout3", "path");
+    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()) {
@@ -8866,6 +8952,8 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout2(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -8879,7 +8967,15 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|O:svn_client_checkout2",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_checkout2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_checkout2", "URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_checkout2", "path");
+    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()) {
@@ -8978,6 +9074,8 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -8989,7 +9087,15 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_checkout",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_checkout",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_checkout", "URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_checkout", "path");
+    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()) {
@@ -9091,7 +9197,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update4(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg11 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO|O:svn_client_update4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_update4",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -9228,7 +9334,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update3(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_client_update3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_update3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -9349,7 +9455,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_client_update2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_update2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -9445,6 +9551,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -9456,7 +9563,11 @@ SWIGINTERN PyObject *_wrap_svn_client_update(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client_update",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_update",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_update", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -9543,6 +9654,8 @@ SWIGINTERN PyObject *_wrap_svn_client_switch3(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -9559,7 +9672,15 @@ SWIGINTERN PyObject *_wrap_svn_client_switch3(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg12 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_switch3",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_switch3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_switch3", "url");
+    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()) {
@@ -9680,6 +9801,8 @@ SWIGINTERN PyObject *_wrap_svn_client_switch2(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -9695,7 +9818,15 @@ SWIGINTERN PyObject *_wrap_svn_client_switch2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg11 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOOOO|O:svn_client_switch2",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_switch2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_switch2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_switch2", "url");
+    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()) {
@@ -9806,6 +9937,8 @@ SWIGINTERN PyObject *_wrap_svn_client_switch(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -9817,7 +9950,15 @@ SWIGINTERN PyObject *_wrap_svn_client_switch(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_switch",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_switch",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_switch", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_switch", "url");
+    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()) {
@@ -9895,6 +10036,7 @@ SWIGINTERN PyObject *_wrap_svn_client__layout_list(PyObject *SWIGUNUSEDPARM(self
   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 ;
@@ -9905,7 +10047,11 @@ SWIGINTERN PyObject *_wrap_svn_client__layout_list(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client__layout_list",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client__layout_list",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client__layout_list", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_client__layout_func_t * tmp =
     svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
@@ -9979,6 +10125,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add5(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *arg8 = (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 ;
@@ -9992,7 +10139,11 @@ SWIGINTERN PyObject *_wrap_svn_client_add5(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_client_add5",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_add5",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_add5", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_depth_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -10079,6 +10230,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add4(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -10091,7 +10243,11 @@ SWIGINTERN PyObject *_wrap_svn_client_add4(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_client_add4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_add4",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_add4", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_depth_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -10171,6 +10327,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add3(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -10182,7 +10339,11 @@ SWIGINTERN PyObject *_wrap_svn_client_add3(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_add3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_add3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_add3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -10255,6 +10416,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add2(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -10265,7 +10427,11 @@ SWIGINTERN PyObject *_wrap_svn_client_add2(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client_add2",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_add2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_add2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -10331,6 +10497,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *arg4 = (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 ;
@@ -10340,7 +10507,11 @@ SWIGINTERN PyObject *_wrap_svn_client_add(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_add",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_add",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_add", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -10415,7 +10586,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir4(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_client_mkdir4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mkdir4",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -10516,7 +10687,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir3(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_mkdir3",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mkdir3",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -10615,7 +10786,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir2(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_mkdir2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mkdir2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -10695,7 +10866,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_mkdir",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mkdir",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -10781,7 +10952,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete4(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_client_delete4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_delete4",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -10890,7 +11061,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete3(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_client_delete3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_delete3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -10997,7 +11168,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_delete2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_delete2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -11085,7 +11256,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_delete",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_delete",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -11169,6 +11340,8 @@ SWIGINTERN PyObject *_wrap_svn_client_import5(PyObject *SWIGUNUSEDPARM(self), Py
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -11185,7 +11358,15 @@ SWIGINTERN PyObject *_wrap_svn_client_import5(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg13 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOOOOOO|O:svn_client_import5",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_import5",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_import5", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_import5", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -11302,6 +11483,8 @@ SWIGINTERN PyObject *_wrap_svn_client_import4(PyObject *SWIGUNUSEDPARM(self), Py
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -11315,7 +11498,15 @@ SWIGINTERN PyObject *_wrap_svn_client_import4(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOOO|O:svn_client_import4",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_import4",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_import4", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_import4", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -11410,6 +11601,8 @@ SWIGINTERN PyObject *_wrap_svn_client_import3(PyObject *SWIGUNUSEDPARM(self), Py
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -11423,7 +11616,15 @@ SWIGINTERN PyObject *_wrap_svn_client_import3(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|O:svn_client_import3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_import3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_import3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_import3", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -11518,6 +11719,8 @@ SWIGINTERN PyObject *_wrap_svn_client_import2(PyObject *SWIGUNUSEDPARM(self), Py
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -11529,7 +11732,15 @@ SWIGINTERN PyObject *_wrap_svn_client_import2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_import2",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_import2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_import2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_import2", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -11604,6 +11815,8 @@ SWIGINTERN PyObject *_wrap_svn_client_import(PyObject *SWIGUNUSEDPARM(self), PyO
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_client_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -11614,7 +11827,15 @@ SWIGINTERN PyObject *_wrap_svn_client_import(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_client_import",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_import",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_import", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_import", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -11707,7 +11928,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit6(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg13 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOO|O:svn_client_commit6",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit6",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -11855,7 +12076,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit5(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg11 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO|O:svn_client_commit5",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit5",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -11989,7 +12210,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit4(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_client_commit4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit4",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -12113,7 +12334,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit3(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_commit3",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit3",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -12209,7 +12430,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_commit2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -12303,7 +12524,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_commit",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_commit",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -12377,7 +12598,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_kind_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12404,7 +12625,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_kind_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12424,8 +12645,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_local_abspath_set(PyObject *SWIGU
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_local_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_local_abspath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12433,6 +12655,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_local_abspath_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_local_abspath_set", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->local_abspath) free((char *)arg1->local_abspath);
@@ -12453,7 +12679,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_local_abspath_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_local_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_local_abspath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12475,7 +12701,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_filesize_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_filesize_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_filesize_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12497,7 +12723,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_filesize_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_filesize_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_filesize_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12519,7 +12745,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_versioned_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_versioned_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_versioned_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12546,7 +12772,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_versioned_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_versioned_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_versioned_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12568,7 +12794,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_conflicted_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_conflicted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_conflicted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12595,7 +12821,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_conflicted_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_conflicted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_conflicted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12617,7 +12843,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_node_status_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_node_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_node_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12644,7 +12870,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_node_status_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_node_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_node_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12666,7 +12892,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_text_status_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_text_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12693,7 +12919,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_text_status_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_text_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12715,7 +12941,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_prop_status_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_prop_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12742,7 +12968,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_prop_status_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_prop_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12764,7 +12990,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_wc_is_locked_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_wc_is_locked_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_wc_is_locked_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12791,7 +13017,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_wc_is_locked_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_wc_is_locked_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_wc_is_locked_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12813,7 +13039,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_copied_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_copied_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_copied_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12840,7 +13066,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_copied_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_copied_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_copied_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12860,8 +13086,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_root_url_set(PyObject *SWIG
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_repos_root_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_root_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12869,6 +13096,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_root_url_set(PyObject *SWIG
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_repos_root_url_set", "repos_root_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_root_url) free((char *)arg1->repos_root_url);
@@ -12889,7 +13120,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_root_url_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_root_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_root_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12909,8 +13140,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_uuid_set(PyObject *SWIGUNUS
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_repos_uuid_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_uuid_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12918,6 +13150,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_uuid_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_repos_uuid_set", "repos_uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_uuid) free((char *)arg1->repos_uuid);
@@ -12938,7 +13174,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_uuid_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_uuid_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_uuid_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12958,8 +13194,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_relpath_set(PyObject *SWIGU
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_repos_relpath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_relpath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12967,6 +13204,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_relpath_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_repos_relpath_set", "repos_relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_relpath) free((char *)arg1->repos_relpath);
@@ -12987,7 +13228,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_relpath_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_relpath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_relpath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13009,7 +13250,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_revision_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13036,7 +13277,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_revision_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13058,7 +13299,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_rev_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_changed_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_changed_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13085,7 +13326,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_rev_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_changed_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_changed_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13107,7 +13348,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_date_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_changed_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_changed_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13129,7 +13370,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_date_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_changed_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_changed_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13149,8 +13390,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_author_set(PyObject *SWIG
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_changed_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_changed_author_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13158,6 +13400,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_author_set(PyObject *SWIG
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_changed_author_set", "changed_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->changed_author) free((char *)arg1->changed_author);
@@ -13178,7 +13424,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_author_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_changed_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_changed_author_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13200,7 +13446,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_switched_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_switched_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_switched_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13227,7 +13473,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_switched_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_switched_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_switched_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13249,7 +13495,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_file_external_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_file_external_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_file_external_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13276,7 +13522,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_file_external_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_file_external_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_file_external_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13298,7 +13544,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_lock_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_lock_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_lock_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13325,7 +13571,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_lock_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_lock_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_lock_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13346,8 +13592,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changelist_set(PyObject *SWIGUNUS
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_changelist_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_changelist_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13355,6 +13602,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changelist_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_changelist_set", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->changelist) free((char *)arg1->changelist);
@@ -13375,7 +13626,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changelist_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_changelist_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_changelist_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13397,7 +13648,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_depth_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_depth_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_depth_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13424,7 +13675,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_depth_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_depth_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_depth_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_depth_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13446,7 +13697,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_kind_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_ood_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_ood_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13473,7 +13724,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_kind_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_ood_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_ood_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13495,7 +13746,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_node_status_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_repos_node_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_node_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13522,7 +13773,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_node_status_get(PyObject *S
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_node_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_node_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13544,7 +13795,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_text_status_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_repos_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_text_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13571,7 +13822,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_text_status_get(PyObject *S
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_text_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13593,7 +13844,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_prop_status_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_repos_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_prop_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13620,7 +13871,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_prop_status_get(PyObject *S
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_prop_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13642,7 +13893,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_lock_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_repos_lock_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_lock_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13669,7 +13920,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_lock_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_lock_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_repos_lock_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13692,7 +13943,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_rev_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_ood_changed_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_ood_changed_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13719,7 +13970,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_rev_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_ood_changed_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_ood_changed_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13741,7 +13992,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_date_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_ood_changed_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_ood_changed_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13763,7 +14014,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_date_get(PyObject *SW
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_ood_changed_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_ood_changed_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13783,8 +14034,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_author_set(PyObject *
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_ood_changed_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_ood_changed_author_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13792,6 +14044,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_author_set(PyObject *
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_ood_changed_author_set", "ood_changed_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->ood_changed_author) free((char *)arg1->ood_changed_author);
@@ -13812,7 +14068,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_author_get(PyObject *
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_ood_changed_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_ood_changed_author_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13834,7 +14090,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_backwards_compatibility_baton_set
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_backwards_compatibility_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_backwards_compatibility_baton_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13863,7 +14119,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_backwards_compatibility_baton_get
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_backwards_compatibility_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_backwards_compatibility_baton_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13907,8 +14163,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_from_abspath_set(PyObject *
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_moved_from_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_moved_from_abspath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13916,6 +14173,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_from_abspath_set(PyObject *
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_moved_from_abspath_set", "moved_from_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->moved_from_abspath) free((char *)arg1->moved_from_abspath);
@@ -13936,7 +14197,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_from_abspath_get(PyObject *
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_moved_from_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_moved_from_abspath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13956,8 +14217,9 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_to_abspath_set(PyObject *SW
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_moved_to_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_moved_to_abspath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13965,6 +14227,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_to_abspath_set(PyObject *SW
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status_t_moved_to_abspath_set", "moved_to_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->moved_to_abspath) free((char *)arg1->moved_to_abspath);
@@ -13985,7 +14251,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_to_abspath_get(PyObject *SW
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_moved_to_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_t_moved_to_abspath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14004,7 +14270,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_status_t(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   struct svn_client_status_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_status_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_status_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -14026,7 +14292,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_status_t(PyObject *SWIGUNUSEDPARM(s
   struct svn_client_status_t *arg1 = (struct svn_client_status_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_status_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_status_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14050,7 +14316,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_status_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_status_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -14069,7 +14335,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_dup(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_status_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14128,6 +14394,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status6(PyObject *SWIGUNUSEDPARM(self), Py
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -14139,7 +14406,6 @@ SWIGINTERN PyObject *_wrap_svn_client_status6(PyObject *SWIGUNUSEDPARM(self), Py
   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,
@@ -14147,7 +14413,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status6(PyObject *SWIGUNUSEDPARM(self), Py
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status6",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) 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()) {
@@ -14155,6 +14421,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status6(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status6", "path");
+    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;
@@ -14212,26 +14482,14 @@ SWIGINTERN PyObject *_wrap_svn_client_status6(PyObject *SWIGUNUSEDPARM(self), Py
     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();
-    }
+    arg13 = (svn_client_status_func_t) svn_swig_py_client_status_func;
+    arg14 = obj11;
   }
-  if (obj13) {
+  if (obj12) {
     /* 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);
+    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;
     }
   }
@@ -14298,6 +14556,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status5(PyObject *SWIGUNUSEDPARM(self), Py
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -14308,7 +14567,6 @@ SWIGINTERN PyObject *_wrap_svn_client_status5(PyObject *SWIGUNUSEDPARM(self), Py
   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,
@@ -14316,7 +14574,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status5(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg14 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status5",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) 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()) {
@@ -14324,6 +14582,10 @@ SWIGINTERN PyObject *_wrap_svn_client_status5(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_status5", "path");
+    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;
@@ -14375,26 +14637,14 @@ SWIGINTERN PyObject *_wrap_svn_client_status5(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_fail;
   }
   {
-    svn_client_status_func_t * tmp =
-    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;
-    }
-    arg12 = *tmp;
-  }
-  {
-    if (obj11 == Py_None) {
-      arg13 = NULL;
-    } else if (SWIG_ConvertPtr(obj11, (void **) &arg13, 0, 0) == -1) {
-      arg13 = (void *) obj11;
-      PyErr_Clear();
-    }
+    arg12 = (svn_client_status_func_t) svn_swig_py_client_status_func;
+    arg13 = obj10;
   }
-  if (obj12) {
+  if (obj11) {
     /* 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);
+    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;
     }
   }
@@ -14459,6 +14709,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status4(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -14477,7 +14728,11 @@ SWIGINTERN PyObject *_wrap_svn_client_status4(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg13 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status4",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_status4", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -14614,6 +14869,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status3(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -14631,7 +14887,11 @@ SWIGINTERN PyObject *_wrap_svn_client_status3(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg13 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status3",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_status3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -14755,6 +15015,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status2(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -14771,7 +15032,11 @@ SWIGINTERN PyObject *_wrap_svn_client_status2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg12 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOO|O:svn_client_status2",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_status2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -14885,6 +15150,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -14900,7 +15166,11 @@ SWIGINTERN PyObject *_wrap_svn_client_status(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg11 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_client_status",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_status",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_status", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -15019,7 +15289,7 @@ SWIGINTERN PyObject *_wrap_svn_client_log5(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO|O:svn_client_log5",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_log5",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -15167,7 +15437,7 @@ SWIGINTERN PyObject *_wrap_svn_client_log4(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg13 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOO|O:svn_client_log4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_log4",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -15313,7 +15583,7 @@ SWIGINTERN PyObject *_wrap_svn_client_log3(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg11 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO|O:svn_client_log3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_log3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -15442,7 +15712,7 @@ SWIGINTERN PyObject *_wrap_svn_client_log2(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_client_log2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_log2",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -15558,7 +15828,7 @@ SWIGINTERN PyObject *_wrap_svn_client_log(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_client_log",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_log",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -15662,6 +15932,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame6(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = SWIG_TMPOBJ ;
   svn_revnum_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -15680,7 +15951,11 @@ SWIGINTERN PyObject *_wrap_svn_client_blame6(PyObject *SWIGUNUSEDPARM(self), PyO
   arg13 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_client_blame6",&arg3,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_blame6",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_blame6", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -15810,6 +16085,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame5(PyObject *SWIGUNUSEDPARM(self), PyO
   apr_pool_t *arg11 = (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 ;
@@ -15826,7 +16102,11 @@ SWIGINTERN PyObject *_wrap_svn_client_blame5(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_blame5",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_blame5", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -15944,6 +16224,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame4(PyObject *SWIGUNUSEDPARM(self), PyO
   apr_pool_t *arg11 = (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 ;
@@ -15960,7 +16241,11 @@ SWIGINTERN PyObject *_wrap_svn_client_blame4(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_blame4",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_blame4", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -16077,6 +16362,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame3(PyObject *SWIGUNUSEDPARM(self), PyO
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -16091,7 +16377,11 @@ SWIGINTERN PyObject *_wrap_svn_client_blame3(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_client_blame3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_blame3",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_blame3", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -16188,6 +16478,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame2(PyObject *SWIGUNUSEDPARM(self), PyO
   apr_pool_t *arg8 = (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 ;
@@ -16200,7 +16491,11 @@ SWIGINTERN PyObject *_wrap_svn_client_blame2(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_client_blame2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_blame2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_blame2", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -16284,6 +16579,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -16295,7 +16591,11 @@ SWIGINTERN PyObject *_wrap_svn_client_blame(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_blame",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_blame",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_blame", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -16384,8 +16684,11 @@ SWIGINTERN PyObject *_wrap_svn_client_diff7(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -16396,6 +16699,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff7(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
   PyObject * obj15 = 0 ;
+  PyObject * obj16 = 0 ;
   PyObject * obj17 = 0 ;
   PyObject * obj18 = 0 ;
   PyObject * obj19 = 0 ;
@@ -16407,7 +16711,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff7(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg22 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOOOOOOOsOOOO|O:svn_client_diff7",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&arg17,&obj17,&obj18,&obj19,&obj20,&obj21)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff7",21,22,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18,&obj19,&obj20,&obj21)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -16418,18 +16722,30 @@ SWIGINTERN PyObject *_wrap_svn_client_diff7(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff7", "path_or_url1");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_diff7", "path_or_url2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj5, TRUE, "svn_client_diff7", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -16490,6 +16806,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff7(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg17 = svn_swig_py_string_to_cstring(obj16, FALSE, "svn_client_diff7", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj17 == Py_None) {
       arg18 = NULL;
     }
@@ -16591,8 +16911,11 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -16602,6 +16925,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
+  PyObject * obj15 = 0 ;
   PyObject * obj16 = 0 ;
   PyObject * obj17 = 0 ;
   PyObject * obj18 = 0 ;
@@ -16613,7 +16937,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg21 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOOOOOOsOOOO|O:svn_client_diff6",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&arg16,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff6",20,21,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -16624,18 +16948,30 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff6", "path_or_url1");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_diff6", "path_or_url2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj5, TRUE, "svn_client_diff6", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -16690,6 +17026,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg16 = svn_swig_py_string_to_cstring(obj15, FALSE, "svn_client_diff6", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj16 == Py_None) {
       arg17 = NULL;
     }
@@ -16788,14 +17128,18 @@ SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
+  PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
   PyObject * obj15 = 0 ;
@@ -16807,7 +17151,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg18 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOOOsOOOO|O:svn_client_diff5",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&arg13,&obj13,&obj14,&obj15,&obj16,&obj17)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff5",17,18,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -16818,18 +17162,30 @@ SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff5", "path1");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_diff5", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj5, TRUE, "svn_client_diff5", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -16866,6 +17222,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg13 = svn_swig_py_string_to_cstring(obj12, FALSE, "svn_client_diff5", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg14 = svn_swig_py_make_file(obj13, _global_pool);
     if (!arg14) SWIG_fail;
   }
@@ -16948,12 +17308,16 @@ SWIGINTERN PyObject *_wrap_svn_client_diff4(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
@@ -16965,7 +17329,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff4(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg16 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOsOOOO|O:svn_client_diff4",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&arg11,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff4",15,16,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -16976,18 +17340,30 @@ SWIGINTERN PyObject *_wrap_svn_client_diff4(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff4", "path1");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_diff4", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj5, TRUE, "svn_client_diff4", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -17012,6 +17388,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff4(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg11 = svn_swig_py_string_to_cstring(obj10, FALSE, "svn_client_diff4", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg12 = svn_swig_py_make_file(obj11, _global_pool);
     if (!arg12) SWIG_fail;
   }
@@ -17092,12 +17472,15 @@ SWIGINTERN PyObject *_wrap_svn_client_diff3(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
   PyObject * obj12 = 0 ;
@@ -17108,7 +17491,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff3(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg14 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOOOOOsOOO|O:svn_client_diff3",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&arg10,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff3",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -17119,12 +17502,20 @@ SWIGINTERN PyObject *_wrap_svn_client_diff3(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff3", "path1");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_diff3", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -17155,6 +17546,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_client_diff3", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg11 = svn_swig_py_make_file(obj10, _global_pool);
     if (!arg11) SWIG_fail;
   }
@@ -17225,7 +17620,9 @@ SWIGINTERN PyObject *_wrap_svn_client_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -17241,7 +17638,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg13 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOOOOOOOO|O:svn_client_diff2",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff2",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -17252,12 +17649,20 @@ SWIGINTERN PyObject *_wrap_svn_client_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff2", "path1");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_diff2", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -17357,7 +17762,9 @@ SWIGINTERN PyObject *_wrap_svn_client_diff(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -17372,7 +17779,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOOOOOOO|O:svn_client_diff",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -17383,12 +17790,20 @@ SWIGINTERN PyObject *_wrap_svn_client_diff(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff", "path1");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_diff", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -17492,9 +17907,11 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg7(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -17505,6 +17922,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg7(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
   PyObject * obj15 = 0 ;
+  PyObject * obj16 = 0 ;
   PyObject * obj17 = 0 ;
   PyObject * obj18 = 0 ;
   PyObject * obj19 = 0 ;
@@ -17516,7 +17934,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg7(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg22 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOOOOOOOsOOOO|O:svn_client_diff_peg7",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&arg17,&obj17,&obj18,&obj19,&obj20,&obj21)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_peg7",21,22,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18,&obj19,&obj20,&obj21)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -17527,6 +17945,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg7(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff_peg7", "path_or_url");
+    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;
@@ -17545,6 +17967,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg7(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_client_diff_peg7", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -17605,6 +18031,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg7(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg17 = svn_swig_py_string_to_cstring(obj16, FALSE, "svn_client_diff_peg7", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj17 == Py_None) {
       arg18 = NULL;
     }
@@ -17711,9 +18141,11 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -17723,6 +18155,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
+  PyObject * obj15 = 0 ;
   PyObject * obj16 = 0 ;
   PyObject * obj17 = 0 ;
   PyObject * obj18 = 0 ;
@@ -17734,7 +18167,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg21 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOOOOOOsOOOO|O:svn_client_diff_peg6",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&arg16,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_peg6",20,21,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -17745,6 +18178,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff_peg6", "path_or_url");
+    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;
@@ -17763,6 +18200,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_client_diff_peg6", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -17817,6 +18258,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg16 = svn_swig_py_string_to_cstring(obj15, FALSE, "svn_client_diff_peg6", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj16 == Py_None) {
       arg17 = NULL;
     }
@@ -17920,15 +18365,18 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self),
   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 ;
+  PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
   PyObject * obj15 = 0 ;
@@ -17940,7 +18388,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg18 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOOOsOOOO|O:svn_client_diff_peg5",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&arg13,&obj13,&obj14,&obj15,&obj16,&obj17)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_peg5",17,18,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -17951,6 +18399,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff_peg5", "path");
+    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;
@@ -17969,6 +18421,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_client_diff_peg5", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -18005,6 +18461,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg13 = svn_swig_py_string_to_cstring(obj12, FALSE, "svn_client_diff_peg5", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg14 = svn_swig_py_make_file(obj13, _global_pool);
     if (!arg14) SWIG_fail;
   }
@@ -18092,13 +18552,16 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg4(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
@@ -18110,7 +18573,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg4(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg16 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOsOOOO|O:svn_client_diff_peg4",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&arg11,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_peg4",15,16,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -18121,6 +18584,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg4(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff_peg4", "path");
+    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;
@@ -18139,6 +18606,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg4(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_client_diff_peg4", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -18163,6 +18634,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg4(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg11 = svn_swig_py_string_to_cstring(obj10, FALSE, "svn_client_diff_peg4", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg12 = svn_swig_py_make_file(obj11, _global_pool);
     if (!arg12) SWIG_fail;
   }
@@ -18248,6 +18723,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg3(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -18255,6 +18731,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg3(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
   PyObject * obj10 = 0 ;
   PyObject * obj11 = 0 ;
   PyObject * obj12 = 0 ;
@@ -18265,7 +18742,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg3(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg14 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOsOOO|O:svn_client_diff_peg3",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&arg10,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_peg3",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -18276,6 +18753,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg3(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff_peg3", "path");
+    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;
@@ -18318,6 +18799,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_client_diff_peg3", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg11 = svn_swig_py_make_file(obj10, _global_pool);
     if (!arg11) SWIG_fail;
   }
@@ -18393,6 +18878,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -18410,7 +18896,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg13 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOOOO|O:svn_client_diff_peg2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_peg2",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -18421,6 +18907,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg2(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff_peg2", "path");
+    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;
@@ -18537,6 +19027,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
@@ -18553,7 +19044,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOOO|O:svn_client_diff_peg",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_peg",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -18564,6 +19055,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_diff_peg", "path");
+    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;
@@ -18672,7 +19167,9 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize2(PyObject *SWIGUNUSEDPARM(s
   apr_pool_t *arg11 = (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 ;
@@ -18687,7 +19184,11 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize2(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize2",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_diff_summarize2", "path_or_url1");
+    if (PyErr_Occurred()) 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()) {
@@ -18695,6 +19196,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize2(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_diff_summarize2", "path_or_url2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -18796,7 +19301,9 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize(PyObject *SWIGUNUSEDPARM(se
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -18810,7 +19317,11 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_diff_summarize", "path1");
+    if (PyErr_Occurred()) 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()) {
@@ -18818,6 +19329,10 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_diff_summarize", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -18911,6 +19426,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg2(PyObject *SWIGUNUSEDPA
   apr_pool_t *arg11 = (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 ;
@@ -18927,7 +19443,11 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg2(PyObject *SWIGUNUSEDPA
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_peg2",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_diff_summarize_peg2", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -19047,6 +19567,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg(PyObject *SWIGUNUSEDPAR
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -19062,7 +19583,11 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_diff_summarize_peg",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_diff_summarize_peg", "path");
+    if (PyErr_Occurred()) 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()) {
@@ -19195,7 +19720,9 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
   svn_revnum_t temp9 ;
   int res9 = SWIG_TMPOBJ ;
   char *temp10 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -19220,7 +19747,11 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
   arg8 = &temp8;
   arg9 = &temp9;
   arg10 = &temp10;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOO|OO:svn_client_get_merging_summary",&arg11,&obj1,&arg13,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_merging_summary",5,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_get_merging_summary", "source_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg12 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -19228,6 +19759,10 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg13 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_get_merging_summary", "target_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -19287,7 +19822,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -19306,7 +19841,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg4);
+      s = PyBytes_FromString(*arg4);
       if (s == NULL)
       SWIG_fail;
     }
@@ -19325,7 +19860,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg6);
+      s = PyBytes_FromString(*arg6);
       if (s == NULL)
       SWIG_fail;
     }
@@ -19344,7 +19879,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg8);
+      s = PyBytes_FromString(*arg8);
       if (s == NULL)
       SWIG_fail;
     }
@@ -19363,7 +19898,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg10);
+      s = PyBytes_FromString(*arg10);
       if (s == NULL)
       SWIG_fail;
     }
@@ -19406,8 +19941,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge5(PyObject *SWIGUNUSEDPARM(self), PyO
   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 * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -19424,7 +19962,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge5(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge5",14,15,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge5", "source1");
+    if (PyErr_Occurred()) 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()) {
@@ -19432,12 +19974,20 @@ SWIGINTERN PyObject *_wrap_svn_client_merge5(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_merge5", "source2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj4, FALSE, "svn_client_merge5", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -19548,8 +20098,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge4(PyObject *SWIGUNUSEDPARM(self), PyO
   apr_pool_t *arg14 = (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 ;
@@ -19565,7 +20118,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge4(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge4",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge4", "source1");
+    if (PyErr_Occurred()) 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()) {
@@ -19573,12 +20130,20 @@ SWIGINTERN PyObject *_wrap_svn_client_merge4(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_merge4", "source2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj4, FALSE, "svn_client_merge4", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -19682,8 +20247,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge3(PyObject *SWIGUNUSEDPARM(self), PyO
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -19698,7 +20266,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge3(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge3",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge3", "source1");
+    if (PyErr_Occurred()) 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()) {
@@ -19706,12 +20278,20 @@ SWIGINTERN PyObject *_wrap_svn_client_merge3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_merge3", "source2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj4, FALSE, "svn_client_merge3", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -19808,8 +20388,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge2(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -19823,7 +20406,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge2(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge2",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge2", "source1");
+    if (PyErr_Occurred()) 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()) {
@@ -19831,12 +20418,20 @@ SWIGINTERN PyObject *_wrap_svn_client_merge2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_merge2", "source2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj4, FALSE, "svn_client_merge2", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -19926,8 +20521,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *arg11 = (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 ;
@@ -19940,7 +20538,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge", "source1");
+    if (PyErr_Occurred()) 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()) {
@@ -19948,12 +20550,20 @@ SWIGINTERN PyObject *_wrap_svn_client_merge(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_merge", "source2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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_string_to_cstring(obj4, FALSE, "svn_client_merge", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -20033,7 +20643,9 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_reintegrate(PyObject *SWIGUNUSEDPARM
   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 ;
@@ -20044,7 +20656,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_reintegrate(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOOO|O:svn_client_merge_reintegrate",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge_reintegrate",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge_reintegrate", "source_path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -20052,6 +20668,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_reintegrate(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_merge_reintegrate", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -20126,8 +20746,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg5(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *arg14 = (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 ;
@@ -20144,7 +20766,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg5(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg14 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOsOOOOOOOOO|O:svn_client_merge_peg5",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge_peg5",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge_peg5", "source_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj1,
       sizeof(const svn_opt_revision_range_t *),
@@ -20162,6 +20788,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg5(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_client_merge_peg5", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_depth_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -20271,8 +20901,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg4(PyObject *SWIGUNUSEDPARM(self),
   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 * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -20288,7 +20920,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg4(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg13 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOsOOOOOOOO|O:svn_client_merge_peg4",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge_peg4",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge_peg4", "source_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj1,
       sizeof(const svn_opt_revision_range_t *),
@@ -20306,6 +20942,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg4(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_client_merge_peg4", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_depth_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -20408,8 +21048,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg3(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -20424,7 +21066,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg3(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOsOOOOOOO|O:svn_client_merge_peg3",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge_peg3",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge_peg3", "source");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj1,
       sizeof(const svn_opt_revision_range_t *),
@@ -20442,6 +21088,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_client_merge_peg3", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_depth_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -20543,9 +21193,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -20559,7 +21211,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge_peg2",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge_peg2", "source");
+    if (PyErr_Occurred()) 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()) {
@@ -20579,6 +21235,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_client_merge_peg2", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -20673,9 +21333,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *arg11 = (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 ;
@@ -20688,7 +21350,11 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_merge_peg",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_merge_peg", "source");
+    if (PyErr_Occurred()) 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()) {
@@ -20708,6 +21374,10 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_client_merge_peg", "target_wcpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -20791,6 +21461,7 @@ SWIGINTERN PyObject *_wrap_svn_client_suggest_merge_sources(PyObject *SWIGUNUSED
   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 ;
@@ -20801,7 +21472,11 @@ SWIGINTERN PyObject *_wrap_svn_client_suggest_merge_sources(PyObject *SWIGUNUSED
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_suggest_merge_sources",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_suggest_merge_sources",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_suggest_merge_sources", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -20871,6 +21546,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_get_merged(PyObject *SWIGUNUSEDP
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -20881,7 +21557,11 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_get_merged(PyObject *SWIGUNUSEDP
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_mergeinfo_get_merged",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mergeinfo_get_merged",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_mergeinfo_get_merged", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -20968,7 +21648,9 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log2(PyObject *SWIGUNUSEDPARM(se
   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 ;
@@ -20984,7 +21666,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log2(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg14 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOOOOOOOO|O:svn_client_mergeinfo_log2",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mergeinfo_log2",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg1 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -20992,12 +21674,20 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_mergeinfo_log2", "target_path_or_url");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_mergeinfo_log2", "source_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -21102,7 +21792,9 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log(PyObject *SWIGUNUSEDPARM(sel
   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 ;
@@ -21116,7 +21808,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOOOOOO|O:svn_client_mergeinfo_log",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mergeinfo_log",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     arg1 = (svn_boolean_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -21124,12 +21816,20 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_mergeinfo_log", "target_path_or_url");
+    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_swig_py_string_to_cstring(obj3, FALSE, "svn_client_mergeinfo_log", "source_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -21219,7 +21919,9 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_merged(PyObject *SWIGUNUSEDP
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -21232,7 +21934,11 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_merged(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mergeinfo_log_merged",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_mergeinfo_log_merged", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -21240,6 +21946,10 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_merged(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_mergeinfo_log_merged", "merge_source_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -21328,7 +22038,9 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_eligible(PyObject *SWIGUNUSE
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -21341,7 +22053,11 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_eligible(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_mergeinfo_log_eligible",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_mergeinfo_log_eligible", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -21349,6 +22065,10 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_eligible(PyObject *SWIGUNUSE
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_mergeinfo_log_eligible", "merge_source_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -21435,6 +22155,7 @@ SWIGINTERN PyObject *_wrap_svn_client_vacuum(PyObject *SWIGUNUSEDPARM(self), PyO
   apr_pool_t *arg8 = (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 ;
@@ -21448,7 +22169,11 @@ SWIGINTERN PyObject *_wrap_svn_client_vacuum(PyObject *SWIGUNUSEDPARM(self), PyO
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_vacuum",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_vacuum", "dir_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -21536,6 +22261,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cleanup2(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *arg8 = (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 ;
@@ -21549,7 +22275,11 @@ SWIGINTERN PyObject *_wrap_svn_client_cleanup2(PyObject *SWIGUNUSEDPARM(self), P
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_cleanup2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_cleanup2", "dir_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -21632,6 +22362,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cleanup(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -21640,7 +22371,11 @@ SWIGINTERN PyObject *_wrap_svn_client_cleanup(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_cleanup",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_cleanup",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_cleanup", "dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -21693,6 +22428,7 @@ SWIGINTERN PyObject *_wrap_svn_client_upgrade(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -21701,7 +22437,11 @@ SWIGINTERN PyObject *_wrap_svn_client_upgrade(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_upgrade",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_upgrade",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_upgrade", "wcroot_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -21757,6 +22497,9 @@ SWIGINTERN PyObject *_wrap_svn_client_relocate2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   PyObject * obj5 = 0 ;
@@ -21766,7 +22509,19 @@ SWIGINTERN PyObject *_wrap_svn_client_relocate2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sssOO|O:svn_client_relocate2",&arg1,&arg2,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_relocate2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_relocate2", "wcroot_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_relocate2", "from_prefix");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_relocate2", "to_prefix");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
@@ -21828,6 +22583,9 @@ SWIGINTERN PyObject *_wrap_svn_client_relocate(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   PyObject * obj5 = 0 ;
@@ -21837,7 +22595,19 @@ SWIGINTERN PyObject *_wrap_svn_client_relocate(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sssOO|O:svn_client_relocate",&arg1,&arg2,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_relocate",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_relocate", "dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_relocate", "from_prefix");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_relocate", "to_prefix");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
@@ -21915,7 +22685,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revert4(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_client_revert4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_revert4",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -22027,7 +22797,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revert3(PyObject *SWIGUNUSEDPARM(self), Py
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_revert3",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -22129,7 +22899,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revert2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_revert2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_revert2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -22217,7 +22987,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revert(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_revert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_revert",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -22286,7 +23056,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_merged_propval(PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_conflict_option_set_merged_propval",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_set_merged_propval",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -22297,12 +23067,16 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_merged_propval(PyObjec
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -22344,7 +23118,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_repos_relpath
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_option_get_moved_to_repos_relpath_candidates2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_get_moved_to_repos_relpath_candidates2",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -22387,13 +23161,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_repos_relpath
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 is not implemented yet");
-    
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_array_to_list(*arg1));
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -22436,7 +23204,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_repos_relpath
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_option_get_moved_to_repos_relpath_candidates",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_get_moved_to_repos_relpath_candidates",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -22479,13 +23247,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_repos_relpath
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates is not implemented yet");
-    
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_array_to_list(*arg1));
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -22523,7 +23285,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_moved_to_repos_relpath
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_option_set_moved_to_repos_relpath2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_set_moved_to_repos_relpath2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -22599,7 +23361,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_moved_to_repos_relpath
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_option_set_moved_to_repos_relpath",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_set_moved_to_repos_relpath",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -22680,7 +23442,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_abspath_candi
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_option_get_moved_to_abspath_candidates2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_get_moved_to_abspath_candidates2",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -22723,13 +23485,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_abspath_candi
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates2 arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates2 is not implemented yet");
-    
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_array_to_list(*arg1));
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -22772,7 +23528,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_abspath_candi
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_option_get_moved_to_abspath_candidates",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_get_moved_to_abspath_candidates",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -22815,13 +23571,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_abspath_candi
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates is not implemented yet");
-    
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_array_to_list(*arg1));
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -22859,7 +23609,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_moved_to_abspath2(PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_option_set_moved_to_abspath2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_set_moved_to_abspath2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -22935,7 +23685,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_moved_to_abspath(PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_option_set_moved_to_abspath",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_set_moved_to_abspath",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23001,7 +23751,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_find_by_id(PyObject *SWIGU
   PyObject * obj1 = 0 ;
   svn_client_conflict_option_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_conflict_option_find_by_id",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_find_by_id",2,2,&obj0,&obj1)) 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()) {
@@ -23040,6 +23790,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_client_conflict_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -23054,7 +23805,11 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_conflict_get",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_conflict_get", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -23097,13 +23852,10 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_get arg 1 (svn_client_conflict_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_get is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_conflict_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -23133,6 +23885,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_walk(PyObject *SWIGUNUSEDPARM(sel
   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 ;
@@ -23144,7 +23897,11 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_walk(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_conflict_walk",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_walk",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_conflict_walk", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_depth_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -23243,7 +24000,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_conflicted(PyObject *SWIGUNUS
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_get_conflicted",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_conflicted",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg4 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23292,13 +24049,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_conflicted(PyObject *SWIGUNUS
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags));
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_get_conflicted arg 2 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_get_conflicted is not implemented yet");
-    
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_array_to_list(*arg2));
   }
   if (SWIG_IsTmpObj(res3)) {
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
@@ -23347,7 +24098,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_description(PyObject *SW
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_prop_get_description",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_prop_get_description",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23396,7 +24147,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_description(PyObject *SW
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23448,7 +24199,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_get_description(PyObject *SW
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_client_conflict_tree_get_description",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_tree_get_description",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg3 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23503,7 +24254,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_get_description(PyObject *SW
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23516,7 +24267,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_get_description(PyObject *SW
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -23565,7 +24316,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_resolution_options(PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_client_conflict_text_get_resolution_options",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_text_get_resolution_options",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23614,13 +24365,17 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_resolution_options(PyObj
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_text_get_resolution_options arg 1 (apr_array_header_t **) */
-    
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_pointerlist_to_list(*arg1,
+        SWIGTYPE_p_svn_client_conflict_option_t,
+        _global_py_pool))
     
     
     
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_text_get_resolution_options is not implemented yet");
     
+    ;
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -23665,7 +24420,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_resolution_options(PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_client_conflict_prop_get_resolution_options",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_prop_get_resolution_options",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23714,13 +24469,17 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_resolution_options(PyObj
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_prop_get_resolution_options arg 1 (apr_array_header_t **) */
-    
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_pointerlist_to_list(*arg1,
+        SWIGTYPE_p_svn_client_conflict_option_t,
+        _global_py_pool))
     
     
     
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_prop_get_resolution_options is not implemented yet");
     
+    ;
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -23765,7 +24524,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_get_resolution_options(PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_client_conflict_tree_get_resolution_options",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_tree_get_resolution_options",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23814,13 +24573,17 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_get_resolution_options(PyObj
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_tree_get_resolution_options arg 1 (apr_array_header_t **) */
-    
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_pointerlist_to_list(*arg1,
+        SWIGTYPE_p_svn_client_conflict_option_t,
+        _global_py_pool))
     
     
     
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_tree_get_resolution_options is not implemented yet");
     
+    ;
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -23856,7 +24619,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_get_details(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_conflict_tree_get_details",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_tree_get_details",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23914,7 +24677,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_id(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_client_conflict_option_id_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_option_get_id",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_get_id",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -23950,7 +24713,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_label(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_conflict_option_get_label",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_get_label",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24000,7 +24763,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_description(PyObject *
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_conflict_option_get_description",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_option_get_description",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24042,7 +24805,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_recommended_option_id(PyObjec
   PyObject * obj0 = 0 ;
   svn_client_conflict_option_id_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_get_recommended_option_id",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_recommended_option_id",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24070,7 +24833,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_local_abspath(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_get_local_abspath",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_local_abspath",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24098,7 +24861,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_operation(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_wc_operation_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_get_operation",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_operation",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24126,7 +24889,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_incoming_change(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_wc_conflict_action_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_get_incoming_change",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_incoming_change",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24154,7 +24917,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_local_change(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_wc_conflict_reason_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_get_local_change",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_local_change",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24202,7 +24965,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_repos_info(PyObject *SWIGUNUS
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_get_repos_info",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_repos_info",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg3 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24251,7 +25014,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_repos_info(PyObject *SWIGUNUS
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24264,7 +25027,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_repos_info(PyObject *SWIGUNUS
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24319,7 +25082,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_incoming_old_repos_location(P
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_get_incoming_old_repos_location",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_incoming_old_repos_location",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg4 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24368,7 +25131,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_incoming_old_repos_location(P
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24435,7 +25198,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_incoming_new_repos_location(P
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_get_incoming_new_repos_location",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_get_incoming_new_repos_location",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg4 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24484,7 +25247,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_get_incoming_new_repos_location(P
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24526,7 +25289,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_get_victim_node_kind(PyObjec
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_tree_get_victim_node_kind",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_tree_get_victim_node_kind",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24566,7 +25329,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_resolve(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_tree_resolve",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_tree_resolve",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24642,7 +25405,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_resolve_by_id(PyObject *SWIG
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_tree_resolve_by_id",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_tree_resolve_by_id",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24706,7 +25469,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_tree_get_resolution(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_client_conflict_option_id_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_tree_get_resolution",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_tree_get_resolution",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24734,7 +25497,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_reject_abspath(PyObject
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_prop_get_reject_abspath",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_prop_get_reject_abspath",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24772,6 +25535,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_propvals(PyObject *SWIGU
   svn_string_t *temp3 ;
   svn_string_t *temp4 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -24783,13 +25547,17 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_propvals(PyObject *SWIGU
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_client_conflict_prop_get_propvals",&obj0,&arg6,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_prop_get_propvals",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg5 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_conflict_prop_get_propvals", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24822,9 +25590,8 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_propvals(PyObject *SWIGU
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24835,9 +25602,8 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_propvals(PyObject *SWIGU
     if (*arg2 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg2)->data, (*arg2)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg2)->data, (*arg2)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24848,9 +25614,8 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_propvals(PyObject *SWIGU
     if (*arg3 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg3)->data, (*arg3)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg3)->data, (*arg3)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24861,9 +25626,8 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_propvals(PyObject *SWIGU
     if (*arg4 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg4)->data, (*arg4)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg4)->data, (*arg4)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24891,6 +25655,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_resolve(PyObject *SWIGUNUSED
   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 ;
@@ -24900,7 +25665,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_resolve(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_client_conflict_prop_resolve",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_prop_resolve",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24908,6 +25673,10 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_resolve(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_conflict_prop_resolve", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -24968,6 +25737,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_resolve_by_id(PyObject *SWIG
   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 ;
@@ -24977,7 +25747,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_resolve_by_id(PyObject *SWIG
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_client_conflict_prop_resolve_by_id",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_prop_resolve_by_id",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -24985,6 +25755,10 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_resolve_by_id(PyObject *SWIG
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_conflict_prop_resolve_by_id", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_client_conflict_option_id_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -25040,9 +25814,10 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_resolution(PyObject *SWI
   svn_client_conflict_t *arg1 = (svn_client_conflict_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_client_conflict_option_id_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_conflict_prop_get_resolution",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_prop_get_resolution",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25050,6 +25825,10 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_prop_get_resolution(PyObject *SWI
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_conflict_prop_get_resolution", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_client_conflict_option_id_t)svn_client_conflict_prop_get_resolution(arg1,(char const *)arg2);
@@ -25070,7 +25849,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_mime_type(PyObject *SWIG
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_text_get_mime_type",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_text_get_mime_type",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25124,7 +25903,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_contents(PyObject *SWIGU
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_text_get_contents",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_text_get_contents",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg5 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25173,7 +25952,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_contents(PyObject *SWIGU
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -25186,7 +25965,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_contents(PyObject *SWIGU
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -25199,7 +25978,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_contents(PyObject *SWIGU
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -25212,7 +25991,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_contents(PyObject *SWIGU
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg4);
+      s = PyBytes_FromString(*arg4);
       if (s == NULL)
       SWIG_fail;
     }
@@ -25254,7 +26033,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_resolve(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_text_resolve",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_text_resolve",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25330,7 +26109,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_resolve_by_id(PyObject *SWIG
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_text_resolve_by_id",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_text_resolve_by_id",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25394,7 +26173,7 @@ SWIGINTERN PyObject *_wrap_svn_client_conflict_text_get_resolution(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_client_conflict_option_id_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_conflict_text_get_resolution",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_conflict_text_get_resolution",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_client_conflict_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25424,6 +26203,7 @@ SWIGINTERN PyObject *_wrap_svn_client_resolved(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *arg4 = (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 ;
@@ -25433,7 +26213,11 @@ SWIGINTERN PyObject *_wrap_svn_client_resolved(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_resolved",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_resolved",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_resolved", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -25494,6 +26278,7 @@ SWIGINTERN PyObject *_wrap_svn_client_resolve(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -25504,7 +26289,11 @@ SWIGINTERN PyObject *_wrap_svn_client_resolve(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client_resolve",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_resolve",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_resolve", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_depth_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -25567,8 +26356,9 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_path_set(PyObject *SWIGUNUSE
   struct svn_client_copy_source_t *arg1 = (struct svn_client_copy_source_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_copy_source_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy_source_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -25576,6 +26366,10 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_path_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_copy_source_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -25596,7 +26390,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_path_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_copy_source_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy_source_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -25618,7 +26412,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_revision_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_copy_source_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy_source_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -25650,7 +26444,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_revision_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_copy_source_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy_source_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -25673,7 +26467,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_peg_revision_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_copy_source_t_peg_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy_source_t_peg_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -25705,7 +26499,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_peg_revision_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_copy_source_t_peg_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy_source_t_peg_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -25725,7 +26519,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_copy_source_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_client_copy_source_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_copy_source_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_copy_source_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -25747,7 +26541,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_copy_source_t(PyObject *SWIGUNUSEDP
   struct svn_client_copy_source_t *arg1 = (struct svn_client_copy_source_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_copy_source_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_copy_source_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -25771,7 +26565,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_copy_source_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_copy_source_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -25794,6 +26588,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy7(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -25810,7 +26605,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy7(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy7",11,12,&obj0,&obj1,&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()) {
@@ -25818,6 +26613,10 @@ SWIGINTERN PyObject *_wrap_svn_client_copy7(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_copy7", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -25930,6 +26729,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy6(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -25943,7 +26743,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy6(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOO|O:svn_client_copy6",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy6",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) 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()) {
@@ -25951,6 +26751,10 @@ SWIGINTERN PyObject *_wrap_svn_client_copy6(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_copy6", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -26045,6 +26849,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy5(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -26058,7 +26863,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy5(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_client_copy5",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy5",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -26066,6 +26871,10 @@ SWIGINTERN PyObject *_wrap_svn_client_copy5(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_copy5", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -26161,6 +26970,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy4(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -26173,7 +26983,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy4(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_client_copy4",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy4",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -26181,6 +26991,10 @@ SWIGINTERN PyObject *_wrap_svn_client_copy4(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_copy4", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -26267,7 +27081,9 @@ SWIGINTERN PyObject *_wrap_svn_client_copy3(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -26277,7 +27093,11 @@ SWIGINTERN PyObject *_wrap_svn_client_copy3(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOsO|O:svn_client_copy3",&arg2,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy3",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_copy3", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -26285,6 +27105,10 @@ SWIGINTERN PyObject *_wrap_svn_client_copy3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_copy3", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -26346,7 +27170,9 @@ SWIGINTERN PyObject *_wrap_svn_client_copy2(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -26356,7 +27182,11 @@ SWIGINTERN PyObject *_wrap_svn_client_copy2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOsO|O:svn_client_copy2",&arg2,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_copy2", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -26364,6 +27194,10 @@ SWIGINTERN PyObject *_wrap_svn_client_copy2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_copy2", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -26425,7 +27259,9 @@ SWIGINTERN PyObject *_wrap_svn_client_copy(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_client_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -26435,7 +27271,11 @@ SWIGINTERN PyObject *_wrap_svn_client_copy(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOsO|O:svn_client_copy",&arg2,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_copy",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_copy", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -26443,6 +27283,10 @@ SWIGINTERN PyObject *_wrap_svn_client_copy(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_copy", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -26509,6 +27353,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move7(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -26523,7 +27368,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move7(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg11 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_client_move7",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_move7",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -26534,6 +27379,10 @@ SWIGINTERN PyObject *_wrap_svn_client_move7(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_move7", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -26633,6 +27482,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move6(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -26645,7 +27495,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move6(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_client_move6",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_move6",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -26656,6 +27506,10 @@ SWIGINTERN PyObject *_wrap_svn_client_move6(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_move6", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -26744,6 +27598,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move5(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -26757,7 +27612,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move5(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_client_move5",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_move5",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -26768,6 +27623,10 @@ SWIGINTERN PyObject *_wrap_svn_client_move5(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_move5", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -26860,6 +27719,8 @@ SWIGINTERN PyObject *_wrap_svn_client_move4(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -26870,7 +27731,15 @@ SWIGINTERN PyObject *_wrap_svn_client_move4(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_client_move4",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_move4",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_move4", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_move4", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -26939,6 +27808,8 @@ SWIGINTERN PyObject *_wrap_svn_client_move3(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -26949,7 +27820,15 @@ SWIGINTERN PyObject *_wrap_svn_client_move3(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_client_move3",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_move3",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_move3", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_move3", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -27018,6 +27897,8 @@ SWIGINTERN PyObject *_wrap_svn_client_move2(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_client_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -27028,7 +27909,15 @@ SWIGINTERN PyObject *_wrap_svn_client_move2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_client_move2",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_move2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_move2", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_move2", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -27098,7 +27987,9 @@ SWIGINTERN PyObject *_wrap_svn_client_move(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_client_commit_info_t *temp1 = NULL ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27109,7 +28000,11 @@ SWIGINTERN PyObject *_wrap_svn_client_move(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOO|O:svn_client_move",&arg2,&obj1,&arg4,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_move",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_move", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -27117,6 +28012,10 @@ SWIGINTERN PyObject *_wrap_svn_client_move(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_move", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -27188,7 +28087,9 @@ SWIGINTERN PyObject *_wrap_svn_client_propset_remote(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_string_t value2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27201,21 +28102,33 @@ SWIGINTERN PyObject *_wrap_svn_client_propset_remote(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOOOOO|O:svn_client_propset_remote",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propset_remote",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propset_remote", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_propset_remote", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -27302,6 +28215,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propset_local(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_string_t value2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -27315,17 +28229,25 @@ SWIGINTERN PyObject *_wrap_svn_client_propset_local(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_client_propset_local",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propset_local",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propset_local", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -27421,7 +28343,9 @@ SWIGINTERN PyObject *_wrap_svn_client_propset3(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *_global_py_pool = NULL ;
   svn_commit_info_t *temp1 = NULL ;
   svn_string_t value3 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27436,21 +28360,33 @@ SWIGINTERN PyObject *_wrap_svn_client_propset3(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg11 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOOOOOO|O:svn_client_propset3",&arg2,&obj1,&arg4,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propset3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propset3", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value3.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj1);
-      value3.len = PyString_GET_SIZE(obj1);
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_propset3", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -27553,7 +28489,9 @@ SWIGINTERN PyObject *_wrap_svn_client_propset2(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_string_t value2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27564,21 +28502,33 @@ SWIGINTERN PyObject *_wrap_svn_client_propset2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOOO|O:svn_client_propset2",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propset2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propset2", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_propset2", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -27645,7 +28595,9 @@ SWIGINTERN PyObject *_wrap_svn_client_propset(PyObject *SWIGUNUSEDPARM(self), Py
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_string_t value2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -27654,21 +28606,33 @@ SWIGINTERN PyObject *_wrap_svn_client_propset(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsO|O:svn_client_propset",&arg1,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propset",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propset", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_propset", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -27730,8 +28694,10 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set2(PyObject *SWIGUNUSEDPARM(self
   svn_string_t value3 ;
   svn_revnum_t temp6 ;
   int res6 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -27743,17 +28709,25 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set2(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg9 = _global_pool;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"sOOsOOO|O:svn_client_revprop_set2",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_revprop_set2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_revprop_set2", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -27761,16 +28735,24 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set2(PyObject *SWIGUNUSEDPARM(self
     if (obj2 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj2)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj2, (char **)&(value3.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj2);
-      value3.len = PyString_GET_SIZE(obj2);
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_client_revprop_set2", "URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -27853,7 +28835,9 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set(PyObject *SWIGUNUSEDPARM(self)
   svn_string_t value2 ;
   svn_revnum_t temp5 ;
   int res5 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27865,21 +28849,33 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg8 = _global_pool;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOOO|O:svn_client_revprop_set",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_revprop_set",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_revprop_set", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_revprop_set", "URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -27967,6 +28963,8 @@ SWIGINTERN PyObject *_wrap_svn_client_propget5(PyObject *SWIGUNUSEDPARM(self), P
   apr_array_header_t *temp2 ;
   svn_revnum_t temp7 ;
   int res7 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -27987,7 +28985,15 @@ SWIGINTERN PyObject *_wrap_svn_client_propget5(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   arg2 = &temp2;
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|OO:svn_client_propget5",&arg3,&arg4,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propget5",7,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propget5", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_propget5", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
@@ -28114,6 +29120,8 @@ SWIGINTERN PyObject *_wrap_svn_client_propget4(PyObject *SWIGUNUSEDPARM(self), P
   apr_hash_t *temp1 ;
   svn_revnum_t temp6 ;
   int res6 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -28133,7 +29141,15 @@ SWIGINTERN PyObject *_wrap_svn_client_propget4(PyObject *SWIGUNUSEDPARM(self), P
   arg11 = _global_pool;
   arg1 = &temp1;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|OO:svn_client_propget4",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propget4",7,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propget4", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_propget4", "target");
+    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()) {
@@ -28256,6 +29272,8 @@ SWIGINTERN PyObject *_wrap_svn_client_propget3(PyObject *SWIGUNUSEDPARM(self), P
   apr_hash_t *temp1 ;
   svn_revnum_t temp6 ;
   int res6 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -28270,7 +29288,15 @@ SWIGINTERN PyObject *_wrap_svn_client_propget3(PyObject *SWIGUNUSEDPARM(self), P
   arg10 = _global_pool;
   arg1 = &temp1;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|O:svn_client_propget3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propget3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propget3", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_propget3", "target");
+    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()) {
@@ -28375,6 +29401,8 @@ SWIGINTERN PyObject *_wrap_svn_client_propget2(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -28387,7 +29415,15 @@ SWIGINTERN PyObject *_wrap_svn_client_propget2(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOO|O:svn_client_propget2",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propget2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propget2", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_propget2", "target");
+    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()) {
@@ -28476,6 +29512,8 @@ SWIGINTERN PyObject *_wrap_svn_client_propget(PyObject *SWIGUNUSEDPARM(self), Py
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -28487,7 +29525,15 @@ SWIGINTERN PyObject *_wrap_svn_client_propget(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_propget",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_propget",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_propget", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_propget", "target");
+    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()) {
@@ -28567,6 +29613,8 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_get(PyObject *SWIGUNUSEDPARM(self)
   svn_string_t *temp2 ;
   svn_revnum_t temp5 ;
   int res5 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -28578,7 +29626,15 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_get(PyObject *SWIGUNUSEDPARM(self)
   arg7 = _global_pool;
   arg2 = &temp2;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_client_revprop_get",&arg1,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_revprop_get",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_revprop_get", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_revprop_get", "URL");
+    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()) {
@@ -28628,9 +29684,8 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_get(PyObject *SWIGUNUSEDPARM(self)
     if (*arg2 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg2)->data, (*arg2)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg2)->data, (*arg2)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -28668,6 +29723,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist4(PyObject *SWIGUNUSEDPARM(self),
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -28682,7 +29738,11 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist4(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_client_proplist4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_proplist4",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_proplist4", "target");
+    if (PyErr_Occurred()) 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()) {
@@ -28788,6 +29848,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist3(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *arg9 = (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 ;
@@ -28802,7 +29863,11 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist3(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_client_proplist3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_proplist3",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_proplist3", "target");
+    if (PyErr_Occurred()) 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()) {
@@ -28913,6 +29978,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -28925,7 +29991,11 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_proplist2",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_proplist2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_proplist2", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -28997,7 +30067,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist2(PyObject *SWIGUNUSEDPARM(self),
     ppitem = (svn_client_proplist_item_t **)(*arg1)->elts;
     for (i = 0; i < nelts; ++i, ++ppitem) {
       PyObject *item = PyTuple_New(2);
-      PyObject *name = PyString_FromStringAndSize((*ppitem)->node_name->data,
+      PyObject *name = PyBytes_FromStringAndSize((*ppitem)->node_name->data,
         (*ppitem)->node_name->len);
       PyObject *hash = svn_swig_py_prophash_to_dict((*ppitem)->prop_hash);
       
@@ -29038,6 +30108,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
@@ -29049,7 +30120,11 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client_proplist",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_proplist",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_proplist", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -29110,7 +30185,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist(PyObject *SWIGUNUSEDPARM(self), P
     ppitem = (svn_client_proplist_item_t **)(*arg1)->elts;
     for (i = 0; i < nelts; ++i, ++ppitem) {
       PyObject *item = PyTuple_New(2);
-      PyObject *name = PyString_FromStringAndSize((*ppitem)->node_name->data,
+      PyObject *name = PyBytes_FromStringAndSize((*ppitem)->node_name->data,
         (*ppitem)->node_name->len);
       PyObject *hash = svn_swig_py_prophash_to_dict((*ppitem)->prop_hash);
       
@@ -29153,6 +30228,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_list(PyObject *SWIGUNUSEDPARM(self
   apr_hash_t *temp1 ;
   svn_revnum_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -29164,7 +30240,11 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_list(PyObject *SWIGUNUSEDPARM(self
   arg6 = _global_pool;
   arg1 = &temp1;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_revprop_list",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_revprop_list",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_revprop_list", "URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -29248,12 +30328,15 @@ SWIGINTERN PyObject *_wrap_svn_client_export5(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  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 ;
   svn_error_t *result = 0 ;
@@ -29263,7 +30346,15 @@ SWIGINTERN PyObject *_wrap_svn_client_export5(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg12 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_export5",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_export5", "from_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_export5", "to_path");
+    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()) {
@@ -29301,6 +30392,10 @@ SWIGINTERN PyObject *_wrap_svn_client_export5(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_client_export5", "native_eol");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29378,11 +30473,14 @@ SWIGINTERN PyObject *_wrap_svn_client_export4(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  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 ;
   svn_error_t *result = 0 ;
@@ -29392,7 +30490,15 @@ SWIGINTERN PyObject *_wrap_svn_client_export4(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg11 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOOzO|O:svn_client_export4",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&arg9,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_export4",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_export4", "from_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_export4", "to_path");
+    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()) {
@@ -29424,6 +30530,10 @@ SWIGINTERN PyObject *_wrap_svn_client_export4(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_client_export4", "native_eol");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29501,11 +30611,14 @@ SWIGINTERN PyObject *_wrap_svn_client_export3(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  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 ;
   svn_error_t *result = 0 ;
@@ -29515,7 +30628,15 @@ SWIGINTERN PyObject *_wrap_svn_client_export3(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg11 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOOzO|O:svn_client_export3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&arg9,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_export3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_export3", "from_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_export3", "to_path");
+    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()) {
@@ -29547,6 +30668,10 @@ SWIGINTERN PyObject *_wrap_svn_client_export3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_client_export3", "native_eol");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29621,8 +30746,11 @@ SWIGINTERN PyObject *_wrap_svn_client_export2(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  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 ;
@@ -29632,7 +30760,15 @@ SWIGINTERN PyObject *_wrap_svn_client_export2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOzO|O:svn_client_export2",&arg2,&arg3,&obj2,&obj3,&arg6,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_export2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_export2", "from_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_export2", "to_path");
+    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()) {
@@ -29646,6 +30782,10 @@ SWIGINTERN PyObject *_wrap_svn_client_export2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_client_export2", "native_eol");
+    if (PyErr_Occurred()) 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;
@@ -29709,6 +30849,8 @@ SWIGINTERN PyObject *_wrap_svn_client_export(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -29720,7 +30862,15 @@ SWIGINTERN PyObject *_wrap_svn_client_export(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_export",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_export",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_export", "from_path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_export", "to_path");
+    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()) {
@@ -29800,6 +30950,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list4(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -29817,7 +30968,11 @@ SWIGINTERN PyObject *_wrap_svn_client_list4(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOOO|O:svn_client_list4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_list4",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_list4", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -29946,6 +31101,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list3(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *arg11 = (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 ;
@@ -29962,7 +31118,11 @@ SWIGINTERN PyObject *_wrap_svn_client_list3(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_list3",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_list3", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -30084,6 +31244,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list2(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -30099,7 +31260,11 @@ SWIGINTERN PyObject *_wrap_svn_client_list2(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_list2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_list2", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -30215,6 +31380,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -30230,7 +31396,11 @@ SWIGINTERN PyObject *_wrap_svn_client_list(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_list",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_list", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -30346,6 +31516,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ls3(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
   apr_hash_t *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -30359,7 +31530,11 @@ SWIGINTERN PyObject *_wrap_svn_client_ls3(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg8 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_ls3",&arg3,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ls3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_ls3", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -30463,6 +31638,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ls2(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -30475,7 +31651,11 @@ SWIGINTERN PyObject *_wrap_svn_client_ls2(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_ls2",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ls2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_ls2", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -30569,6 +31749,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ls(PyObject *SWIGUNUSEDPARM(self), PyObjec
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -30580,7 +31761,11 @@ SWIGINTERN PyObject *_wrap_svn_client_ls(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client_ls",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_ls",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_ls", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -30662,6 +31847,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cat3(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -30679,7 +31865,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cat3(PyObject *SWIGUNUSEDPARM(self), PyObj
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_cat3",6,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -30692,6 +31878,10 @@ SWIGINTERN PyObject *_wrap_svn_client_cat3(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_cat3", "path_or_url");
+    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;
@@ -30792,6 +31982,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cat2(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -30802,7 +31993,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cat2(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_client_cat2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_cat2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -30815,6 +32006,10 @@ SWIGINTERN PyObject *_wrap_svn_client_cat2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_cat2", "path_or_url");
+    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;
@@ -30891,6 +32086,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cat(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -30900,7 +32096,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cat(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_client_cat",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_cat",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -30913,6 +32109,10 @@ SWIGINTERN PyObject *_wrap_svn_client_cat(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_cat", "path_or_url");
+    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;
@@ -30968,2632 +32168,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client__shelf_t_name_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->name) free((char *)arg1->name);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->name = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_name_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->name);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_max_version_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  int arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_t_max_version_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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)->max_version = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_max_version_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_max_version_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (int) ((arg1)->max_version);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_wc_root_abspath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client__shelf_t_wc_root_abspath_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->wc_root_abspath) free((char *)arg1->wc_root_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->wc_root_abspath = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_wc_root_abspath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_wc_root_abspath_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->wc_root_abspath);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_shelves_dir_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client__shelf_t_shelves_dir_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->shelves_dir) free((char *)arg1->shelves_dir);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->shelves_dir = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_shelves_dir_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_shelves_dir_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->shelves_dir);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_revprops_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  apr_hash_t *arg2 = (apr_hash_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_client__shelf_t_revprops_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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_prophash_from_dict(obj1, _global_pool);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->revprops = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_revprops_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  apr_hash_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_revprops_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (apr_hash_t *) ((arg1)->revprops);
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_prophash_to_dict(result));
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_ctx_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_t_ctx_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    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;
-    }
-  }
-  if (arg1) (arg1)->ctx = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_ctx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_client_ctx_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_ctx_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_client_ctx_t *) ((arg1)->ctx);
-  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_ctx_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_pool_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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 ;
-  
-  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_client__shelf_t_pool_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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 (arg1) (arg1)->pool = arg2;
-  resultobj = SWIG_Py_Void();
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_t_pool_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  apr_pool_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_pool_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (apr_pool_t *) ((arg1)->pool);
-  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_pool_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_svn_client__shelf_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client__shelf_t")) SWIG_fail;
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (struct svn_client__shelf_t *)calloc(1, sizeof(struct svn_client__shelf_t));
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client__shelf_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_svn_client__shelf_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client__shelf_t",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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_client__shelf_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_svn_client__shelf_t, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_shelf_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_version_t_shelf_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj1);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->shelf = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_shelf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_client__shelf_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_version_t_shelf_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_client__shelf_t *) ((arg1)->shelf);
-  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client__shelf_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_mtime_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  apr_time_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_version_t_mtime_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  arg2 = (apr_time_t) PyLong_AsLongLong(obj1); 
-  if (arg1) (arg1)->mtime = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_mtime_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  apr_time_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_version_t_mtime_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result =  ((arg1)->mtime);
-  resultobj = PyLong_FromLongLong((apr_int64_t)(result)); 
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_files_dir_abspath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client__shelf_version_t_files_dir_abspath_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->files_dir_abspath) free((char *)arg1->files_dir_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->files_dir_abspath = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_files_dir_abspath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_version_t_files_dir_abspath_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->files_dir_abspath);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_version_number_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  int arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_version_t_version_number_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_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)->version_number = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_version_number_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_version_t_version_number_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (int) ((arg1)->version_number);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_svn_client__shelf_version_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client__shelf_version_t")) SWIG_fail;
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (struct svn_client__shelf_version_t *)calloc(1, sizeof(struct svn_client__shelf_version_t));
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client__shelf_version_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_svn_client__shelf_version_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client__shelf_version_t",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_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_client__shelf_version_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_svn_client__shelf_version_t, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_open_or_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ;
-  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-  apr_pool_t *_global_pool = NULL ;
-  PyObject *_global_py_pool = NULL ;
-  svn_client__shelf_t *temp1 ;
-  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;
-  arg5 = _global_pool;
-  arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_client__shelf_open_or_create",&arg2,&arg3,&obj2,&obj3)) SWIG_fail;
-  {
-    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;
-    }
-  }
-  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_client__shelf_open_or_create(arg1,(char const *)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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_open_or_create arg 1 (svn_client__shelf_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_or_create is not implemented yet");
-    
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_open_existing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ;
-  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-  apr_pool_t *_global_pool = NULL ;
-  PyObject *_global_py_pool = NULL ;
-  svn_client__shelf_t *temp1 ;
-  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;
-  arg5 = _global_pool;
-  arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_client__shelf_open_existing",&arg2,&arg3,&obj2,&obj3)) SWIG_fail;
-  {
-    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;
-    }
-  }
-  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_client__shelf_open_existing(arg1,(char const *)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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_open_existing arg 1 (svn_client__shelf_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_existing is not implemented yet");
-    
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_close(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_t *arg1 = (svn_client__shelf_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_client__shelf_close",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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 = (svn_error_t *)svn_client__shelf_close(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_client__shelf_delete(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_boolean_t arg3 ;
-  svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ;
-  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-  apr_pool_t *_global_pool = NULL ;
-  PyObject *_global_py_pool = NULL ;
-  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 *)"ssOO|O:svn_client__shelf_delete",&arg1,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
-  {
-    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
-    if (SWIG_arg_fail(svn_argnum_obj2)) {
-      SWIG_fail;
-    }
-  }
-  {
-    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;
-    }
-  }
-  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_client__shelf_delete((char const *)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;
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_mods_editor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_delta_editor_t **arg1 = (svn_delta_editor_t **) 0 ;
-  void **arg2 = (void **) 0 ;
-  svn_client__shelf_version_t *arg3 = (svn_client__shelf_version_t *) 0 ;
-  svn_wc_notify_func2_t arg4 = (svn_wc_notify_func2_t) 0 ;
-  void *arg5 = (void *) 0 ;
-  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 ;
-  svn_delta_editor_t *temp1 ;
-  void *temp2 ;
-  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;
-  arg7 = _global_pool;
-  arg1 = &temp1;
-  arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client__shelf_mods_editor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  {
-    arg3 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg4 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
-    arg5 = obj1;
-  }
-  {
-    arg6 = (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;
-    }
-  }
-  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_client__shelf_mods_editor((struct svn_delta_editor_t const **)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;
-  }
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
-        _global_py_pool, args))
-    
-    ;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_mods_editor arg 2 (void **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_mods_editor is not implemented yet");
-    
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_save_new_version3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  apr_array_header_t *arg3 = (apr_array_header_t *) 0 ;
-  svn_depth_t arg4 ;
-  apr_array_header_t *arg5 = (apr_array_header_t *) 0 ;
-  svn_client_status_func_t arg6 = (svn_client_status_func_t) 0 ;
-  void *arg7 = (void *) 0 ;
-  svn_client_status_func_t arg8 = (svn_client_status_func_t) 0 ;
-  void *arg9 = (void *) 0 ;
-  apr_pool_t *arg10 = (apr_pool_t *) 0 ;
-  apr_pool_t *_global_pool = NULL ;
-  PyObject *_global_py_pool = NULL ;
-  svn_client__shelf_version_t *temp1 ;
-  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 ;
-  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;
-  arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_client__shelf_save_new_version3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg3 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj1,
-      sizeof(const char *),
-      svn_swig_py_unwrap_string,
-      NULL,
-      _global_pool);
-    if (PyErr_Occurred())
-    SWIG_fail;
-  }
-  {
-    arg4 = (svn_depth_t)SWIG_As_long (obj2);
-    if (SWIG_arg_fail(svn_argnum_obj2)) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg5 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj3,
-      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(obj4, 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_obj4);
-    if (tmp == NULL || PyErr_Occurred()) {
-      SWIG_fail;
-    }
-    arg6 = *tmp;
-  }
-  {
-    if (obj5 == Py_None) {
-      arg7 = NULL;
-    } else if (SWIG_ConvertPtr(obj5, (void **) &arg7, 0, 0) == -1) {
-      arg7 = (void *) obj5;
-      PyErr_Clear();
-    }
-  }
-  {
-    svn_client_status_func_t * tmp =
-    svn_swig_py_must_get_ptr(obj6, 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_obj6);
-    if (tmp == NULL || PyErr_Occurred()) {
-      SWIG_fail;
-    }
-    arg8 = *tmp;
-  }
-  {
-    if (obj7 == Py_None) {
-      arg9 = NULL;
-    } else if (SWIG_ConvertPtr(obj7, (void **) &arg9, 0, 0) == -1) {
-      arg9 = (void *) obj7;
-      PyErr_Clear();
-    }
-  }
-  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_client__shelf_save_new_version3(arg1,arg2,(apr_array_header_t const *)arg3,arg4,(apr_array_header_t const *)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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_save_new_version3 arg 1 (svn_client__shelf_version_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_save_new_version3 is not implemented yet");
-    
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_delete_newer_versions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-  svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_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 ;
-  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_client__shelf_delete_newer_versions",&obj0,&obj1,&obj2)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client__shelf_version_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;
-    }
-  }
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (svn_error_t *)svn_client__shelf_delete_newer_versions(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;
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_version_open(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  int 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_client__shelf_version_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_client__shelf_version_open",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg3 = (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;
-    }
-  }
-  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_client__shelf_version_open(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_client__shelf_version_open arg 1 (svn_client__shelf_version_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_version_open 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_client__shelf_get_newest_version(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_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_client__shelf_version_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_client__shelf_get_newest_version",&obj0,&obj1,&obj2)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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_client__shelf_get_newest_version(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_client__shelf_get_newest_version arg 1 (svn_client__shelf_version_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_newest_version 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_client__shelf_get_all_versions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_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_client__shelf_get_all_versions",&obj0,&obj1,&obj2)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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_client__shelf_get_all_versions(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_client__shelf_get_all_versions arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_all_versions 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_client__shelf_apply(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-  svn_boolean_t arg2 ;
-  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_client__shelf_apply",&obj0,&obj1,&obj2)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_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 (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_client__shelf_apply(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;
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_test_apply_file(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
-  svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_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_client__shelf_test_apply_file",&obj0,&arg3,&obj2)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_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_client__shelf_test_apply_file(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_client__shelf_unapply(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-  svn_boolean_t arg2 ;
-  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_client__shelf_unapply",&obj0,&obj1,&obj2)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_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 (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_client__shelf_unapply(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;
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_replay(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ;
-  void *arg4 = (void *) 0 ;
-  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_client__shelf_replay",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    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;
-    }
-  }
-  {
-    if (obj3 == Py_None) {
-      arg4 = NULL;
-    } else if (SWIG_ConvertPtr(obj3, (void **) &arg4, 0, 0) == -1) {
-      arg4 = (void *) obj3;
-      PyErr_Clear();
-    }
-  }
-  {
-    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_client__shelf_replay(arg1,(char const *)arg2,(struct svn_delta_editor_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__shelf_paths_changed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-  svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_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_client__shelf_paths_changed",&obj0,&obj1,&obj2)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_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_client__shelf_paths_changed(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_client__shelf_paths_changed arg 1 (apr_hash_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_paths_changed 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_client__shelf_revprop_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_string_t *arg3 = (svn_string_t *) 0 ;
-  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
-  apr_pool_t *_global_pool = NULL ;
-  PyObject *_global_py_pool = NULL ;
-  svn_string_t value3 ;
-  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 (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_client__shelf_revprop_set",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0);
-    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) {
-    /* 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_client__shelf_revprop_set(arg1,(char const *)arg2,(struct svn_string_t 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;
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_revprop_set_all(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-  apr_hash_t *arg2 = (apr_hash_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 ;
-  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_client__shelf_revprop_set_all",&obj0,&obj1,&obj2)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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_prophash_from_dict(obj1, _global_pool);
-    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_client__shelf_revprop_set_all(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;
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_revprop_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_string_t **arg1 = (svn_string_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_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_string_t *temp1 ;
-  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_client__shelf_revprop_get",&obj0,&arg3,&obj2)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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_client__shelf_revprop_get(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;
-  }
-  {
-    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_client__shelf_revprop_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  apr_pool_t *arg3 = (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 ;
-  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;
-  arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client__shelf_revprop_list",&obj0,&obj1)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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 = (svn_error_t *)svn_client__shelf_revprop_list(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, svn_swig_py_prophash_to_dict(*arg1));
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_set_log_message(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-  apr_pool_t *_global_pool = NULL ;
-  PyObject *_global_py_pool = NULL ;
-  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;
-  arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_client__shelf_set_log_message",&obj0,&arg2,&obj2)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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_client__shelf_set_log_message(arg1,(char 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;
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_get_log_message(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char **arg1 = (char **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-  apr_pool_t *_global_pool = NULL ;
-  PyObject *_global_py_pool = NULL ;
-  char *temp1 ;
-  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;
-  arg3 = _global_pool;
-  arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client__shelf_get_log_message",&obj0,&obj1)) SWIG_fail;
-  {
-    arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_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 = (svn_error_t *)svn_client__shelf_get_log_message(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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_get_log_message arg 1 (char **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_log_message is not implemented yet");
-    
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_info_t_mtime_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ;
-  apr_time_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_info_t_mtime_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_info_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  arg2 = (apr_time_t) PyLong_AsLongLong(obj1); 
-  if (arg1) (arg1)->mtime = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_info_t_mtime_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  apr_time_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_info_t_mtime_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_info_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result =  ((arg1)->mtime);
-  resultobj = PyLong_FromLongLong((apr_int64_t)(result)); 
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_svn_client__shelf_info_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_info_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client__shelf_info_t")) SWIG_fail;
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (struct svn_client__shelf_info_t *)calloc(1, sizeof(struct svn_client__shelf_info_t));
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client__shelf_info_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_svn_client__shelf_info_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client__shelf_info_t",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_client__shelf_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_info_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_client__shelf_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_client__shelf_info_t, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_svn_client__shelf_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_client_ctx_t *arg3 = (svn_client_ctx_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_hash_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_client__shelf_list",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
-  {
-    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;
-    }
-  }
-  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_client__shelf_list(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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_list arg 1 (apr_hash_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_list 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_client__shelf_version_status_walk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_wc_status_func4_t arg3 = (svn_wc_status_func4_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  apr_pool_t *arg5 = (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 ;
-  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 *)"OsOO|O:svn_client__shelf_version_status_walk",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
-  {
-    arg1 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    svn_wc_status_func4_t * tmp =
-    svn_swig_py_must_get_ptr(obj2, 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_obj2);
-    if (tmp == NULL || PyErr_Occurred()) {
-      SWIG_fail;
-    }
-    arg3 = *tmp;
-  }
-  {
-    if (obj3 == Py_None) {
-      arg4 = NULL;
-    } else if (SWIG_ConvertPtr(obj3, (void **) &arg4, 0, 0) == -1) {
-      arg4 = (void *) obj3;
-      PyErr_Clear();
-    }
-  }
-  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_client__shelf_version_status_walk(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;
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_svn_client_add_to_changelist(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
@@ -33605,6 +32179,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add_to_changelist(PyObject *SWIGUNUSEDPARM
   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 ;
@@ -33615,7 +32190,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add_to_changelist(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_client_add_to_changelist",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_add_to_changelist",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -33626,6 +32201,10 @@ SWIGINTERN PyObject *_wrap_svn_client_add_to_changelist(PyObject *SWIGUNUSEDPARM
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_add_to_changelist", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -33705,7 +32284,7 @@ SWIGINTERN PyObject *_wrap_svn_client_remove_from_changelists(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_remove_from_changelists",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_remove_from_changelists",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -33786,6 +32365,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_changelists(PyObject *SWIGUNUSEDPARM(s
   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 ;
@@ -33797,7 +32377,11 @@ SWIGINTERN PyObject *_wrap_svn_client_get_changelists(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_get_changelists",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_changelists",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_get_changelists", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj1,
       sizeof(const char *),
@@ -33872,6 +32456,7 @@ SWIGINTERN PyObject *_wrap_svn_client_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -33881,7 +32466,7 @@ SWIGINTERN PyObject *_wrap_svn_client_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OzOO|O:svn_client_lock",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_lock",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -33892,6 +32477,10 @@ SWIGINTERN PyObject *_wrap_svn_client_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_client_lock", "comment");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -33960,7 +32549,7 @@ SWIGINTERN PyObject *_wrap_svn_client_unlock(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_unlock",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_unlock",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -34026,8 +32615,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_URL_set(PyObject *SWIGUNUSEDPARM(self), Py
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_URL_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_URL_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34035,6 +32625,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_URL_set(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_URL_set", "URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->URL) free((char *)arg1->URL);
@@ -34055,7 +32649,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_URL_get(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_URL_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_URL_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34077,7 +32671,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_rev_set(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34104,7 +32698,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_rev_get(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_rev_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34126,7 +32720,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_kind_set(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34153,7 +32747,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_kind_get(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34173,8 +32767,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_root_URL_set(PyObject *SWIGUNUSEDPAR
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_repos_root_URL_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_repos_root_URL_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34182,6 +32777,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_root_URL_set(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_repos_root_URL_set", "repos_root_URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_root_URL) free((char *)arg1->repos_root_URL);
@@ -34202,7 +32801,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_root_URL_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_repos_root_URL_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_repos_root_URL_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34222,8 +32821,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_UUID_set(PyObject *SWIGUNUSEDPARM(se
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_repos_UUID_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_repos_UUID_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34231,6 +32831,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_UUID_set(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_repos_UUID_set", "repos_UUID");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_UUID) free((char *)arg1->repos_UUID);
@@ -34251,7 +32855,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_UUID_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_repos_UUID_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_repos_UUID_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34273,7 +32877,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_rev_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_last_changed_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_last_changed_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34300,7 +32904,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_rev_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_last_changed_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_last_changed_rev_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34322,7 +32926,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_date_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_last_changed_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_last_changed_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34344,7 +32948,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_date_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_last_changed_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_last_changed_date_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34364,8 +32968,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_author_set(PyObject *SWIGUNUS
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_last_changed_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_last_changed_author_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34373,6 +32978,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_author_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_last_changed_author_set", "last_changed_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->last_changed_author) free((char *)arg1->last_changed_author);
@@ -34393,7 +33002,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_author_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_last_changed_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_last_changed_author_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34415,7 +33024,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_lock_set(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_lock_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_lock_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34442,7 +33051,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_lock_get(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_lock_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_lock_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34465,7 +33074,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_has_wc_info_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_has_wc_info_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_has_wc_info_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34492,7 +33101,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_has_wc_info_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_has_wc_info_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_has_wc_info_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34514,7 +33123,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_schedule_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_schedule_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_schedule_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34541,7 +33150,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_schedule_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_wc_schedule_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_schedule_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_schedule_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34561,8 +33170,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_url_set(PyObject *SWIGUNUSEDPARM(
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_info_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_copyfrom_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34570,6 +33180,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_url_set(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_info_t_copyfrom_url_set", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_url) free((char *)arg1->copyfrom_url);
@@ -34590,7 +33204,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_url_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_copyfrom_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_copyfrom_url_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34612,7 +33226,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_rev_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34639,7 +33253,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_rev_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34661,7 +33275,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_text_time_set(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_text_time_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_text_time_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34683,7 +33297,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_text_time_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_text_time_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_text_time_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34705,7 +33319,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prop_time_set(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_prop_time_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_prop_time_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34727,7 +33341,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prop_time_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_prop_time_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_prop_time_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34747,8 +33361,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_checksum_set(PyObject *SWIGUNUSEDPARM(self
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_checksum_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_checksum_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34756,6 +33371,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_checksum_set(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_checksum_set", "checksum");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->checksum) free((char *)arg1->checksum);
@@ -34776,7 +33395,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_checksum_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_checksum_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_checksum_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34796,8 +33415,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_old_set(PyObject *SWIGUNUSEDPARM(
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_conflict_old_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_conflict_old_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34805,6 +33425,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_old_set(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_conflict_old_set", "conflict_old");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->conflict_old) free((char *)arg1->conflict_old);
@@ -34825,7 +33449,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_old_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_conflict_old_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_conflict_old_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34845,8 +33469,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_new_set(PyObject *SWIGUNUSEDPARM(
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_conflict_new_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_conflict_new_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34854,6 +33479,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_new_set(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_conflict_new_set", "conflict_new");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->conflict_new) free((char *)arg1->conflict_new);
@@ -34874,7 +33503,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_new_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_conflict_new_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_conflict_new_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34894,8 +33523,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_wrk_set(PyObject *SWIGUNUSEDPARM(
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_conflict_wrk_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_conflict_wrk_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34903,6 +33533,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_wrk_set(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_conflict_wrk_set", "conflict_wrk");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->conflict_wrk) free((char *)arg1->conflict_wrk);
@@ -34923,7 +33557,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_wrk_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_conflict_wrk_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_conflict_wrk_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34943,8 +33577,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prejfile_set(PyObject *SWIGUNUSEDPARM(self
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_prejfile_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_prejfile_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34952,6 +33587,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prejfile_set(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_prejfile_set", "prejfile");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->prejfile) free((char *)arg1->prejfile);
@@ -34972,7 +33611,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prejfile_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_prejfile_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_prejfile_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34992,8 +33631,9 @@ SWIGINTERN PyObject *_wrap_svn_info_t_changelist_set(PyObject *SWIGUNUSEDPARM(se
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_changelist_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_changelist_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35001,6 +33641,10 @@ SWIGINTERN PyObject *_wrap_svn_info_t_changelist_set(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_info_t_changelist_set", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->changelist) free((char *)arg1->changelist);
@@ -35021,7 +33665,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_changelist_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_changelist_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_changelist_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35043,7 +33687,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_depth_set(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_depth_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_depth_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35070,7 +33714,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_depth_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   svn_depth_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_depth_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_depth_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35092,7 +33736,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_working_size_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_working_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_working_size_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35119,7 +33763,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_working_size_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   apr_size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_working_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_working_size_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35141,7 +33785,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_size_set(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_size_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35168,7 +33812,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_size_get(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   apr_size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_size_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35190,7 +33834,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_size64_set(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_size64_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_size64_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35212,7 +33856,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_size64_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_size64_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_size64_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35234,7 +33878,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_working_size64_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_working_size64_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_working_size64_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35256,7 +33900,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_working_size64_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_working_size64_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_working_size64_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35278,7 +33922,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_tree_conflict_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_tree_conflict_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_tree_conflict_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35305,7 +33949,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_tree_conflict_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_wc_conflict_description_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_tree_conflict_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_t_tree_conflict_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35325,7 +33969,7 @@ SWIGINTERN PyObject *_wrap_new_svn_info_t(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   struct svn_info_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_info_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_info_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -35347,7 +33991,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_info_t(PyObject *SWIGUNUSEDPARM(self), PyO
   struct svn_info_t *arg1 = (struct svn_info_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_info_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_info_t",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35371,7 +34015,7 @@ fail:
 
 SWIGINTERN PyObject *svn_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_info_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -35390,7 +34034,7 @@ SWIGINTERN PyObject *_wrap_svn_info_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_info_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -35432,8 +34076,9 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_URL_set(PyObject *SWIGUNUSEDPARM(s
   struct svn_client_info2_t *arg1 = (struct svn_client_info2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_info2_t_URL_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_URL_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35441,6 +34086,10 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_URL_set(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_info2_t_URL_set", "URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->URL) free((char *)arg1->URL);
@@ -35461,7 +34110,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_URL_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_URL_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_URL_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35483,7 +34132,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_rev_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35510,7 +34159,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_rev_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35530,8 +34179,9 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_root_URL_set(PyObject *SWIGU
   struct svn_client_info2_t *arg1 = (struct svn_client_info2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_info2_t_repos_root_URL_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_repos_root_URL_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35539,6 +34189,10 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_root_URL_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_info2_t_repos_root_URL_set", "repos_root_URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_root_URL) free((char *)arg1->repos_root_URL);
@@ -35559,7 +34213,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_root_URL_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_repos_root_URL_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_repos_root_URL_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35579,8 +34233,9 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_UUID_set(PyObject *SWIGUNUSE
   struct svn_client_info2_t *arg1 = (struct svn_client_info2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_info2_t_repos_UUID_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_repos_UUID_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35588,6 +34243,10 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_UUID_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_info2_t_repos_UUID_set", "repos_UUID");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_UUID) free((char *)arg1->repos_UUID);
@@ -35608,7 +34267,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_UUID_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_repos_UUID_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_repos_UUID_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35630,7 +34289,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_kind_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35657,7 +34316,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_kind_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35679,7 +34338,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_size_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_size_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35701,7 +34360,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_size_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_size_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35723,7 +34382,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_rev_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_last_changed_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_last_changed_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35750,7 +34409,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_rev_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_last_changed_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_last_changed_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35772,7 +34431,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_date_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_last_changed_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_last_changed_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35794,7 +34453,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_date_get(PyObject *SW
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_last_changed_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_last_changed_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35814,8 +34473,9 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_author_set(PyObject *
   struct svn_client_info2_t *arg1 = (struct svn_client_info2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_info2_t_last_changed_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_last_changed_author_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35823,6 +34483,10 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_author_set(PyObject *
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_info2_t_last_changed_author_set", "last_changed_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->last_changed_author) free((char *)arg1->last_changed_author);
@@ -35843,7 +34507,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_author_get(PyObject *
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_last_changed_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_last_changed_author_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35865,7 +34529,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_lock_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_lock_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_lock_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35892,7 +34556,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_lock_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_lock_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_lock_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35915,7 +34579,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_wc_info_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_wc_info_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_wc_info_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -35942,7 +34606,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_wc_info_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_wc_info_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_wc_info_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_t_wc_info_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -35962,7 +34626,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_info2_t(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   struct svn_client_info2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_client_info2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_client_info2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -35984,7 +34648,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_info2_t(PyObject *SWIGUNUSEDPARM(se
   struct svn_client_info2_t *arg1 = (struct svn_client_info2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_info2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_client_info2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -36008,7 +34672,7 @@ fail:
 
 SWIGINTERN PyObject *svn_client_info2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_info2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36027,7 +34691,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_dup(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_info2_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -36080,6 +34744,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info4(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -36097,7 +34762,11 @@ SWIGINTERN PyObject *_wrap_svn_client_info4(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info4",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_info4", "abspath_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -36229,6 +34898,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info3(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *arg11 = (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 ;
@@ -36245,7 +34915,11 @@ SWIGINTERN PyObject *_wrap_svn_client_info3(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info3",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_info3", "abspath_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -36369,6 +35043,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *arg9 = (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 ;
@@ -36382,7 +35057,11 @@ SWIGINTERN PyObject *_wrap_svn_client_info2(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_client_info2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_info2", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -36481,6 +35160,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *arg8 = (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 ;
@@ -36493,7 +35173,11 @@ SWIGINTERN PyObject *_wrap_svn_client_info(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_client_info",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_info",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_info", "path_or_url");
+    if (PyErr_Occurred()) 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()) {
@@ -36581,6 +35265,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_wc_root(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -36595,7 +35280,11 @@ SWIGINTERN PyObject *_wrap_svn_client_get_wc_root(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_get_wc_root",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_wc_root",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_get_wc_root", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -36644,7 +35333,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_wc_root(PyObject *SWIGUNUSEDPARM(self)
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -36682,6 +35371,7 @@ SWIGINTERN PyObject *_wrap_svn_client_min_max_revisions(PyObject *SWIGUNUSEDPARM
   int res1 = SWIG_TMPOBJ ;
   svn_revnum_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -36693,7 +35383,11 @@ SWIGINTERN PyObject *_wrap_svn_client_min_max_revisions(PyObject *SWIGUNUSEDPARM
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_min_max_revisions",&arg3,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_min_max_revisions",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_min_max_revisions", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -36772,6 +35466,8 @@ SWIGINTERN PyObject *_wrap_svn_client_patch(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *arg11 = (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 ;
@@ -36787,7 +35483,15 @@ SWIGINTERN PyObject *_wrap_svn_client_patch(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg11 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOOOOOO|O:svn_client_patch",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_patch",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_patch", "patch_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_patch", "wc_dir_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -36889,6 +35593,7 @@ SWIGINTERN PyObject *_wrap_svn_client_url_from_path2(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -36903,7 +35608,11 @@ SWIGINTERN PyObject *_wrap_svn_client_url_from_path2(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_url_from_path2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_url_from_path2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_url_from_path2", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -36952,7 +35661,7 @@ SWIGINTERN PyObject *_wrap_svn_client_url_from_path2(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -36984,6 +35693,7 @@ SWIGINTERN PyObject *_wrap_svn_client_url_from_path(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -36992,7 +35702,11 @@ SWIGINTERN PyObject *_wrap_svn_client_url_from_path(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_client_url_from_path",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_url_from_path",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_url_from_path", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -37027,7 +35741,7 @@ SWIGINTERN PyObject *_wrap_svn_client_url_from_path(PyObject *SWIGUNUSEDPARM(sel
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37057,6 +35771,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_repos_root(PyObject *SWIGUNUSEDPARM(se
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -37072,7 +35787,11 @@ SWIGINTERN PyObject *_wrap_svn_client_get_repos_root(PyObject *SWIGUNUSEDPARM(se
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_get_repos_root",&arg3,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_get_repos_root",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_get_repos_root", "abspath_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -37121,7 +35840,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_repos_root(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37134,7 +35853,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_repos_root(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37167,6 +35886,7 @@ SWIGINTERN PyObject *_wrap_svn_client_root_url_from_path(PyObject *SWIGUNUSEDPAR
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -37176,7 +35896,11 @@ SWIGINTERN PyObject *_wrap_svn_client_root_url_from_path(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_root_url_from_path",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_root_url_from_path",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_root_url_from_path", "path_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -37217,7 +35941,7 @@ SWIGINTERN PyObject *_wrap_svn_client_root_url_from_path(PyObject *SWIGUNUSEDPAR
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37244,6 +35968,7 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_url(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -37253,7 +35978,11 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_url(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_uuid_from_url",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_uuid_from_url",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_uuid_from_url", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -37294,7 +36023,7 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_url(PyObject *SWIGUNUSEDPARM(sel
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37322,6 +36051,7 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_path2(PyObject *SWIGUNUSEDPARM(s
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -37336,7 +36066,11 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_path2(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_uuid_from_path2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_uuid_from_path2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_uuid_from_path2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -37385,7 +36119,7 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_path2(PyObject *SWIGUNUSEDPARM(s
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37419,6 +36153,7 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_path(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -37429,7 +36164,11 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_path(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_uuid_from_path",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_uuid_from_path",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_uuid_from_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -37476,7 +36215,7 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_path(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37505,6 +36244,8 @@ SWIGINTERN PyObject *_wrap_svn_client_open_ra_session2(PyObject *SWIGUNUSEDPARM(
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_ra_session_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -37519,7 +36260,15 @@ SWIGINTERN PyObject *_wrap_svn_client_open_ra_session2(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|OO:svn_client_open_ra_session2",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_open_ra_session2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_open_ra_session2", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_client_open_ra_session2", "wri_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
@@ -37594,6 +36343,7 @@ SWIGINTERN PyObject *_wrap_svn_client_open_ra_session(PyObject *SWIGUNUSEDPARM(s
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_ra_session_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -37603,7 +36353,11 @@ SWIGINTERN PyObject *_wrap_svn_client_open_ra_session(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_open_ra_session",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_open_ra_session",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_client_open_ra_session", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -37657,14 +36411,14 @@ fail:
 
 SWIGINTERN PyObject *svn_client_conflict_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_conflict_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_conflict_option_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_conflict_option_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -37681,6 +36435,7 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver2(PyObject *SWIGUNUSEDPAR
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -37690,7 +36445,7 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver2(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_proplist_invoke_receiver2",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_proplist_invoke_receiver2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_proplist_receiver2_t * tmp =
     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);
@@ -37708,6 +36463,10 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver2(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_proplist_invoke_receiver2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -37769,6 +36528,7 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver(PyObject *SWIGUNUSEDPARM
   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 ;
@@ -37777,7 +36537,7 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_proplist_invoke_receiver",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_proplist_invoke_receiver",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_proplist_receiver_t * tmp =
     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);
@@ -37795,6 +36555,10 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_proplist_invoke_receiver", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -37863,7 +36627,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log3(PyObject *SWIGUNUSE
   arg6 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_get_commit_log3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_get_commit_log3",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_get_commit_log3_t * tmp =
     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);
@@ -37920,7 +36684,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log3(PyObject *SWIGUNUSE
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37933,7 +36697,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log3(PyObject *SWIGUNUSE
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -37975,7 +36739,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log2(PyObject *SWIGUNUSE
   arg6 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_get_commit_log2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_get_commit_log2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_get_commit_log2_t * tmp =
     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);
@@ -38032,7 +36796,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log2(PyObject *SWIGUNUSE
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -38045,7 +36809,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log2(PyObject *SWIGUNUSE
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -38087,7 +36851,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log(PyObject *SWIGUNUSED
   arg6 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_get_commit_log",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_get_commit_log",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_get_commit_log_t * tmp =
     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);
@@ -38144,7 +36908,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log(PyObject *SWIGUNUSED
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -38157,7 +36921,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log(PyObject *SWIGUNUSED
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -38198,6 +36962,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver4(PyObject *SWIGUNUSE
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
   PyObject * obj10 = 0 ;
@@ -38207,7 +36972,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver4(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg11 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOsOO|O:svn_client_invoke_blame_receiver4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&arg8,&obj8,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_blame_receiver4",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     svn_client_blame_receiver4_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -38250,15 +37015,23 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver4(PyObject *SWIGUNUSE
     }
   }
   {
+    arg8 = svn_swig_py_string_to_cstring(obj7, FALSE, "svn_client_invoke_blame_receiver4", "merged_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj8 == Py_None)
     arg9 = NULL;
     else {
-      if (!PyString_Check(obj8)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj8)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj8, (char **)&(value9.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value9.data = PyString_AS_STRING(obj8);
-      value9.len = PyString_GET_SIZE(obj8);
+      value9.len = pyStrLen;
       arg9 = &value9;
     }
   }
@@ -38333,6 +37106,8 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver3(PyObject *SWIGUNUSE
   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 ;
@@ -38341,7 +37116,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver3(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg13 = _global_pool;
-  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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_blame_receiver3",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     svn_client_blame_receiver3_t * tmp =
     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);
@@ -38396,6 +37171,14 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver3(PyObject *SWIGUNUSE
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_client_invoke_blame_receiver3", "merged_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj10, FALSE, "svn_client_invoke_blame_receiver3", "line");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg12 = (svn_boolean_t)SWIG_As_long (obj11);
     if (SWIG_arg_fail(svn_argnum_obj11)) {
       SWIG_fail;
@@ -38460,7 +37243,13 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver2(PyObject *SWIGUNUSE
   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 ;
   
@@ -38468,7 +37257,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver2(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_blame_receiver2",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     svn_client_blame_receiver2_t * tmp =
     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);
@@ -38493,11 +37282,35 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver2(PyObject *SWIGUNUSE
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_client_invoke_blame_receiver2", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_client_invoke_blame_receiver2", "date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_revnum_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
     }
   }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, FALSE, "svn_client_invoke_blame_receiver2", "merged_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_client_invoke_blame_receiver2", "merged_date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg10 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_client_invoke_blame_receiver2", "merged_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj10, FALSE, "svn_client_invoke_blame_receiver2", "line");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj11) {
     /* Verify that the user supplied a valid pool */
     if (obj11 != Py_None && obj11 != _global_py_pool) {
@@ -38553,6 +37366,9 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver(PyObject *SWIGUNUSED
   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 ;
   
@@ -38560,7 +37376,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOsss|O:svn_client_invoke_blame_receiver",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&arg7,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_blame_receiver",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     svn_client_blame_receiver_t * tmp =
     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);
@@ -38584,6 +37400,18 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver(PyObject *SWIGUNUSED
       SWIG_fail;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_client_invoke_blame_receiver", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_client_invoke_blame_receiver", "date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_client_invoke_blame_receiver", "line");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
     if (obj7 != Py_None && obj7 != _global_py_pool) {
@@ -38641,7 +37469,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_diff_summarize_func(PyObject *SWIGU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_diff_summarize_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_diff_summarize_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_diff_summarize_func_t * tmp =
     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);
@@ -38721,8 +37549,11 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke__layout_func(PyObject *SWIGUNUSEDPA
   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 ;
@@ -38734,7 +37565,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke__layout_func(PyObject *SWIGUNUSEDPA
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOssOOsOOOO|O:svn_client_invoke__layout_func",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&arg7,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke__layout_func",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     svn_client__layout_func_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -38752,6 +37583,14 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke__layout_func(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_invoke__layout_func", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_client_invoke__layout_func", "repos_root_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -38764,6 +37603,10 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke__layout_func(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_client_invoke__layout_func", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_boolean_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -38840,6 +37683,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_import_filter_func(PyObject *SWIGUN
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -38849,7 +37693,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_import_filter_func(PyObject *SWIGUN
   SWIG_fail;
   arg6 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_client_invoke_import_filter_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_import_filter_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_client_import_filter_func_t * tmp =
     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);
@@ -38867,6 +37711,10 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_import_filter_func(PyObject *SWIGUN
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_invoke_import_filter_func", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -38928,6 +37776,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_status_func(PyObject *SWIGUNUSEDPAR
   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 ;
@@ -38936,7 +37785,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_status_func(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_client_invoke_status_func",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_status_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_client_status_func_t * tmp =
     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);
@@ -38954,6 +37803,10 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_status_func(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_invoke_status_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -39016,7 +37869,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_conflict_walk_func(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_conflict_walk_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_conflict_walk_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_conflict_walk_func_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -39093,8 +37946,12 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func2(PyObject *SWIGUNUSEDPARM
   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 ;
   svn_error_t *result = 0 ;
   
@@ -39102,7 +37959,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func2(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOsss|O:svn_client_invoke_list_func2",&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&arg7,&arg8,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_list_func2",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     svn_client_list_func2_t * tmp =
     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);
@@ -39120,6 +37977,10 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func2(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_invoke_list_func2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_dirent_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -39131,6 +37992,18 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func2(PyObject *SWIGUNUSEDPARM
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_client_invoke_list_func2", "abs_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_client_invoke_list_func2", "external_parent_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, FALSE, "svn_client_invoke_list_func2", "external_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj8) {
     /* Verify that the user supplied a valid pool */
     if (obj8 != Py_None && obj8 != _global_py_pool) {
@@ -39183,8 +38056,10 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func(PyObject *SWIGUNUSEDPARM(
   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 ;
   
@@ -39192,7 +38067,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOs|O:svn_client_invoke_list_func",&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_list_func",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_client_list_func_t * tmp =
     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);
@@ -39210,6 +38085,10 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_invoke_list_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_dirent_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -39221,6 +38100,10 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_client_invoke_list_func", "abs_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
     if (obj6 != Py_None && obj6 != _global_py_pool) {
@@ -39271,6 +38154,7 @@ SWIGINTERN PyObject *_wrap_svn_info_invoke_receiver(PyObject *SWIGUNUSEDPARM(sel
   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 ;
@@ -39279,7 +38163,7 @@ SWIGINTERN PyObject *_wrap_svn_info_invoke_receiver(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_info_invoke_receiver",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_info_invoke_receiver",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_info_receiver_t * tmp =
     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);
@@ -39297,6 +38181,10 @@ SWIGINTERN PyObject *_wrap_svn_info_invoke_receiver(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_info_invoke_receiver", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_info_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_info_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -39352,6 +38240,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_info_receiver2(PyObject *SWIGUNUSED
   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 ;
@@ -39360,7 +38249,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_info_receiver2(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_client_invoke_info_receiver2",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_info_receiver2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_client_info_receiver2_t * tmp =
     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);
@@ -39378,6 +38267,10 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_info_receiver2(PyObject *SWIGUNUSED
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_invoke_info_receiver2", "abspath_or_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -39437,6 +38330,9 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_patch_func(PyObject *SWIGUNUSEDPARM
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -39445,7 +38341,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_patch_func(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg7 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsss|O:svn_client_invoke_patch_func",&obj0,&obj1,&arg4,&arg5,&arg6,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_client_invoke_patch_func",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_client_patch_func_t * tmp =
     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);
@@ -39462,6 +38358,18 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_patch_func(PyObject *SWIGUNUSEDPARM
       PyErr_Clear();
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_client_invoke_patch_func", "canon_path_from_patchfile");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_client_invoke_patch_func", "patch_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_client_invoke_patch_func", "reject_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -39509,133 +38417,133 @@ fail:
 
 SWIGINTERN PyObject *svn_proplist_receiver2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_proplist_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_get_commit_log3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_get_commit_log2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_get_commit_log_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_blame_receiver4_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_blame_receiver3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_blame_receiver2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_blame_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_diff_summarize_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client__layout_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_import_filter_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_status_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_conflict_walk_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_list_func2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_list_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_info_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_info_receiver2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_client_patch_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -39904,8 +38812,8 @@ 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 *)"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"},
-	 { (char *)"svn_client_status5", _wrap_svn_client_status5, METH_VARARGS, (char *)"svn_client_status5(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 update, 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"},
+	 { (char *)"svn_client_status6", _wrap_svn_client_status6, METH_VARARGS, (char *)"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, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_client_status5", _wrap_svn_client_status5, METH_VARARGS, (char *)"svn_client_status5(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 update, 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, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_client_status4", _wrap_svn_client_status4, METH_VARARGS, (char *)"svn_client_status4(char const * path, svn_opt_revision_t revision, svn_wc_status_func3_t status_func, void * status_baton, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_client_status3", _wrap_svn_client_status3, METH_VARARGS, (char *)"svn_client_status3(char const * path, svn_opt_revision_t revision, svn_wc_status_func2_t status_func, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_client_status2", _wrap_svn_client_status2, METH_VARARGS, (char *)"svn_client_status2(char const * path, svn_opt_revision_t revision, svn_wc_status_func2_t status_func, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"},
@@ -40069,62 +38977,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_client_cat3", _wrap_svn_client_cat3, METH_VARARGS, (char *)"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"},
 	 { (char *)"svn_client_cat2", _wrap_svn_client_cat2, METH_VARARGS, (char *)"svn_client_cat2(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_client_cat", _wrap_svn_client_cat, METH_VARARGS, (char *)"svn_client_cat(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_t_name_set", _wrap_svn_client__shelf_t_name_set, METH_VARARGS, (char *)"svn_client__shelf_t_name_set(svn_client__shelf_t self, char const * name)"},
-	 { (char *)"svn_client__shelf_t_name_get", _wrap_svn_client__shelf_t_name_get, METH_VARARGS, (char *)"svn_client__shelf_t_name_get(svn_client__shelf_t self) -> char const *"},
-	 { (char *)"svn_client__shelf_t_max_version_set", _wrap_svn_client__shelf_t_max_version_set, METH_VARARGS, (char *)"svn_client__shelf_t_max_version_set(svn_client__shelf_t self, int max_version)"},
-	 { (char *)"svn_client__shelf_t_max_version_get", _wrap_svn_client__shelf_t_max_version_get, METH_VARARGS, (char *)"svn_client__shelf_t_max_version_get(svn_client__shelf_t self) -> int"},
-	 { (char *)"svn_client__shelf_t_wc_root_abspath_set", _wrap_svn_client__shelf_t_wc_root_abspath_set, METH_VARARGS, (char *)"svn_client__shelf_t_wc_root_abspath_set(svn_client__shelf_t self, char const * wc_root_abspath)"},
-	 { (char *)"svn_client__shelf_t_wc_root_abspath_get", _wrap_svn_client__shelf_t_wc_root_abspath_get, METH_VARARGS, (char *)"svn_client__shelf_t_wc_root_abspath_get(svn_client__shelf_t self) -> char const *"},
-	 { (char *)"svn_client__shelf_t_shelves_dir_set", _wrap_svn_client__shelf_t_shelves_dir_set, METH_VARARGS, (char *)"svn_client__shelf_t_shelves_dir_set(svn_client__shelf_t self, char const * shelves_dir)"},
-	 { (char *)"svn_client__shelf_t_shelves_dir_get", _wrap_svn_client__shelf_t_shelves_dir_get, METH_VARARGS, (char *)"svn_client__shelf_t_shelves_dir_get(svn_client__shelf_t self) -> char const *"},
-	 { (char *)"svn_client__shelf_t_revprops_set", _wrap_svn_client__shelf_t_revprops_set, METH_VARARGS, (char *)"svn_client__shelf_t_revprops_set(svn_client__shelf_t self, apr_hash_t revprops)"},
-	 { (char *)"svn_client__shelf_t_revprops_get", _wrap_svn_client__shelf_t_revprops_get, METH_VARARGS, (char *)"svn_client__shelf_t_revprops_get(svn_client__shelf_t self) -> apr_hash_t"},
-	 { (char *)"svn_client__shelf_t_ctx_set", _wrap_svn_client__shelf_t_ctx_set, METH_VARARGS, (char *)"svn_client__shelf_t_ctx_set(svn_client__shelf_t self, svn_client_ctx_t ctx)"},
-	 { (char *)"svn_client__shelf_t_ctx_get", _wrap_svn_client__shelf_t_ctx_get, METH_VARARGS, (char *)"svn_client__shelf_t_ctx_get(svn_client__shelf_t self) -> svn_client_ctx_t"},
-	 { (char *)"svn_client__shelf_t_pool_set", _wrap_svn_client__shelf_t_pool_set, METH_VARARGS, (char *)"svn_client__shelf_t_pool_set(svn_client__shelf_t self, apr_pool_t pool)"},
-	 { (char *)"svn_client__shelf_t_pool_get", _wrap_svn_client__shelf_t_pool_get, METH_VARARGS, (char *)"svn_client__shelf_t_pool_get(svn_client__shelf_t self) -> apr_pool_t"},
-	 { (char *)"new_svn_client__shelf_t", _wrap_new_svn_client__shelf_t, METH_VARARGS, (char *)"new_svn_client__shelf_t() -> svn_client__shelf_t"},
-	 { (char *)"delete_svn_client__shelf_t", _wrap_delete_svn_client__shelf_t, METH_VARARGS, (char *)"delete_svn_client__shelf_t(svn_client__shelf_t self)"},
-	 { (char *)"svn_client__shelf_t_swigregister", svn_client__shelf_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"svn_client__shelf_version_t_shelf_set", _wrap_svn_client__shelf_version_t_shelf_set, METH_VARARGS, (char *)"svn_client__shelf_version_t_shelf_set(svn_client__shelf_version_t self, svn_client__shelf_t shelf)"},
-	 { (char *)"svn_client__shelf_version_t_shelf_get", _wrap_svn_client__shelf_version_t_shelf_get, METH_VARARGS, (char *)"svn_client__shelf_version_t_shelf_get(svn_client__shelf_version_t self) -> svn_client__shelf_t"},
-	 { (char *)"svn_client__shelf_version_t_mtime_set", _wrap_svn_client__shelf_version_t_mtime_set, METH_VARARGS, (char *)"svn_client__shelf_version_t_mtime_set(svn_client__shelf_version_t self, apr_time_t mtime)"},
-	 { (char *)"svn_client__shelf_version_t_mtime_get", _wrap_svn_client__shelf_version_t_mtime_get, METH_VARARGS, (char *)"svn_client__shelf_version_t_mtime_get(svn_client__shelf_version_t self) -> apr_time_t"},
-	 { (char *)"svn_client__shelf_version_t_files_dir_abspath_set", _wrap_svn_client__shelf_version_t_files_dir_abspath_set, METH_VARARGS, (char *)"svn_client__shelf_version_t_files_dir_abspath_set(svn_client__shelf_version_t self, char const * files_dir_abspath)"},
-	 { (char *)"svn_client__shelf_version_t_files_dir_abspath_get", _wrap_svn_client__shelf_version_t_files_dir_abspath_get, METH_VARARGS, (char *)"svn_client__shelf_version_t_files_dir_abspath_get(svn_client__shelf_version_t self) -> char const *"},
-	 { (char *)"svn_client__shelf_version_t_version_number_set", _wrap_svn_client__shelf_version_t_version_number_set, METH_VARARGS, (char *)"svn_client__shelf_version_t_version_number_set(svn_client__shelf_version_t self, int version_number)"},
-	 { (char *)"svn_client__shelf_version_t_version_number_get", _wrap_svn_client__shelf_version_t_version_number_get, METH_VARARGS, (char *)"svn_client__shelf_version_t_version_number_get(svn_client__shelf_version_t self) -> int"},
-	 { (char *)"new_svn_client__shelf_version_t", _wrap_new_svn_client__shelf_version_t, METH_VARARGS, (char *)"new_svn_client__shelf_version_t() -> svn_client__shelf_version_t"},
-	 { (char *)"delete_svn_client__shelf_version_t", _wrap_delete_svn_client__shelf_version_t, METH_VARARGS, (char *)"delete_svn_client__shelf_version_t(svn_client__shelf_version_t self)"},
-	 { (char *)"svn_client__shelf_version_t_swigregister", svn_client__shelf_version_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"svn_client__shelf_open_or_create", _wrap_svn_client__shelf_open_or_create, METH_VARARGS, (char *)"svn_client__shelf_open_or_create(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_open_existing", _wrap_svn_client__shelf_open_existing, METH_VARARGS, (char *)"svn_client__shelf_open_existing(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_close", _wrap_svn_client__shelf_close, METH_VARARGS, (char *)"svn_client__shelf_close(svn_client__shelf_t shelf, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_delete", _wrap_svn_client__shelf_delete, METH_VARARGS, (char *)"svn_client__shelf_delete(char const * name, char const * local_abspath, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_mods_editor", _wrap_svn_client__shelf_mods_editor, METH_VARARGS, (char *)"svn_client__shelf_mods_editor(svn_client__shelf_version_t shelf_version, svn_wc_notify_func2_t notify_func, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_save_new_version3", _wrap_svn_client__shelf_save_new_version3, METH_VARARGS, (char *)"svn_client__shelf_save_new_version3(svn_client__shelf_t shelf, apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_status_func_t shelved_func, void * shelved_baton, svn_client_status_func_t not_shelved_func, void * not_shelved_baton, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_delete_newer_versions", _wrap_svn_client__shelf_delete_newer_versions, METH_VARARGS, (char *)"svn_client__shelf_delete_newer_versions(svn_client__shelf_t shelf, svn_client__shelf_version_t shelf_version, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_version_open", _wrap_svn_client__shelf_version_open, METH_VARARGS, (char *)"svn_client__shelf_version_open(svn_client__shelf_t shelf, int version_number, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_get_newest_version", _wrap_svn_client__shelf_get_newest_version, METH_VARARGS, (char *)"svn_client__shelf_get_newest_version(svn_client__shelf_t shelf, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_get_all_versions", _wrap_svn_client__shelf_get_all_versions, METH_VARARGS, (char *)"svn_client__shelf_get_all_versions(svn_client__shelf_t shelf, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_apply", _wrap_svn_client__shelf_apply, METH_VARARGS, (char *)"svn_client__shelf_apply(svn_client__shelf_version_t shelf_version, svn_boolean_t dry_run, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_test_apply_file", _wrap_svn_client__shelf_test_apply_file, METH_VARARGS, (char *)"svn_client__shelf_test_apply_file(svn_client__shelf_version_t shelf_version, char const * file_relpath, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_unapply", _wrap_svn_client__shelf_unapply, METH_VARARGS, (char *)"svn_client__shelf_unapply(svn_client__shelf_version_t shelf_version, svn_boolean_t dry_run, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_replay", _wrap_svn_client__shelf_replay, METH_VARARGS, (char *)"svn_client__shelf_replay(svn_client__shelf_version_t shelf_version, char const * top_relpath, svn_delta_editor_t editor, void * edit_baton, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_paths_changed", _wrap_svn_client__shelf_paths_changed, METH_VARARGS, (char *)"svn_client__shelf_paths_changed(svn_client__shelf_version_t shelf_version, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_revprop_set", _wrap_svn_client__shelf_revprop_set, METH_VARARGS, (char *)"svn_client__shelf_revprop_set(svn_client__shelf_t shelf, char const * prop_name, svn_string_t const * prop_val, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_revprop_set_all", _wrap_svn_client__shelf_revprop_set_all, METH_VARARGS, (char *)"svn_client__shelf_revprop_set_all(svn_client__shelf_t shelf, apr_hash_t revprop_table, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_revprop_get", _wrap_svn_client__shelf_revprop_get, METH_VARARGS, (char *)"svn_client__shelf_revprop_get(svn_client__shelf_t shelf, char const * prop_name, apr_pool_t result_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_revprop_list", _wrap_svn_client__shelf_revprop_list, METH_VARARGS, (char *)"svn_client__shelf_revprop_list(svn_client__shelf_t shelf, apr_pool_t result_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_set_log_message", _wrap_svn_client__shelf_set_log_message, METH_VARARGS, (char *)"svn_client__shelf_set_log_message(svn_client__shelf_t shelf, char const * log_message, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_get_log_message", _wrap_svn_client__shelf_get_log_message, METH_VARARGS, (char *)"svn_client__shelf_get_log_message(svn_client__shelf_t shelf, apr_pool_t result_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_info_t_mtime_set", _wrap_svn_client__shelf_info_t_mtime_set, METH_VARARGS, (char *)"svn_client__shelf_info_t_mtime_set(svn_client__shelf_info_t self, apr_time_t mtime)"},
-	 { (char *)"svn_client__shelf_info_t_mtime_get", _wrap_svn_client__shelf_info_t_mtime_get, METH_VARARGS, (char *)"svn_client__shelf_info_t_mtime_get(svn_client__shelf_info_t self) -> apr_time_t"},
-	 { (char *)"new_svn_client__shelf_info_t", _wrap_new_svn_client__shelf_info_t, METH_VARARGS, (char *)"new_svn_client__shelf_info_t() -> svn_client__shelf_info_t"},
-	 { (char *)"delete_svn_client__shelf_info_t", _wrap_delete_svn_client__shelf_info_t, METH_VARARGS, (char *)"delete_svn_client__shelf_info_t(svn_client__shelf_info_t self)"},
-	 { (char *)"svn_client__shelf_info_t_swigregister", svn_client__shelf_info_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"svn_client__shelf_list", _wrap_svn_client__shelf_list, METH_VARARGS, (char *)"svn_client__shelf_list(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
-	 { (char *)"svn_client__shelf_version_status_walk", _wrap_svn_client__shelf_version_status_walk, METH_VARARGS, (char *)"svn_client__shelf_version_status_walk(svn_client__shelf_version_t shelf_version, char const * wc_relpath, svn_wc_status_func4_t walk_func, void * walk_baton, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_client_add_to_changelist", _wrap_svn_client_add_to_changelist, METH_VARARGS, (char *)"svn_client_add_to_changelist(apr_array_header_t paths, char const * changelist, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_client_remove_from_changelists", _wrap_svn_client_remove_from_changelists, METH_VARARGS, (char *)"svn_client_remove_from_changelists(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_client_get_changelists", _wrap_svn_client_get_changelists, METH_VARARGS, (char *)"svn_client_get_changelists(char const * path, apr_array_header_t changelists, svn_depth_t depth, svn_changelist_receiver_t callback_func, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"},
@@ -40314,7 +39166,6 @@ static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_s
 static swig_type_info _swigt__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 = {"_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_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__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 = {"_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_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0};
@@ -40350,7 +39201,6 @@ static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client
 static swig_type_info _swigt__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 = {"_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_error_t *(**)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_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_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 = {"_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_error_t *(**)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_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_error_t *(**)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_wc_status_func3_t *|svn_error_t *(**)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "void (**)(void *,struct svn_wc_notify_t const *,apr_pool_t *)|svn_wc_notify_func2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__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 = {"_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_error_t *(**)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t *", 0, 0, (void*)0, 0};
@@ -40358,17 +39208,13 @@ static swig_type_info _swigt__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_c
 static swig_type_info _swigt__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_client_conflict_walk_func_t *|svn_error_t *(**)(void *,svn_client_conflict_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__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 = {"_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_client_blame_receiver3_t *|svn_error_t *(**)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_auth_provider_object_t = {"_p_p_svn_auth_provider_object_t", "struct svn_auth_provider_object_t **|svn_auth_provider_object_t **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_svn_client__shelf_t = {"_p_p_svn_client__shelf_t", "struct svn_client__shelf_t **|svn_client__shelf_t **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_svn_client__shelf_version_t = {"_p_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t **|svn_client__shelf_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_commit_info_t = {"_p_p_svn_client_commit_info_t", "struct svn_client_commit_info_t **|svn_client_commit_info_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_commit_item3_t = {"_p_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t **|svn_client_commit_item3_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_conflict_t = {"_p_p_svn_client_conflict_t", "struct svn_client_conflict_t **|svn_client_conflict_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_ctx_t = {"_p_p_svn_client_ctx_t", "struct svn_client_ctx_t **|svn_client_ctx_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_commit_info_t = {"_p_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_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_ra_session_t = {"_p_p_svn_ra_session_t", "struct svn_ra_session_t **|svn_ra_session_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_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};
 static swig_type_info _swigt__p_svn_auth_cred_ssl_client_cert_pw_t = {"_p_svn_auth_cred_ssl_client_cert_pw_t", "struct svn_auth_cred_ssl_client_cert_pw_t *|svn_auth_cred_ssl_client_cert_pw_t *", 0, 0, (void*)0, 0};
@@ -40383,9 +39229,7 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_info_t = {"_p_svn_client__shelf_info_t", "struct svn_client__shelf_info_t *|svn_client__shelf_info_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_t = {"_p_svn_client__shelf_t", "struct svn_client__shelf_t *|svn_client__shelf_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t *|svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_info_t = {"_p_svn_client_commit_info_t", "struct svn_client_commit_info_t *|svn_client_commit_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_item2_t = {"_p_svn_client_commit_item2_t", "struct svn_client_commit_item2_t *|svn_client_commit_item2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_item3_t = {"_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t *|svn_client_commit_item3_t *", 0, 0, (void*)0, 0};
@@ -40524,7 +39368,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__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,
   &_swigt__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,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t,
-  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void,
   &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void,
   &_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t,
@@ -40560,7 +39403,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__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,
   &_swigt__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,
   &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t,
-  &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void,
   &_swigt__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,
@@ -40568,17 +39410,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__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,
   &_swigt__p_p_svn_auth_provider_object_t,
-  &_swigt__p_p_svn_client__shelf_t,
-  &_swigt__p_p_svn_client__shelf_version_t,
   &_swigt__p_p_svn_client_commit_info_t,
   &_swigt__p_p_svn_client_commit_item3_t,
   &_swigt__p_p_svn_client_conflict_t,
   &_swigt__p_p_svn_client_ctx_t,
   &_swigt__p_p_svn_commit_info_t,
-  &_swigt__p_p_svn_delta_editor_t,
   &_swigt__p_p_svn_ra_session_t,
   &_swigt__p_p_svn_string_t,
-  &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
   &_swigt__p_svn_auth_cred_ssl_client_cert_pw_t,
@@ -40593,8 +39431,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
-  &_swigt__p_svn_client__shelf_info_t,
-  &_swigt__p_svn_client__shelf_t,
   &_swigt__p_svn_client__shelf_version_t,
   &_swigt__p_svn_client_commit_info_t,
   &_swigt__p_svn_client_commit_item2_t,
@@ -40734,7 +39570,6 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_s
 static swig_cast_info _swigc__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[] = {  {&_swigt__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, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__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[] = {  {&_swigt__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, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_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_wc_status3_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_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_struct_svn_wc_status2_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -40770,7 +39605,6 @@ static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_client
 static swig_cast_info _swigc__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[] = {  {&_swigt__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, 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_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[] = {  {&_swigt__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, 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_info_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_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__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_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_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_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_wc_notify_t_p_apr_pool_t__void[] = {  {&_swigt__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__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[] = {  {&_swigt__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, 0, 0, 0},{0, 0, 0, 0}};
@@ -40778,17 +39612,13 @@ static swig_cast_info _swigc__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_c
 static swig_cast_info _swigc__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_svn_client_conflict_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_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[] = {  {&_swigt__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, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_auth_provider_object_t[] = {  {&_swigt__p_p_svn_auth_provider_object_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_svn_client__shelf_t[] = {  {&_swigt__p_p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_svn_client__shelf_version_t[] = {  {&_swigt__p_p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_commit_info_t[] = {  {&_swigt__p_p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_commit_item3_t[] = {  {&_swigt__p_p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_conflict_t[] = {  {&_swigt__p_p_svn_client_conflict_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_ctx_t[] = {  {&_swigt__p_p_svn_client_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_commit_info_t[] = {  {&_swigt__p_p_svn_commit_info_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}};
 static swig_cast_info _swigc__p_p_svn_ra_session_t[] = {  {&_swigt__p_p_svn_ra_session_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_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}};
 static swig_cast_info _swigc__p_svn_auth_cred_ssl_client_cert_pw_t[] = {  {&_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -40803,8 +39633,6 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_client__shelf_info_t[] = {  {&_swigt__p_svn_client__shelf_info_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_client__shelf_t[] = {  {&_swigt__p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client_commit_info_t[] = {  {&_swigt__p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client_commit_item2_t[] = {  {&_swigt__p_svn_client_commit_item2_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -40944,7 +39772,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__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,
   _swigc__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,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t,
-  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void,
   _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void,
   _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t,
@@ -40980,7 +39807,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__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,
   _swigc__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,
   _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t,
-  _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void,
   _swigc__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,
@@ -40988,17 +39814,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t,
   _swigc__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,
   _swigc__p_p_svn_auth_provider_object_t,
-  _swigc__p_p_svn_client__shelf_t,
-  _swigc__p_p_svn_client__shelf_version_t,
   _swigc__p_p_svn_client_commit_info_t,
   _swigc__p_p_svn_client_commit_item3_t,
   _swigc__p_p_svn_client_conflict_t,
   _swigc__p_p_svn_client_ctx_t,
   _swigc__p_p_svn_commit_info_t,
-  _swigc__p_p_svn_delta_editor_t,
   _swigc__p_p_svn_ra_session_t,
   _swigc__p_p_svn_string_t,
-  _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
   _swigc__p_svn_auth_cred_ssl_client_cert_pw_t,
@@ -41013,8 +39835,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
-  _swigc__p_svn_client__shelf_info_t,
-  _swigc__p_svn_client__shelf_t,
   _swigc__p_svn_client__shelf_version_t,
   _swigc__p_svn_client_commit_info_t,
   _swigc__p_svn_client_commit_item2_t,
diff --git a/subversion/bindings/swig/python/svn_delta.c b/subversion/bindings/swig/python/svn_delta.c
index 0e047ab..ecf2bd1 100644
--- a/subversion/bindings/swig/python/svn_delta.c
+++ b/subversion/bindings/swig/python/svn_delta.c
@@ -8,13 +8,15 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+
+
 
 #ifndef SWIGPYTHON
 #define SWIGPYTHON
 #endif
 
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#define SWIG_PYTHON_CLASSIC
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -3043,54 +3045,56 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #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_delta_path_driver_state_t swig_types[63]
-#define SWIGTYPE_p_svn_depth_t swig_types[64]
-#define SWIGTYPE_p_svn_diff_hunk_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_lock_target_t swig_types[69]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[70]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[71]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[72]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[73]
-#define SWIGTYPE_p_svn_lock_t swig_types[74]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[75]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[76]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[77]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[78]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[79]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[80]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[81]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[82]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[83]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[84]
-#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[85]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[86]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[87]
-#define SWIGTYPE_p_svn_prop_kind swig_types[88]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[89]
-#define SWIGTYPE_p_svn_stream_t swig_types[90]
-#define SWIGTYPE_p_svn_string_t swig_types[91]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[92]
-#define SWIGTYPE_p_svn_tristate_t swig_types[93]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[94]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[95]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[96]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[97]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[98]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[99]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[100]
-#define SWIGTYPE_p_svn_version_t swig_types[101]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[102]
-#define SWIGTYPE_p_unsigned_char swig_types[103]
-#define SWIGTYPE_p_unsigned_long swig_types[104]
-#define SWIGTYPE_p_void swig_types[105]
-static swig_type_info *swig_types[107];
-static swig_module_info swig_module = {swig_types, 106, 0, 0, 0, 0};
+#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[60]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[61]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[62]
+#define SWIGTYPE_p_svn_config_t swig_types[63]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[64]
+#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[65]
+#define SWIGTYPE_p_svn_depth_t swig_types[66]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[67]
+#define SWIGTYPE_p_svn_dirent_t swig_types[68]
+#define SWIGTYPE_p_svn_errno_t swig_types[69]
+#define SWIGTYPE_p_svn_error_t swig_types[70]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[71]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[72]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[73]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[74]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[75]
+#define SWIGTYPE_p_svn_lock_t swig_types[76]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[77]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[78]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[79]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[80]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[81]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[82]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[83]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[84]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[85]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[86]
+#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[87]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[88]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[89]
+#define SWIGTYPE_p_svn_prop_kind swig_types[90]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[91]
+#define SWIGTYPE_p_svn_stream_t swig_types[92]
+#define SWIGTYPE_p_svn_string_t swig_types[93]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[94]
+#define SWIGTYPE_p_svn_tristate_t swig_types[95]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[96]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[97]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[98]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[99]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[100]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[101]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[102]
+#define SWIGTYPE_p_svn_version_t swig_types[103]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[104]
+#define SWIGTYPE_p_unsigned_char swig_types[105]
+#define SWIGTYPE_p_unsigned_long swig_types[106]
+#define SWIGTYPE_p_void swig_types[107]
+static swig_type_info *swig_types[109];
+static swig_module_info swig_module = {swig_types, 108, 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)
 
@@ -3101,6 +3105,12 @@ static swig_module_info swig_module = {swig_types, 106, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
 
 /*-----------------------------------------------
               @(target):= _delta.so
@@ -3127,6 +3137,7 @@ static swig_module_info swig_module = {swig_types, 106, 0, 0, 0, 0};
 
 
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 
 
 static PyObject * _global_py_pool = NULL;
@@ -3678,7 +3689,7 @@ SWIGINTERN PyObject *_wrap_svn_swig_py_make_editor(PyObject *SWIGUNUSEDPARM(self
   arg4 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_swig_py_make_editor",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_swig_py_make_editor",1,2,&obj0,&obj1)) SWIG_fail;
   arg3 = obj0;
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -3725,7 +3736,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_version(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_delta_version")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_version",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3749,7 +3760,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_action_code_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_op_t_action_code_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_op_t_action_code_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3776,7 +3787,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_action_code_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   enum svn_delta_action result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_op_t_action_code_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_op_t_action_code_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3798,7 +3809,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_offset_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_op_t_offset_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_op_t_offset_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3825,7 +3836,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_offset_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   apr_size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_op_t_offset_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_op_t_offset_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3847,7 +3858,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_length_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_op_t_length_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_op_t_length_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3874,7 +3885,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_length_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   apr_size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_op_t_length_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_op_t_length_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3893,7 +3904,7 @@ SWIGINTERN PyObject *_wrap_new_svn_txdelta_op_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_txdelta_op_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_txdelta_op_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_txdelta_op_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3915,7 +3926,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_txdelta_op_t(PyObject *SWIGUNUSEDPARM(self
   struct svn_txdelta_op_t *arg1 = (struct svn_txdelta_op_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_txdelta_op_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_txdelta_op_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3939,7 +3950,7 @@ fail:
 
 SWIGINTERN PyObject *svn_txdelta_op_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_txdelta_op_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -3951,7 +3962,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_sview_offset_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_sview_offset_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_sview_offset_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3973,7 +3984,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_sview_offset_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_sview_offset_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_sview_offset_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3995,7 +4006,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_sview_len_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_sview_len_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_sview_len_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4022,7 +4033,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_sview_len_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   apr_size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_sview_len_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_sview_len_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4044,7 +4055,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_tview_len_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_tview_len_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_tview_len_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4071,7 +4082,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_tview_len_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   apr_size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_tview_len_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_tview_len_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4093,7 +4104,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_num_ops_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_num_ops_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_num_ops_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4120,7 +4131,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_num_ops_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_num_ops_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_num_ops_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4142,7 +4153,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_src_ops_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_src_ops_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_src_ops_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4169,7 +4180,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_src_ops_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_src_ops_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_src_ops_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4190,7 +4201,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_new_data_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_string_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_new_data_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t_new_data_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4199,7 +4210,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_new_data_get(PyObject *SWIGUNUSE
   }
   result = (svn_string_t *) ((arg1)->new_data);
   {
-    resultobj = PyString_FromStringAndSize(result->data, result->len);
+    resultobj = PyBytes_FromStringAndSize(result->data, result->len);
   }
   return resultobj;
 fail:
@@ -4219,7 +4230,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t__ops_get(PyObject *SWIGUNUSEDPAR
   
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t__ops_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_t__ops_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4261,7 +4272,7 @@ SWIGINTERN PyObject *_wrap_new_svn_txdelta_window_t(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   struct svn_txdelta_window_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_txdelta_window_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_txdelta_window_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4283,7 +4294,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_txdelta_window_t(PyObject *SWIGUNUSEDPARM(
   struct svn_txdelta_window_t *arg1 = (struct svn_txdelta_window_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_txdelta_window_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_txdelta_window_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4307,7 +4318,7 @@ fail:
 
 SWIGINTERN PyObject *svn_txdelta_window_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_txdelta_window_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4326,7 +4337,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_dup(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_txdelta_window_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_window_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4379,7 +4390,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_compose_windows(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_compose_windows",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_compose_windows",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4431,9 +4442,11 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_apply_instructions(PyObject *SWIGUNUSEDPA
   apr_size_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"Oss:svn_txdelta_apply_instructions",&obj0,&arg2,&arg3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_apply_instructions",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4441,6 +4454,14 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_apply_instructions(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_txdelta_apply_instructions", "sbuf");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_txdelta_apply_instructions", "tbuf");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     svn_txdelta_apply_instructions(arg1,(char const *)arg2,arg3,arg4);
@@ -4495,7 +4516,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_run(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg10 = _global_pool;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO|OO:svn_txdelta_run",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_run",6,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -4580,13 +4601,10 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_run(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_txdelta_run arg 6 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_txdelta_run is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg6, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -4624,7 +4642,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_stream_create(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_stream_create",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_stream_create",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -4696,7 +4714,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_next_window(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_txdelta_next_window",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_next_window",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_txdelta_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4754,7 +4772,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_md5_digest(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   unsigned char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_md5_digest",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_md5_digest",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_txdelta_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4797,7 +4815,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta2(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -4879,7 +4897,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -4955,7 +4973,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_target_push(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_target_push",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_target_push",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_txdelta_window_handler_t * tmp =
     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);
@@ -5032,17 +5050,21 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_string(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_send_string",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_send_string",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (obj0 == Py_None)
     arg1 = NULL;
     else {
-      if (!PyString_Check(obj0)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj0)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj0, (char **)&(value1.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value1.data = PyString_AS_STRING(obj0);
-      value1.len = PyString_GET_SIZE(obj0);
+      value1.len = pyStrLen;
       arg1 = &value1;
     }
   }
@@ -5122,7 +5144,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_stream(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg5 = _global_pool;
   arg4 = temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_send_stream",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_send_stream",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -5178,7 +5200,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_stream(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize((char *)arg4, APR_MD5_DIGESTSIZE));
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyBytes_FromStringAndSize((const char *)arg4, APR_MD5_DIGESTSIZE));
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -5210,7 +5232,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_txstream(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_send_txstream",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_send_txstream",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_txdelta_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5292,7 +5314,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_contents(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_txdelta_send_contents",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_send_contents",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (unsigned char *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_unsigned_char, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5375,6 +5397,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_apply(PyObject *SWIGUNUSEDPARM(self), PyO
   void *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   
   if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
@@ -5393,7 +5416,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_apply(PyObject *SWIGUNUSEDPARM(self), PyO
     if (arg6 == NULL) SWIG_fail;
   }
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OOz|O:svn_txdelta_apply",&obj0,&obj1,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_apply",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -5416,6 +5439,10 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_apply(PyObject *SWIGUNUSEDPARM(self), PyO
       }
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_txdelta_apply", "error_info");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -5488,7 +5515,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff3(PyObject *SWIGUNUSEDPARM(self
     if (arg1 == NULL) SWIG_fail;
   }
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_to_svndiff3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_to_svndiff3",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg3 = NULL;
@@ -5582,7 +5609,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff2(PyObject *SWIGUNUSEDPARM(self
     if (arg1 == NULL) SWIG_fail;
   }
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_to_svndiff2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_to_svndiff2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg3 = NULL;
@@ -5668,7 +5695,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff(PyObject *SWIGUNUSEDPARM(self)
     if (arg3 == NULL) SWIG_fail;
   }
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_txdelta_to_svndiff",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_to_svndiff",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -5739,7 +5766,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff_stream(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_to_svndiff_stream",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_to_svndiff_stream",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_txdelta_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5806,7 +5833,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_parse_svndiff(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_parse_svndiff",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_parse_svndiff",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_txdelta_window_handler_t * tmp =
     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);
@@ -5878,7 +5905,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_read_svndiff_window(PyObject *SWIGUNUSEDP
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_read_svndiff_window",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_read_svndiff_window",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -5957,7 +5984,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_skip_svndiff_window(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_skip_svndiff_window",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_skip_svndiff_window",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = svn_swig_py_make_file(obj0, _global_pool);
     if (!arg1) SWIG_fail;
@@ -6014,7 +6041,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_set_target_revision_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_set_target_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_set_target_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6041,7 +6068,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_set_target_revision_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_revnum_t,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_set_target_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_set_target_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6063,7 +6090,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_root_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_open_root_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_open_root_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6090,7 +6117,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_root_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_revnum_t,apr_pool_t *,void **) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_open_root_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_open_root_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6112,7 +6139,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_delete_entry_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_delete_entry_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_delete_entry_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6139,7 +6166,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_delete_entry_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,svn_revnum_t,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_delete_entry_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_delete_entry_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6161,7 +6188,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_add_directory_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_add_directory_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_add_directory_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6188,7 +6215,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_add_directory_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_add_directory_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_add_directory_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6210,7 +6237,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_directory_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_open_directory_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_open_directory_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6237,7 +6264,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_directory_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,svn_revnum_t,apr_pool_t *,void **) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_open_directory_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_open_directory_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6259,7 +6286,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_change_dir_prop_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_change_dir_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_change_dir_prop_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6286,7 +6313,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_change_dir_prop_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_string_t const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_change_dir_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_change_dir_prop_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6308,7 +6335,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_directory_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_close_directory_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_close_directory_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6335,7 +6362,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_directory_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_close_directory_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_close_directory_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6357,7 +6384,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_absent_directory_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_absent_directory_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_absent_directory_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6384,7 +6411,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_absent_directory_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_absent_directory_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_absent_directory_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6406,7 +6433,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_add_file_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_add_file_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_add_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6433,7 +6460,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_add_file_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_add_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_add_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6455,7 +6482,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_file_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_open_file_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_open_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6482,7 +6509,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_file_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,svn_revnum_t,apr_pool_t *,void **) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_open_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_open_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6504,7 +6531,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_apply_textdelta_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_apply_textdelta_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_apply_textdelta_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6531,7 +6558,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_apply_textdelta_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_apply_textdelta_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_apply_textdelta_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6553,7 +6580,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_change_file_prop_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_change_file_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_change_file_prop_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6580,7 +6607,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_change_file_prop_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_string_t const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_change_file_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_change_file_prop_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6602,7 +6629,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_file_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_close_file_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_close_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6629,7 +6656,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_file_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_close_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_close_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6651,7 +6678,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_absent_file_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_absent_file_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_absent_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6678,7 +6705,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_absent_file_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_absent_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_absent_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6700,7 +6727,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_edit_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_close_edit_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_close_edit_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6727,7 +6754,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_edit_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_close_edit_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_close_edit_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6749,7 +6776,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_abort_edit_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_abort_edit_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_abort_edit_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6776,7 +6803,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_abort_edit_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_abort_edit_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_abort_edit_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6798,7 +6825,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_apply_textdelta_stream_set(PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_apply_textdelta_stream_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_apply_textdelta_stream_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6825,7 +6852,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_apply_textdelta_stream_get(PyObjec
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_apply_textdelta_stream_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_t_apply_textdelta_stream_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6844,7 +6871,7 @@ SWIGINTERN PyObject *_wrap_new_svn_delta_editor_t(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   struct svn_delta_editor_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_delta_editor_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_delta_editor_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -6866,7 +6893,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_delta_editor_t(PyObject *SWIGUNUSEDPARM(se
   struct svn_delta_editor_t *arg1 = (struct svn_delta_editor_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_delta_editor_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_delta_editor_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6890,7 +6917,7 @@ fail:
 
 SWIGINTERN PyObject *svn_delta_editor_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_delta_editor_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6907,7 +6934,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_default_editor(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_delta_default_editor",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_default_editor",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6946,7 +6973,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_noop_window_handler(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_noop_window_handler",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_noop_window_handler",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7011,7 +7038,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_get_cancellation_editor(PyObject *SWIGUNUSE
   arg7 = _global_pool;
   arg5 = &temp5;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_delta_get_cancellation_editor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_get_cancellation_editor",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg2 = obj0;
@@ -7107,7 +7134,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_depth_filter_editor(PyObject *SWIGUNUSEDPAR
   arg7 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_delta_depth_filter_editor",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_depth_filter_editor",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg3 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7209,7 +7236,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver3(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_delta_path_driver3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_path_driver3",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7314,7 +7341,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver2(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_delta_path_driver2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_path_driver2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7410,7 +7437,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_delta_path_driver",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_path_driver",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7506,7 +7533,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver_start(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_delta_path_driver_start",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_path_driver_start",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7593,6 +7620,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver_step(PyObject *SWIGUNUSEDPARM(s
   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 ;
   
@@ -7600,13 +7628,17 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver_step(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_delta_path_driver_step",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_path_driver_step",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_delta_path_driver_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_path_driver_state_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_delta_path_driver_step", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -7660,7 +7692,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver_finish(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_delta_path_driver_finish",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_path_driver_finish",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_delta_path_driver_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_path_driver_state_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7735,7 +7767,7 @@ SWIGINTERN PyObject *_wrap_svn_compat_wrap_file_rev_handler(PyObject *SWIGUNUSED
     if (arg1 == NULL) SWIG_fail;
   }
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_compat_wrap_file_rev_handler",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_compat_wrap_file_rev_handler",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_file_rev_handler_old_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);
@@ -7776,13 +7808,10 @@ SWIGINTERN PyObject *_wrap_svn_compat_wrap_file_rev_handler(PyObject *SWIGUNUSED
     ;
   }
   {
-    /* FIXME: Missing argout typemap: svn_compat_wrap_file_rev_handler arg 2 (void **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_compat_wrap_file_rev_handler is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -7798,14 +7827,14 @@ fail:
 
 SWIGINTERN PyObject *svn_txdelta_stream_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_txdelta_stream_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_delta_path_driver_state_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_delta_path_driver_state_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7828,7 +7857,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_set_target_revision(PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_delta_editor_invoke_set_target_revision",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_set_target_revision",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7909,7 +7938,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_root(PyObject *SWIGUNUSE
   SWIG_fail;
   arg4 = _global_pool;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_delta_editor_invoke_open_root",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_open_root",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7985,6 +8014,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_delete_entry(PyObject *SWIGUN
   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 ;
@@ -7994,7 +8024,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_delete_entry(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_delta_editor_invoke_delete_entry",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_delete_entry",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8002,6 +8032,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_delete_entry(PyObject *SWIGUN
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_delta_editor_invoke_delete_entry", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -8067,7 +8101,9 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_directory(PyObject *SWIGU
   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 ;
   svn_error_t *result = 0 ;
@@ -8077,7 +8113,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_directory(PyObject *SWIGU
   SWIG_fail;
   arg6 = _global_pool;
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OsOzO|O:svn_delta_editor_invoke_add_directory",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_add_directory",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8085,6 +8121,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_directory(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_delta_editor_invoke_add_directory", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -8093,6 +8133,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_directory(PyObject *SWIGU
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_delta_editor_invoke_add_directory", "copyfrom_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -8155,6 +8199,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_directory(PyObject *SWIG
   PyObject *_global_py_pool = NULL ;
   void *temp6 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -8165,7 +8210,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_directory(PyObject *SWIG
   SWIG_fail;
   arg5 = _global_pool;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_delta_editor_invoke_open_directory",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_open_directory",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8173,6 +8218,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_directory(PyObject *SWIG
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_delta_editor_invoke_open_directory", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -8243,6 +8292,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_change_dir_prop(PyObject *SWI
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -8251,7 +8301,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_change_dir_prop(PyObject *SWI
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_delta_editor_invoke_change_dir_prop",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_change_dir_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8267,15 +8317,23 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_change_dir_prop(PyObject *SWI
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_delta_editor_invoke_change_dir_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -8334,7 +8392,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_close_directory(PyObject *SWI
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_delta_editor_invoke_close_directory",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_close_directory",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8397,6 +8455,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_absent_directory(PyObject *SW
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -8405,7 +8464,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_absent_directory(PyObject *SW
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_delta_editor_invoke_absent_directory",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_absent_directory",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8413,6 +8472,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_absent_directory(PyObject *SW
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_delta_editor_invoke_absent_directory", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -8472,7 +8535,9 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_file(PyObject *SWIGUNUSED
   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 ;
   svn_error_t *result = 0 ;
@@ -8482,7 +8547,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_file(PyObject *SWIGUNUSED
   SWIG_fail;
   arg6 = _global_pool;
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OsOzO|O:svn_delta_editor_invoke_add_file",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_add_file",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8490,6 +8555,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_file(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_delta_editor_invoke_add_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -8498,6 +8567,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_file(PyObject *SWIGUNUSED
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_delta_editor_invoke_add_file", "copyfrom_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -8560,6 +8633,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_file(PyObject *SWIGUNUSE
   PyObject *_global_py_pool = NULL ;
   void *temp6 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -8570,7 +8644,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_file(PyObject *SWIGUNUSE
   SWIG_fail;
   arg5 = _global_pool;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_delta_editor_invoke_open_file",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_open_file",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8578,6 +8652,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_file(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_delta_editor_invoke_open_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -8649,6 +8727,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_apply_textdelta(PyObject *SWI
   void *temp6 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -8667,7 +8746,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_apply_textdelta(PyObject *SWI
     if (arg5 == NULL) SWIG_fail;
   }
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"OOz|O:svn_delta_editor_invoke_apply_textdelta",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_apply_textdelta",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8682,6 +8761,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_apply_textdelta(PyObject *SWI
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_delta_editor_invoke_apply_textdelta", "base_checksum");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -8745,6 +8828,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_change_file_prop(PyObject *SW
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -8753,7 +8837,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_change_file_prop(PyObject *SW
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_delta_editor_invoke_change_file_prop",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_change_file_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8769,15 +8853,23 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_change_file_prop(PyObject *SW
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_delta_editor_invoke_change_file_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -8830,6 +8922,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_close_file(PyObject *SWIGUNUS
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -8837,7 +8930,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_close_file(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOz|O:svn_delta_editor_invoke_close_file",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_close_file",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8852,6 +8945,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_close_file(PyObject *SWIGUNUS
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_delta_editor_invoke_close_file", "text_checksum");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -8900,6 +8997,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_absent_file(PyObject *SWIGUNU
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -8908,7 +9006,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_absent_file(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_delta_editor_invoke_absent_file",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_absent_file",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8916,6 +9014,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_absent_file(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_delta_editor_invoke_absent_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -8978,7 +9080,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_close_edit(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_delta_editor_invoke_close_edit",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_close_edit",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9048,7 +9150,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_abort_edit(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_delta_editor_invoke_abort_edit",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_abort_edit",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9116,6 +9218,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_apply_textdelta_stream(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -9125,7 +9228,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_apply_textdelta_stream(PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOzOO|O:svn_delta_editor_invoke_apply_textdelta_stream",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_editor_invoke_apply_textdelta_stream",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9147,6 +9250,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_apply_textdelta_stream(PyObje
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_delta_editor_invoke_apply_textdelta_stream", "base_checksum");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_txdelta_stream_open_func_t * tmp =
     svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj4);
     if (tmp == NULL || PyErr_Occurred()) {
@@ -9211,7 +9318,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_window_handler(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_txdelta_invoke_window_handler",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_invoke_window_handler",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_txdelta_window_handler_t * tmp =
     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);
@@ -9278,7 +9385,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_next_window_fn(PyObject *SWIGUNUSE
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_invoke_next_window_fn",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_invoke_next_window_fn",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_txdelta_next_window_fn_t * tmp =
     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);
@@ -9348,7 +9455,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_md5_digest_fn(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   unsigned char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_invoke_md5_digest_fn",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_invoke_md5_digest_fn",2,2,&obj0,&obj1)) SWIG_fail;
   {
     svn_txdelta_md5_digest_fn_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void__p_unsigned_char, svn_argnum_obj0);
@@ -9406,7 +9513,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_stream_open_func(PyObject *SWIGUNU
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_txdelta_invoke_stream_open_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_txdelta_invoke_stream_open_func",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_txdelta_stream_open_func_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -9500,6 +9607,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func2(PyObject *SWIGU
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9508,7 +9616,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func2(PyObject *SWIGU
   SWIG_fail;
   arg8 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOs|O:svn_delta_invoke_path_driver_cb_func2",&obj0,&obj1,&obj2,&obj3,&obj4,&arg7,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_invoke_path_driver_cb_func2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_delta_path_driver_cb_func2_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -9547,6 +9655,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func2(PyObject *SWIGU
       PyErr_Clear();
     }
   }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_delta_invoke_path_driver_cb_func2", "relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
     if (obj6 != Py_None && obj6 != _global_py_pool) {
@@ -9606,6 +9718,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9614,7 +9727,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func(PyObject *SWIGUN
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOs|O:svn_delta_invoke_path_driver_cb_func",&obj0,&obj1,&obj2,&arg5,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_delta_invoke_path_driver_cb_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_delta_path_driver_cb_func_t * tmp =
     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);
@@ -9639,6 +9752,10 @@ SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func(PyObject *SWIGUN
       PyErr_Clear();
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_delta_invoke_path_driver_cb_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -9701,6 +9818,7 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler(PyObject *SWIGUNUSEDPARM(
   void *temp8 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -9723,7 +9841,7 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler(PyObject *SWIGUNUSEDPARM(
     if (arg7 == NULL) SWIG_fail;
   }
   arg8 = &temp8;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOOO|O:svn_file_invoke_rev_handler",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_file_invoke_rev_handler",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     svn_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_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);
@@ -9741,6 +9859,10 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_file_invoke_rev_handler", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -9831,6 +9953,7 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler_old(PyObject *SWIGUNUSEDP
   void *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -9852,7 +9975,7 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler_old(PyObject *SWIGUNUSEDP
     if (arg6 == NULL) SWIG_fail;
   }
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_file_invoke_rev_handler_old",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_file_invoke_rev_handler_old",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_file_rev_handler_old_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);
@@ -9870,6 +9993,10 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler_old(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_file_invoke_rev_handler_old", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -9940,56 +10067,56 @@ fail:
 
 SWIGINTERN PyObject *svn_txdelta_window_handler_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_txdelta_next_window_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_txdelta_md5_digest_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void__p_unsigned_char, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_txdelta_stream_open_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_delta_path_driver_cb_func2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_delta_path_driver_cb_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_file_rev_handler_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_file_rev_handler_old_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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();
 }
@@ -10193,6 +10320,8 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client_conflict_option_t = {"_p_svn_client_conflict_option_t", "svn_client_conflict_option_t *", 0, 0, (void*)0, 0};
 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_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
@@ -10301,6 +10430,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
+  &_swigt__p_svn_client__shelf_version_t,
+  &_swigt__p_svn_client_conflict_option_t,
   &_swigt__p_svn_commit_info_t,
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
@@ -10409,6 +10540,8 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client_conflict_option_t[] = {  {&_swigt__p_svn_client_conflict_option_t, 0, 0, 0},{0, 0, 0, 0}};
 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_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -10517,6 +10650,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
+  _swigc__p_svn_client__shelf_version_t,
+  _swigc__p_svn_client_conflict_option_t,
   _swigc__p_svn_commit_info_t,
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
diff --git a/subversion/bindings/swig/python/svn_diff.c b/subversion/bindings/swig/python/svn_diff.c
index 392fab8..4ed139f 100644
--- a/subversion/bindings/swig/python/svn_diff.c
+++ b/subversion/bindings/swig/python/svn_diff.c
@@ -8,13 +8,15 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+
+
 
 #ifndef SWIGPYTHON
 #define SWIGPYTHON
 #endif
 
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#define SWIG_PYTHON_CLASSIC
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -3023,61 +3025,63 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_svn_checksum_ctx_t swig_types[37]
 #define SWIGTYPE_p_svn_checksum_kind_t swig_types[38]
 #define SWIGTYPE_p_svn_checksum_t swig_types[39]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[40]
-#define SWIGTYPE_p_svn_config_t swig_types[41]
-#define SWIGTYPE_p_svn_depth_t swig_types[42]
-#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[43]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[44]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[45]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[46]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[47]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[48]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[49]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[50]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[51]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[52]
-#define SWIGTYPE_p_svn_diff_t swig_types[53]
-#define SWIGTYPE_p_svn_dirent_t swig_types[54]
-#define SWIGTYPE_p_svn_errno_t swig_types[55]
-#define SWIGTYPE_p_svn_error_t swig_types[56]
-#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[57]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[58]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[59]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[60]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[61]
-#define SWIGTYPE_p_svn_lock_t swig_types[62]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[63]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[64]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[65]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[66]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[67]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[68]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[69]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[70]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[71]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[72]
-#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[73]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[74]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[75]
-#define SWIGTYPE_p_svn_patch_t swig_types[76]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[77]
-#define SWIGTYPE_p_svn_prop_kind swig_types[78]
-#define SWIGTYPE_p_svn_prop_patch_t 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_version_checklist_t swig_types[85]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[86]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[87]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[88]
-#define SWIGTYPE_p_svn_version_t swig_types[89]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[90]
-#define SWIGTYPE_p_unsigned_long swig_types[91]
-#define SWIGTYPE_p_void swig_types[92]
-static swig_type_info *swig_types[94];
-static swig_module_info swig_module = {swig_types, 93, 0, 0, 0, 0};
+#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[40]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[41]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[42]
+#define SWIGTYPE_p_svn_config_t swig_types[43]
+#define SWIGTYPE_p_svn_depth_t swig_types[44]
+#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[45]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[46]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[47]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[48]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[49]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[50]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[51]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[52]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[53]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[54]
+#define SWIGTYPE_p_svn_diff_t swig_types[55]
+#define SWIGTYPE_p_svn_dirent_t swig_types[56]
+#define SWIGTYPE_p_svn_errno_t swig_types[57]
+#define SWIGTYPE_p_svn_error_t swig_types[58]
+#define SWIGTYPE_p_svn_fs_lock_target_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_desc3_t swig_types[75]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[76]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[77]
+#define SWIGTYPE_p_svn_patch_t swig_types[78]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[79]
+#define SWIGTYPE_p_svn_prop_kind swig_types[80]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[81]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[82]
+#define SWIGTYPE_p_svn_stream_t swig_types[83]
+#define SWIGTYPE_p_svn_string_t swig_types[84]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[85]
+#define SWIGTYPE_p_svn_tristate_t swig_types[86]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[87]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[88]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[89]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[90]
+#define SWIGTYPE_p_svn_version_t swig_types[91]
+#define SWIGTYPE_p_svn_wc_external_item2_t 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 SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3088,6 +3092,12 @@ static swig_module_info swig_module = {swig_types, 93, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
 
 /*-----------------------------------------------
               @(target):= _diff.so
@@ -3114,6 +3124,7 @@ static swig_module_info swig_module = {swig_types, 93, 0, 0, 0, 0};
 
 
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 
 
 static PyObject * _global_py_pool = NULL;
@@ -3645,7 +3656,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_version(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_diff_version")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_version",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3669,7 +3680,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasources_open_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasources_open_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_datasources_open_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3696,7 +3707,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasources_open_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasources_open_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_datasources_open_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3718,7 +3729,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_close_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasource_close_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_datasource_close_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3745,7 +3756,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_close_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_diff_datasource_e) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasource_close_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_datasource_close_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3767,7 +3778,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_get_next_token_set(PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasource_get_next_token_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_datasource_get_next_token_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3794,7 +3805,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_get_next_token_get(PyObjec
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(apr_uint32_t *,void **,void *,svn_diff_datasource_e) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasource_get_next_token_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_datasource_get_next_token_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3816,7 +3827,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_compare_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_compare_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_token_compare_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3843,7 +3854,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_compare_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,void *,void *,int *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_compare_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_token_compare_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3865,7 +3876,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_discard_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_token_discard_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3892,7 +3903,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   void (*result)(void *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_discard_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_token_discard_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3914,7 +3925,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_all_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_discard_all_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_token_discard_all_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3941,7 +3952,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_all_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   void (*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_discard_all_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_t_token_discard_all_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3960,7 +3971,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_fns2_t(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   struct svn_diff_fns2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_diff_fns2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_diff_fns2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3982,7 +3993,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_fns2_t(PyObject *SWIGUNUSEDPARM(self)
   struct svn_diff_fns2_t *arg1 = (struct svn_diff_fns2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_fns2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_diff_fns2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4006,7 +4017,7 @@ fail:
 
 SWIGINTERN PyObject *svn_diff_fns2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_diff_fns2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4018,7 +4029,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_open_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_open_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_datasource_open_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4045,7 +4056,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_open_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_diff_datasource_e) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_open_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_datasource_open_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4067,7 +4078,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_close_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_close_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_datasource_close_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4094,7 +4105,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_close_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_diff_datasource_e) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_close_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_datasource_close_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4116,7 +4127,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_get_next_token_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_get_next_token_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_datasource_get_next_token_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4143,7 +4154,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_get_next_token_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(apr_uint32_t *,void **,void *,svn_diff_datasource_e) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_get_next_token_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_datasource_get_next_token_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4165,7 +4176,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_compare_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_compare_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_token_compare_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4192,7 +4203,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_compare_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,void *,void *,int *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_compare_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_token_compare_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4214,7 +4225,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_discard_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_token_discard_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4241,7 +4252,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   void (*result)(void *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_discard_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_token_discard_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4263,7 +4274,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_all_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_discard_all_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_token_discard_all_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4290,7 +4301,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_all_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   void (*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_discard_all_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_t_token_discard_all_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4309,7 +4320,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_fns_t(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   struct svn_diff_fns_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_diff_fns_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_diff_fns_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4331,7 +4342,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_fns_t(PyObject *SWIGUNUSEDPARM(self),
   struct svn_diff_fns_t *arg1 = (struct svn_diff_fns_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_fns_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_diff_fns_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4355,7 +4366,7 @@ fail:
 
 SWIGINTERN PyObject *svn_diff_fns_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_diff_fns_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4379,7 +4390,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff_2(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_diff_2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_diff_2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -4458,7 +4469,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_diff",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_diff",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -4537,7 +4548,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3_2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_diff3_2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_diff3_2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -4616,7 +4627,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_diff3",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_diff3",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -4695,7 +4706,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4_2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_diff4_2",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_diff4_2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -4774,7 +4785,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_diff4",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_diff4",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -4840,7 +4851,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_contains_conflicts(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_contains_conflicts",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_contains_conflicts",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4868,7 +4879,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_contains_diffs(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_contains_diffs",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_contains_diffs",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4897,7 +4908,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_common_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_common_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_common_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4924,7 +4935,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_common_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_common_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_common_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4946,7 +4957,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_modified_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_modified_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_diff_modified_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4973,7 +4984,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_modified_get(PyObje
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_modified_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_diff_modified_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4995,7 +5006,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_latest_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_latest_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_diff_latest_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5022,7 +5033,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_latest_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_latest_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_diff_latest_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5044,7 +5055,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_common_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_common_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_diff_common_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5071,7 +5082,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_common_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_common_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_diff_common_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5093,7 +5104,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_conflict_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_conflict_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_conflict_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5120,7 +5131,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_conflict_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_conflict_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_t_output_conflict_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5139,7 +5150,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_output_fns_t(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   struct svn_diff_output_fns_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_diff_output_fns_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_diff_output_fns_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -5161,7 +5172,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_output_fns_t(PyObject *SWIGUNUSEDPARM
   struct svn_diff_output_fns_t *arg1 = (struct svn_diff_output_fns_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_output_fns_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_diff_output_fns_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5185,7 +5196,7 @@ fail:
 
 SWIGINTERN PyObject *svn_diff_output_fns_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_diff_output_fns_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5203,7 +5214,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output2(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_output2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output2",4,4,&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()) {
@@ -5263,7 +5274,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_output",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5316,7 +5327,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_space_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_ignore_space_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_t_ignore_space_set",2,2,&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()) {
@@ -5343,7 +5354,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_space_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_diff_file_ignore_space_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_ignore_space_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_t_ignore_space_get",1,1,&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()) {
@@ -5365,7 +5376,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_eol_style_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_ignore_eol_style_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_t_ignore_eol_style_set",2,2,&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()) {
@@ -5392,7 +5403,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_eol_style_get(PyObject
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_ignore_eol_style_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_t_ignore_eol_style_get",1,1,&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()) {
@@ -5414,7 +5425,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_show_c_function_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_show_c_function_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_t_show_c_function_set",2,2,&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()) {
@@ -5441,7 +5452,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_show_c_function_get(PyObject
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_show_c_function_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_t_show_c_function_get",1,1,&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()) {
@@ -5463,7 +5474,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_context_size_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_context_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_t_context_size_set",2,2,&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()) {
@@ -5490,7 +5501,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_context_size_get(PyObject *SW
   PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_context_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_t_context_size_get",1,1,&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()) {
@@ -5509,7 +5520,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_file_options_t(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   struct svn_diff_file_options_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_diff_file_options_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_diff_file_options_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -5531,7 +5542,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_file_options_t(PyObject *SWIGUNUSEDPA
   struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_file_options_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_diff_file_options_t",1,1,&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()) {
@@ -5555,7 +5566,7 @@ fail:
 
 SWIGINTERN PyObject *svn_diff_file_options_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_diff_file_options_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5572,7 +5583,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_create(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_diff_file_options_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -5619,7 +5630,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_parse(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_file_options_parse",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_options_parse",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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()) {
@@ -5684,6 +5695,8 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff_2(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_diff_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -5693,7 +5706,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff_2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_diff_file_diff_2",&arg2,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_diff_2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_diff_file_diff_2", "original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_diff_file_diff_2", "modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -5754,6 +5775,8 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff(PyObject *SWIGUNUSEDPARM(self), Py
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_diff_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -5762,7 +5785,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_diff_file_diff",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_diff",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_diff_file_diff", "original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_diff_file_diff", "modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -5819,6 +5850,9 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3_2(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_diff_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -5828,7 +5862,19 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3_2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sssO|O:svn_diff_file_diff3_2",&arg2,&arg3,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_diff3_2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_diff_file_diff3_2", "original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_diff_file_diff3_2", "modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_diff3_2", "latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -5890,6 +5936,9 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_diff_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -5898,7 +5947,19 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sss|O:svn_diff_file_diff3",&arg2,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_diff3",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_diff_file_diff3", "original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_diff_file_diff3", "modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_diff3", "latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -5956,6 +6017,10 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4_2(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_diff_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -5965,7 +6030,23 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4_2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssssO|O:svn_diff_file_diff4_2",&arg2,&arg3,&arg4,&arg5,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_diff4_2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_diff_file_diff4_2", "original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_diff_file_diff4_2", "modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_diff4_2", "latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_diff4_2", "ancestor");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -6028,6 +6109,10 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4(PyObject *SWIGUNUSEDPARM(self), P
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_diff_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -6036,7 +6121,23 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssss|O:svn_diff_file_diff4",&arg2,&arg3,&arg4,&arg5,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_diff4",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_diff_file_diff4", "original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_diff_file_diff4", "modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_diff4", "latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_diff4", "ancestor");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -6101,6 +6202,12 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified4(PyObject *SWIGUNUSEDPAR
   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 ;
@@ -6111,7 +6218,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified4(PyObject *SWIGUNUSEDPAR
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_output_unified4",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -6130,6 +6237,30 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified4(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_output_unified4", "original_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_output_unified4", "modified_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_diff_file_output_unified4", "original_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_file_output_unified4", "modified_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_file_output_unified4", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_diff_file_output_unified4", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (svn_boolean_t)SWIG_As_long (obj8);
     if (SWIG_arg_fail(svn_argnum_obj8)) {
       SWIG_fail;
@@ -6200,6 +6331,12 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified3(PyObject *SWIGUNUSEDPAR
   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 ;
   svn_error_t *result = 0 ;
@@ -6208,7 +6345,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified3(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsszzzzO|O:svn_diff_file_output_unified3",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_output_unified3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -6227,6 +6364,30 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified3(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_output_unified3", "original_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_output_unified3", "modified_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_diff_file_output_unified3", "original_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_file_output_unified3", "modified_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_file_output_unified3", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_diff_file_output_unified3", "relative_to_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (svn_boolean_t)SWIG_As_long (obj8);
     if (SWIG_arg_fail(svn_argnum_obj8)) {
       SWIG_fail;
@@ -6285,6 +6446,11 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified2(PyObject *SWIGUNUSEDPAR
   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 ;
   svn_error_t *result = 0 ;
   
@@ -6292,7 +6458,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified2(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsszzz|O:svn_diff_file_output_unified2",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_output_unified2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -6310,6 +6476,26 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified2(PyObject *SWIGUNUSEDPAR
       SWIG_fail;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_output_unified2", "original_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_output_unified2", "modified_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_diff_file_output_unified2", "original_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_file_output_unified2", "modified_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_file_output_unified2", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
     if (obj7 != Py_None && obj7 != _global_py_pool) {
@@ -6362,6 +6548,10 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified(PyObject *SWIGUNUSEDPARM
   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 ;
   
@@ -6369,7 +6559,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsszz|O:svn_diff_file_output_unified",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_output_unified",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -6387,6 +6577,22 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified(PyObject *SWIGUNUSEDPARM
       SWIG_fail;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_output_unified", "original_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_output_unified", "modified_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_diff_file_output_unified", "original_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_file_output_unified", "modified_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
     if (obj6 != Py_None && obj6 != _global_py_pool) {
@@ -6445,6 +6651,13 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge3(PyObject *SWIGUNUSEDPARM(
   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 ;
@@ -6454,7 +6667,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge3(PyObject *SWIGUNUSEDPARM(
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_output_merge3",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -6473,6 +6686,34 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge3(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_output_merge3", "original_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_output_merge3", "modified_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_diff_file_output_merge3", "latest_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_file_output_merge3", "conflict_original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_file_output_merge3", "conflict_modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_diff_file_output_merge3", "conflict_latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_diff_file_output_merge3", "conflict_separator");
+    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;
@@ -6538,6 +6779,13 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge2(PyObject *SWIGUNUSEDPARM(
   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 ;
   svn_error_t *result = 0 ;
@@ -6546,7 +6794,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge2(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg11 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOssszzzzO|O:svn_diff_file_output_merge2",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_output_merge2",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -6565,6 +6813,34 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge2(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_output_merge2", "original_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_output_merge2", "modified_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_diff_file_output_merge2", "latest_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_file_output_merge2", "conflict_original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_file_output_merge2", "conflict_modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_diff_file_output_merge2", "conflict_latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_diff_file_output_merge2", "conflict_separator");
+    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;
@@ -6627,6 +6903,13 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge(PyObject *SWIGUNUSEDPARM(s
   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 ;
@@ -6636,7 +6919,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOssszzzzOO|O:svn_diff_file_output_merge",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_file_output_merge",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -6655,6 +6938,34 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_diff_file_output_merge", "original_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_file_output_merge", "modified_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_diff_file_output_merge", "latest_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_file_output_merge", "conflict_original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_file_output_merge", "conflict_modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_diff_file_output_merge", "conflict_latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_diff_file_output_merge", "conflict_separator");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg10 = (svn_boolean_t)SWIG_As_long (obj9);
     if (SWIG_arg_fail(svn_argnum_obj9)) {
       SWIG_fail;
@@ -6726,7 +7037,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_binary(PyObject *SWIGUNUSEDPARM(self)
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_binary",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -6826,17 +7137,21 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_diff_mem_string_diff",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_diff",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (obj0 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj0)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj0)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj0);
-      value2.len = PyString_GET_SIZE(obj0);
+      if (PyBytes_AsStringAndSize(obj0, (char **)&(value2.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -6844,12 +7159,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff(PyObject *SWIGUNUSEDPARM(sel
     if (obj1 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value3.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj1);
-      value3.len = PyString_GET_SIZE(obj1);
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
@@ -6930,17 +7249,21 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff3(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_diff_mem_string_diff3",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_diff3",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (obj0 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj0)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj0)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj0, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj0);
-      value2.len = PyString_GET_SIZE(obj0);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -6948,12 +7271,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff3(PyObject *SWIGUNUSEDPARM(se
     if (obj1 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value3.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj1);
-      value3.len = PyString_GET_SIZE(obj1);
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
@@ -6961,12 +7288,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff3(PyObject *SWIGUNUSEDPARM(se
     if (obj2 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj2)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj2);
-      value4.len = PyString_GET_SIZE(obj2);
+      if (PyBytes_AsStringAndSize(obj2, (char **)&(value4.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -7050,17 +7381,21 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff4(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_diff_mem_string_diff4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_diff4",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     if (obj0 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj0)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj0)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj0);
-      value2.len = PyString_GET_SIZE(obj0);
+      if (PyBytes_AsStringAndSize(obj0, (char **)&(value2.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
@@ -7068,12 +7403,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff4(PyObject *SWIGUNUSEDPARM(se
     if (obj1 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value3.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj1);
-      value3.len = PyString_GET_SIZE(obj1);
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
@@ -7081,12 +7420,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff4(PyObject *SWIGUNUSEDPARM(se
     if (obj2 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj2)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj2, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj2);
-      value4.len = PyString_GET_SIZE(obj2);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -7094,12 +7437,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff4(PyObject *SWIGUNUSEDPARM(se
     if (obj3 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value5.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj3);
-      value5.len = PyString_GET_SIZE(obj3);
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -7176,6 +7523,10 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified3(PyObject *SWIGUNU
   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 ;
@@ -7187,7 +7538,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified3(PyObject *SWIGUNU
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_output_unified3",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7212,15 +7563,35 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified3(PyObject *SWIGUNU
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_mem_string_output_unified3", "hunk_delimiter");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_diff_mem_string_output_unified3", "original_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_mem_string_output_unified3", "modified_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_mem_string_output_unified3", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj7 == Py_None)
     arg8 = NULL;
     else {
-      if (!PyString_Check(obj7)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj7)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value8.data = PyString_AS_STRING(obj7);
-      value8.len = PyString_GET_SIZE(obj7);
+      if (PyBytes_AsStringAndSize(obj7, (char **)&(value8.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value8.len = pyStrLen;
       arg8 = &value8;
     }
   }
@@ -7228,12 +7599,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified3(PyObject *SWIGUNU
     if (obj8 == Py_None)
     arg9 = NULL;
     else {
-      if (!PyString_Check(obj8)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj8)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj8, (char **)&(value9.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value9.data = PyString_AS_STRING(obj8);
-      value9.len = PyString_GET_SIZE(obj8);
+      value9.len = pyStrLen;
       arg9 = &value9;
     }
   }
@@ -7305,6 +7680,10 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNU
   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 ;
@@ -7314,7 +7693,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOszzzOO|O:svn_diff_mem_string_output_unified2",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_output_unified2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7339,15 +7718,35 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNU
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_diff_mem_string_output_unified2", "hunk_delimiter");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_diff_mem_string_output_unified2", "original_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_mem_string_output_unified2", "modified_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_mem_string_output_unified2", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj7 == Py_None)
     arg8 = NULL;
     else {
-      if (!PyString_Check(obj7)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj7)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj7, (char **)&(value8.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value8.data = PyString_AS_STRING(obj7);
-      value8.len = PyString_GET_SIZE(obj7);
+      value8.len = pyStrLen;
       arg8 = &value8;
     }
   }
@@ -7355,12 +7754,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNU
     if (obj8 == Py_None)
     arg9 = NULL;
     else {
-      if (!PyString_Check(obj8)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj8)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value9.data = PyString_AS_STRING(obj8);
-      value9.len = PyString_GET_SIZE(obj8);
+      if (PyBytes_AsStringAndSize(obj8, (char **)&(value9.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value9.len = pyStrLen;
       arg9 = &value9;
     }
   }
@@ -7419,6 +7822,9 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified(PyObject *SWIGUNUS
   svn_string_t value7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -7428,7 +7834,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOzzzOO|O:svn_diff_mem_string_output_unified",&obj0,&obj1,&arg3,&arg4,&arg5,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_output_unified",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7447,15 +7853,31 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified(PyObject *SWIGUNUS
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_diff_mem_string_output_unified", "original_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_diff_mem_string_output_unified", "modified_header");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_diff_mem_string_output_unified", "header_encoding");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj5 == Py_None)
     arg6 = NULL;
     else {
-      if (!PyString_Check(obj5)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj5)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj5, (char **)&(value6.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value6.data = PyString_AS_STRING(obj5);
-      value6.len = PyString_GET_SIZE(obj5);
+      value6.len = pyStrLen;
       arg6 = &value6;
     }
   }
@@ -7463,12 +7885,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified(PyObject *SWIGUNUS
     if (obj6 == Py_None)
     arg7 = NULL;
     else {
-      if (!PyString_Check(obj6)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj6)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj6, (char **)&(value7.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value7.data = PyString_AS_STRING(obj6);
-      value7.len = PyString_GET_SIZE(obj6);
+      value7.len = pyStrLen;
       arg7 = &value7;
     }
   }
@@ -7536,6 +7962,10 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge3(PyObject *SWIGUNUSE
   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 ;
@@ -7545,7 +7975,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge3(PyObject *SWIGUNUSE
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_output_merge3",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7567,12 +7997,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge3(PyObject *SWIGUNUSE
     if (obj2 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj2)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj2, (char **)&(value3.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj2);
-      value3.len = PyString_GET_SIZE(obj2);
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
@@ -7580,12 +8014,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge3(PyObject *SWIGUNUSE
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -7593,16 +8031,36 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge3(PyObject *SWIGUNUSE
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_mem_string_output_merge3", "conflict_original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_mem_string_output_merge3", "conflict_modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_diff_mem_string_output_merge3", "conflict_latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_diff_mem_string_output_merge3", "conflict_separator");
+    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;
@@ -7674,6 +8132,10 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSE
   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 ;
   svn_error_t *result = 0 ;
@@ -7682,7 +8144,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg11 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOzzzzO|O:svn_diff_mem_string_output_merge2",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_output_merge2",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7704,12 +8166,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSE
     if (obj2 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj2)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj2);
-      value3.len = PyString_GET_SIZE(obj2);
+      if (PyBytes_AsStringAndSize(obj2, (char **)&(value3.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
@@ -7717,12 +8183,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSE
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -7730,16 +8200,36 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSE
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_mem_string_output_merge2", "conflict_original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_mem_string_output_merge2", "conflict_modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_diff_mem_string_output_merge2", "conflict_latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_diff_mem_string_output_merge2", "conflict_separator");
+    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;
@@ -7808,6 +8298,10 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge(PyObject *SWIGUNUSED
   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 ;
@@ -7817,7 +8311,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOzzzzOO|O:svn_diff_mem_string_output_merge",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_mem_string_output_merge",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7839,12 +8333,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge(PyObject *SWIGUNUSED
     if (obj2 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj2)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj2);
-      value3.len = PyString_GET_SIZE(obj2);
+      if (PyBytes_AsStringAndSize(obj2, (char **)&(value3.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
@@ -7852,12 +8350,16 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge(PyObject *SWIGUNUSED
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -7865,16 +8367,36 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge(PyObject *SWIGUNUSED
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_diff_mem_string_output_merge", "conflict_original");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_diff_mem_string_output_merge", "conflict_modified");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_diff_mem_string_output_merge", "conflict_latest");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_diff_mem_string_output_merge", "conflict_separator");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg10 = (svn_boolean_t)SWIG_As_long (obj9);
     if (SWIG_arg_fail(svn_argnum_obj9)) {
       SWIG_fail;
@@ -7955,7 +8477,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_diff_text(PyObject *SWIGUNUSED
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_diff_text",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_readline_diff_text",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8002,9 +8524,8 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_diff_text(PyObject *SWIGUNUSED
     if (*arg2 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg2)->data, (*arg2)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg2)->data, (*arg2)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -8017,7 +8538,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_diff_text(PyObject *SWIGUNUSED
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -8077,7 +8598,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_original_text(PyObject *SWIGUN
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_original_text",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_readline_original_text",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8124,9 +8645,8 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_original_text(PyObject *SWIGUN
     if (*arg2 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg2)->data, (*arg2)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg2)->data, (*arg2)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -8139,7 +8659,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_original_text(PyObject *SWIGUN
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -8199,7 +8719,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_modified_text(PyObject *SWIGUN
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_modified_text",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_readline_modified_text",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8246,9 +8766,8 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_modified_text(PyObject *SWIGUN
     if (*arg2 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg2)->data, (*arg2)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg2)->data, (*arg2)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -8261,7 +8780,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_modified_text(PyObject *SWIGUN
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -8296,7 +8815,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_diff_text(PyObject *SWIGUNUSEDPAR
   svn_diff_hunk_t *arg1 = (svn_diff_hunk_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_diff_text",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_reset_diff_text",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8323,7 +8842,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_original_text(PyObject *SWIGUNUSE
   svn_diff_hunk_t *arg1 = (svn_diff_hunk_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_original_text",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_reset_original_text",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8350,7 +8869,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_modified_text(PyObject *SWIGUNUSE
   svn_diff_hunk_t *arg1 = (svn_diff_hunk_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_modified_text",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_reset_modified_text",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8378,7 +8897,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_original_start(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_original_start",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_get_original_start",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8406,7 +8925,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_original_length(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_original_length",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_get_original_length",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8434,7 +8953,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_modified_start(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_modified_start",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_get_modified_start",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8462,7 +8981,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_modified_length(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_modified_length",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_get_modified_length",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8490,7 +9009,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_leading_context(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_leading_context",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_get_leading_context",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8518,7 +9037,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_trailing_context(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_trailing_context",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_hunk_get_trailing_context",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8545,8 +9064,9 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_name_set(PyObject *SWIGUNUSEDPARM(se
   struct svn_prop_patch_t *arg1 = (struct svn_prop_patch_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_prop_patch_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_patch_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8554,6 +9074,10 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_name_set(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_prop_patch_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -8574,7 +9098,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_name_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_patch_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8596,7 +9120,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_operation_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_prop_patch_t_operation_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_patch_t_operation_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8623,7 +9147,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_operation_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_diff_operation_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_operation_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_patch_t_operation_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8645,7 +9169,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_hunks_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_prop_patch_t_hunks_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_patch_t_hunks_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8672,7 +9196,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_hunks_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_hunks_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_prop_patch_t_hunks_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8699,7 +9223,7 @@ SWIGINTERN PyObject *_wrap_new_svn_prop_patch_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_prop_patch_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_prop_patch_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_prop_patch_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -8721,7 +9245,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_prop_patch_t(PyObject *SWIGUNUSEDPARM(self
   struct svn_prop_patch_t *arg1 = (struct svn_prop_patch_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_prop_patch_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_prop_patch_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8745,7 +9269,7 @@ fail:
 
 SWIGINTERN PyObject *svn_prop_patch_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_prop_patch_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8764,7 +9288,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_get_binary_diff_original_stream(PyObject *SW
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_diff_get_binary_diff_original_stream",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_get_binary_diff_original_stream",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_diff_binary_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_binary_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8815,7 +9339,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_get_binary_diff_result_stream(PyObject *SWIG
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_diff_get_binary_diff_result_stream",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_get_binary_diff_result_stream",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_diff_binary_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_binary_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8857,8 +9381,9 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_filename_set(PyObject *SWIGUNUSEDPARM
   struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_patch_t_old_filename_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_old_filename_set",2,2,&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()) {
@@ -8866,6 +9391,10 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_filename_set(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_patch_t_old_filename_set", "old_filename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->old_filename) free((char *)arg1->old_filename);
@@ -8886,7 +9415,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_filename_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_old_filename_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_old_filename_get",1,1,&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()) {
@@ -8906,8 +9435,9 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_filename_set(PyObject *SWIGUNUSEDPARM
   struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_patch_t_new_filename_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_new_filename_set",2,2,&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()) {
@@ -8915,6 +9445,10 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_filename_set(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_patch_t_new_filename_set", "new_filename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->new_filename) free((char *)arg1->new_filename);
@@ -8935,7 +9469,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_filename_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_new_filename_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_new_filename_get",1,1,&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()) {
@@ -8957,7 +9491,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_hunks_set(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_hunks_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_hunks_set",2,2,&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()) {
@@ -8984,7 +9518,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_hunks_get(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_hunks_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_hunks_get",1,1,&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()) {
@@ -9014,7 +9548,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_prop_patches_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_prop_patches_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_prop_patches_set",2,2,&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()) {
@@ -9041,7 +9575,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_prop_patches_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_prop_patches_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_prop_patches_get",1,1,&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()) {
@@ -9064,7 +9598,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_operation_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_operation_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_operation_set",2,2,&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()) {
@@ -9091,7 +9625,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_operation_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_diff_operation_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_operation_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_operation_get",1,1,&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()) {
@@ -9113,7 +9647,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_reverse_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_reverse_set",2,2,&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()) {
@@ -9140,7 +9674,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_reverse_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_reverse_get",1,1,&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()) {
@@ -9164,7 +9698,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_mergeinfo_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_mergeinfo_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_mergeinfo_set",2,2,&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()) {
@@ -9198,7 +9732,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_mergeinfo_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_mergeinfo_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_mergeinfo_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_mergeinfo_get",1,1,&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()) {
@@ -9221,7 +9755,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_mergeinfo_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_reverse_mergeinfo_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_reverse_mergeinfo_set",2,2,&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()) {
@@ -9248,7 +9782,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_mergeinfo_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_mergeinfo_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_reverse_mergeinfo_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_reverse_mergeinfo_get",1,1,&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()) {
@@ -9271,7 +9805,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_binary_patch_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_binary_patch_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_binary_patch_set",2,2,&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()) {
@@ -9298,7 +9832,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_binary_patch_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_diff_binary_patch_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_binary_patch_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_binary_patch_get",1,1,&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()) {
@@ -9321,7 +9855,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_executable_bit_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_old_executable_bit_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_old_executable_bit_set",2,2,&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()) {
@@ -9348,7 +9882,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_executable_bit_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_old_executable_bit_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_old_executable_bit_get",1,1,&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()) {
@@ -9370,7 +9904,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_executable_bit_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_new_executable_bit_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_new_executable_bit_set",2,2,&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()) {
@@ -9397,7 +9931,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_executable_bit_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_new_executable_bit_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_new_executable_bit_get",1,1,&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()) {
@@ -9419,7 +9953,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_symlink_bit_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_old_symlink_bit_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_old_symlink_bit_set",2,2,&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()) {
@@ -9446,7 +9980,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_symlink_bit_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_old_symlink_bit_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_old_symlink_bit_get",1,1,&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()) {
@@ -9468,7 +10002,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_symlink_bit_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_new_symlink_bit_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_new_symlink_bit_set",2,2,&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()) {
@@ -9495,7 +10029,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_symlink_bit_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_new_symlink_bit_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_patch_t_new_symlink_bit_get",1,1,&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()) {
@@ -9514,7 +10048,7 @@ SWIGINTERN PyObject *_wrap_new_svn_patch_t(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   struct svn_patch_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_patch_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_patch_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -9536,7 +10070,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_patch_t(PyObject *SWIGUNUSEDPARM(self), Py
   struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_patch_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_patch_t",1,1,&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()) {
@@ -9560,7 +10094,7 @@ fail:
 
 SWIGINTERN PyObject *svn_patch_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_patch_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9573,6 +10107,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_open_patch_file(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_patch_file_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9581,7 +10116,11 @@ SWIGINTERN PyObject *_wrap_svn_diff_open_patch_file(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_diff_open_patch_file",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_open_patch_file",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_diff_open_patch_file", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -9654,7 +10193,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_parse_next_patch(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_diff_parse_next_patch",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_parse_next_patch",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_patch_file_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9746,7 +10285,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_close_patch_file(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_diff_close_patch_file",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_close_patch_file",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_patch_file_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9794,28 +10333,28 @@ fail:
 
 SWIGINTERN PyObject *svn_diff_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_diff_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_diff_hunk_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_diff_hunk_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_diff_binary_patch_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_diff_binary_patch_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_patch_file_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_patch_file_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9836,7 +10375,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasources_open(PyObject *SWIGU
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:svn_diff_fns2_invoke_datasources_open",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_invoke_datasources_open",6,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9910,7 +10449,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasource_close(PyObject *SWIGU
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_datasource_close",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_invoke_datasource_close",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9973,7 +10512,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasource_get_next_token(PyObje
   
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_datasource_get_next_token",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_invoke_datasource_get_next_token",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10047,7 +10586,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_compare(PyObject *SWIGUNUS
   svn_error_t *result = 0 ;
   
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_fns2_invoke_token_compare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_invoke_token_compare",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10114,7 +10653,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_discard(PyObject *SWIGUNUS
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_token_discard",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_invoke_token_discard",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10157,7 +10696,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_discard_all(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_invoke_token_discard_all",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns2_invoke_token_discard_all",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10197,7 +10736,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_open(PyObject *SWIGUNU
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_open",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_invoke_datasource_open",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10253,7 +10792,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_close(PyObject *SWIGUN
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_close",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_invoke_datasource_close",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10316,7 +10855,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_get_next_token(PyObjec
   
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_get_next_token",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_invoke_datasource_get_next_token",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10390,7 +10929,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_compare(PyObject *SWIGUNUSE
   svn_error_t *result = 0 ;
   
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_fns_invoke_token_compare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_invoke_token_compare",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10457,7 +10996,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_discard(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_token_discard",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_invoke_token_discard",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10500,7 +11039,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_discard_all(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_invoke_token_discard_all",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_fns_invoke_token_discard_all",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10550,7 +11089,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_common(PyObject *SW
   PyObject * obj7 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_common",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_invoke_output_common",8,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     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()) {
@@ -10616,7 +11155,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_modified(PyObj
   PyObject * obj7 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_modified",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_invoke_output_diff_modified",8,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     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()) {
@@ -10682,7 +11221,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_latest(PyObjec
   PyObject * obj7 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_latest",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_invoke_output_diff_latest",8,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     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()) {
@@ -10748,7 +11287,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_common(PyObjec
   PyObject * obj7 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_common",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_invoke_output_diff_common",8,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     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()) {
@@ -10816,7 +11355,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_conflict(PyObject *
   PyObject * obj8 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:svn_diff_output_fns_invoke_output_conflict",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_diff_output_fns_invoke_output_conflict",9,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     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()) {
@@ -11082,6 +11621,8 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client_conflict_option_t = {"_p_svn_client_conflict_option_t", "svn_client_conflict_option_t *", 0, 0, (void*)0, 0};
 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};
@@ -11177,6 +11718,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
+  &_swigt__p_svn_client__shelf_version_t,
+  &_swigt__p_svn_client_conflict_option_t,
   &_swigt__p_svn_commit_info_t,
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_depth_t,
@@ -11272,6 +11815,8 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client_conflict_option_t[] = {  {&_swigt__p_svn_client_conflict_option_t, 0, 0, 0},{0, 0, 0, 0}};
 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}};
@@ -11367,6 +11912,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
+  _swigc__p_svn_client__shelf_version_t,
+  _swigc__p_svn_client_conflict_option_t,
   _swigc__p_svn_commit_info_t,
   _swigc__p_svn_config_t,
   _swigc__p_svn_depth_t,
diff --git a/subversion/bindings/swig/python/svn_fs.c b/subversion/bindings/swig/python/svn_fs.c
index 360c7d9..c5918f1 100644
--- a/subversion/bindings/swig/python/svn_fs.c
+++ b/subversion/bindings/swig/python/svn_fs.c
@@ -8,13 +8,15 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+
+
 
 #ifndef SWIGPYTHON
 #define SWIGPYTHON
 #endif
 
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#define SWIG_PYTHON_CLASSIC
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -3048,73 +3050,75 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_svn_checksum_ctx_t swig_types[62]
 #define SWIGTYPE_p_svn_checksum_kind_t swig_types[63]
 #define SWIGTYPE_p_svn_checksum_t swig_types[64]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[65]
-#define SWIGTYPE_p_svn_config_t swig_types[66]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[67]
-#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[68]
-#define SWIGTYPE_p_svn_depth_t swig_types[69]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[70]
-#define SWIGTYPE_p_svn_dirent_t swig_types[71]
-#define SWIGTYPE_p_svn_errno_t swig_types[72]
-#define SWIGTYPE_p_svn_error_t swig_types[73]
-#define SWIGTYPE_p_svn_fs_access_t swig_types[74]
-#define SWIGTYPE_p_svn_fs_dirent_t swig_types[75]
-#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[76]
-#define SWIGTYPE_p_svn_fs_fsx_info_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_info_placeholder_t swig_types[80]
-#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[81]
-#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[82]
-#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[83]
-#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[84]
-#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[85]
-#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[86]
-#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[87]
-#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[88]
-#define SWIGTYPE_p_svn_fs_path_change_t swig_types[89]
-#define SWIGTYPE_p_svn_fs_root_t swig_types[90]
-#define SWIGTYPE_p_svn_fs_t swig_types[91]
-#define SWIGTYPE_p_svn_fs_txn_t swig_types[92]
-#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[93]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[94]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[95]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[96]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[97]
-#define SWIGTYPE_p_svn_lock_t swig_types[98]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[99]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[100]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[101]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[102]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[103]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[104]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[105]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[106]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[107]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[108]
-#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[109]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[110]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[111]
-#define SWIGTYPE_p_svn_prop_kind swig_types[112]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[113]
-#define SWIGTYPE_p_svn_stream_t swig_types[114]
-#define SWIGTYPE_p_svn_string_t swig_types[115]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[116]
-#define SWIGTYPE_p_svn_tristate_t swig_types[117]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[118]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[119]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[120]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[121]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[122]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[123]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[124]
-#define SWIGTYPE_p_svn_version_t swig_types[125]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[126]
-#define SWIGTYPE_p_unsigned_char swig_types[127]
-#define SWIGTYPE_p_unsigned_long swig_types[128]
-#define SWIGTYPE_p_void swig_types[129]
-static swig_type_info *swig_types[131];
-static swig_module_info swig_module = {swig_types, 130, 0, 0, 0, 0};
+#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[65]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[66]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[67]
+#define SWIGTYPE_p_svn_config_t swig_types[68]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[69]
+#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[70]
+#define SWIGTYPE_p_svn_depth_t swig_types[71]
+#define SWIGTYPE_p_svn_diff_hunk_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_fsfs_info_t swig_types[78]
+#define SWIGTYPE_p_svn_fs_fsx_info_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_info_placeholder_t swig_types[82]
+#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[83]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[84]
+#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[85]
+#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[86]
+#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[87]
+#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[88]
+#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[89]
+#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[90]
+#define SWIGTYPE_p_svn_fs_path_change_t swig_types[91]
+#define SWIGTYPE_p_svn_fs_root_t swig_types[92]
+#define SWIGTYPE_p_svn_fs_t swig_types[93]
+#define SWIGTYPE_p_svn_fs_txn_t swig_types[94]
+#define SWIGTYPE_p_svn_fs_upgrade_notify_action_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_desc3_t swig_types[111]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_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_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_char swig_types[129]
+#define SWIGTYPE_p_unsigned_long swig_types[130]
+#define SWIGTYPE_p_void swig_types[131]
+static swig_type_info *swig_types[133];
+static swig_module_info swig_module = {swig_types, 132, 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)
 
@@ -3125,6 +3129,12 @@ static swig_module_info swig_module = {swig_types, 130, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
 
 /*-----------------------------------------------
               @(target):= _fs.so
@@ -3151,6 +3161,7 @@ static swig_module_info swig_module = {swig_types, 130, 0, 0, 0, 0};
 
 
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 
 
 static PyObject * _global_py_pool = NULL;
@@ -3643,7 +3654,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_version(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_fs_version")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_version",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3672,7 +3683,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_initialize(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_fs_initialize",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_initialize",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -3722,6 +3733,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_create2(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_fs_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -3736,7 +3748,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_create2(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_fs_create2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_create2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_create2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     /* PYTHON-FIXME: Handle None -> NULL. */
     arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
@@ -3809,6 +3825,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_create(PyObject *SWIGUNUSEDPARM(self), PyObjec
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_fs_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -3818,7 +3835,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_create(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_fs_create",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_create",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_create", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     /* PYTHON-FIXME: Handle None -> NULL. */
     arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
@@ -3878,6 +3899,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_open2(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_fs_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -3892,7 +3914,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_open2(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_fs_open2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_open2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_open2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     /* PYTHON-FIXME: Handle None -> NULL. */
     arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
@@ -3965,6 +3991,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_open(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_fs_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -3974,7 +4001,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_open(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_fs_open",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_open",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_open", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     /* PYTHON-FIXME: Handle None -> NULL. */
     arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
@@ -4034,6 +4065,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_upgrade2(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -4044,7 +4076,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_upgrade2(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_upgrade2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_upgrade2", "path");
+    if (PyErr_Occurred()) 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);
@@ -4110,6 +4146,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_upgrade(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
   
@@ -4117,7 +4154,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_upgrade(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_fs_upgrade",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_upgrade",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_upgrade", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -4165,6 +4206,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_type(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -4173,7 +4215,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_type(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_fs_type",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_type",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_type", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -4208,7 +4254,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_type(PyObject *SWIGUNUSEDPARM(self), PyObject
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -4240,7 +4286,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_path",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4290,7 +4336,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_config(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_config",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_config",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4333,6 +4379,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_delete_fs(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
   
@@ -4340,7 +4387,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_delete_fs(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_fs_delete_fs",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_delete_fs",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_delete_fs", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -4393,6 +4444,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy3(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *arg9 = (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 ;
@@ -4405,7 +4458,15 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy3(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_hotcopy3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_hotcopy3", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_hotcopy3", "dest_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -4488,6 +4549,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy2(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -4498,7 +4561,15 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy2(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_fs_hotcopy2",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_hotcopy2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_hotcopy2", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_hotcopy2", "dest_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -4562,6 +4633,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *arg4 = (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 ;
   svn_error_t *result = 0 ;
@@ -4570,7 +4643,15 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_fs_hotcopy",&arg1,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_hotcopy",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_hotcopy", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_hotcopy", "dest_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -4624,6 +4705,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_recover(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *arg4 = (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 ;
@@ -4632,7 +4714,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_recover(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_fs_recover",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_recover",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_recover", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg3 = obj1;
@@ -4693,7 +4779,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_freeze(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_freeze",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_freeze",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4752,6 +4838,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_berkeley_logfiles(PyObject *SWIGUNUSEDPARM(sel
   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 ;
@@ -4761,7 +4848,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_berkeley_logfiles(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_fs_berkeley_logfiles",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_berkeley_logfiles",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_berkeley_logfiles", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -4824,7 +4915,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_new(PyObject *SWIGUNUSEDPARM(self), PyObject *
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_new",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_new",1,2,&obj0,&obj1)) SWIG_fail;
   {
     /* PYTHON-FIXME: Handle None -> NULL. */
     arg1 = svn_swig_py_stringhash_from_dict(obj0, _global_pool);
@@ -4864,9 +4955,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_create_berkeley(PyObject *SWIGUNUSEDPARM(self)
   svn_fs_t *arg1 = (svn_fs_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_create_berkeley",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_create_berkeley",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4874,6 +4966,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_create_berkeley(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_create_berkeley", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_fs_create_berkeley(arg1,(char const *)arg2);
@@ -4903,9 +4999,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_open_berkeley(PyObject *SWIGUNUSEDPARM(self),
   svn_fs_t *arg1 = (svn_fs_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_open_berkeley",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_open_berkeley",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4913,6 +5010,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_open_berkeley(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_open_berkeley", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_fs_open_berkeley(arg1,(char const *)arg2);
@@ -4951,7 +5052,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_berkeley_path(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_berkeley_path",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_berkeley_path",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4993,6 +5094,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_delete_berkeley(PyObject *SWIGUNUSEDPARM(self)
   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 ;
   
@@ -5000,7 +5102,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_delete_berkeley(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_fs_delete_berkeley",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_delete_berkeley",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_delete_berkeley", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -5048,6 +5154,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy_berkeley(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *arg4 = (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 ;
   svn_error_t *result = 0 ;
@@ -5056,7 +5164,15 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy_berkeley(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_fs_hotcopy_berkeley",&arg1,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_hotcopy_berkeley",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_hotcopy_berkeley", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_hotcopy_berkeley", "dest_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -5108,6 +5224,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_berkeley_recover(PyObject *SWIGUNUSEDPARM(self
   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 ;
   
@@ -5115,7 +5232,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_berkeley_recover(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_fs_berkeley_recover",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_berkeley_recover",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_berkeley_recover", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -5163,6 +5284,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_create_access(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_fs_access_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -5171,7 +5293,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_create_access(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"z|O:svn_fs_create_access",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_create_access",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, TRUE, "svn_fs_create_access", "username");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -5225,7 +5351,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_set_access(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_set_access",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_set_access",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5272,7 +5398,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_access(PyObject *SWIGUNUSEDPARM(self), PyO
   svn_error_t *result = 0 ;
   
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_get_access",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_access",1,1,&obj0)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5319,7 +5445,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_get_username(PyObject *SWIGUNUSEDPARM(s
   svn_error_t *result = 0 ;
   
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_access_get_username",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_access_get_username",1,1,&obj0)) SWIG_fail;
   {
     arg2 = (svn_fs_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5352,7 +5478,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_get_username(PyObject *SWIGUNUSEDPARM(s
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -5370,9 +5496,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_add_lock_token2(PyObject *SWIGUNUSEDPAR
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Osz:svn_fs_access_add_lock_token2",&obj0,&arg2,&arg3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_access_add_lock_token2",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_fs_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5380,6 +5508,14 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_add_lock_token2(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_access_add_lock_token2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_fs_access_add_lock_token2", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_fs_access_add_lock_token2(arg1,(char const *)arg2,(char const *)arg3);
@@ -5409,9 +5545,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_add_lock_token(PyObject *SWIGUNUSEDPARM
   svn_fs_access_t *arg1 = (svn_fs_access_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_fs_access_add_lock_token",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_access_add_lock_token",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5419,6 +5556,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_add_lock_token(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_fs_access_add_lock_token", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_fs_access_add_lock_token(arg1,(char const *)arg2);
@@ -5451,7 +5592,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_compare_ids(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_compare_ids",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_compare_ids",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5487,7 +5628,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_check_related(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_check_related",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_check_related",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5530,14 +5671,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_parse_id(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_parse_id",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_parse_id",1,2,&obj0,&obj1)) SWIG_fail;
   {
-    if (!PyString_Check(obj0)) {
-      PyErr_SetString(PyExc_TypeError, "expecting a string");
+    Py_ssize_t pyStrLen;
+    if (!PyBytes_Check(obj0)) {
+      PyErr_SetString(PyExc_TypeError, "expecting a bytes");
       SWIG_fail;
     }
-    arg1 = PyString_AS_STRING(obj0);
-    arg2 = PyString_GET_SIZE(obj0);
+    if (PyBytes_AsStringAndSize(obj0, &arg1, &pyStrLen) == -1) {
+      SWIG_fail;
+    }
+    arg2 = pyStrLen;
   }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -5583,7 +5727,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_unparse_id(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_unparse_id",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_unparse_id",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5607,7 +5751,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_unparse_id(PyObject *SWIGUNUSEDPARM(self), PyO
     
   }
   {
-    resultobj = PyString_FromStringAndSize(result->data, result->len);
+    resultobj = PyBytes_FromStringAndSize(result->data, result->len);
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -5642,7 +5786,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_begin_txn2(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_fs_begin_txn2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_begin_txn2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5725,7 +5869,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_begin_txn(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_begin_txn",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_begin_txn",2,3,&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()) {
@@ -5804,7 +5948,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_commit_txn(PyObject *SWIGUNUSEDPARM(self), PyO
   arg4 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_commit_txn",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_commit_txn",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg3 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5870,7 +6014,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_abort_txn(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_abort_txn",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_abort_txn",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5924,6 +6068,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_purge_txn(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
   
@@ -5931,13 +6076,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_purge_txn(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_purge_txn",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_purge_txn",2,3,&obj0,&obj1,&obj2)) 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_string_to_cstring(obj1, FALSE, "svn_fs_purge_txn", "txn_id");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -5994,7 +6143,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_name(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_txn_name",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_txn_name",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6035,7 +6184,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_name(PyObject *SWIGUNUSEDPARM(self), PyObj
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -6059,7 +6208,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_base_revision(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_txn_base_revision",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_txn_base_revision",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6091,6 +6240,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_open_txn(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *_global_py_pool = NULL ;
   svn_fs_txn_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -6099,13 +6249,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_open_txn(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_open_txn",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_open_txn",2,3,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_open_txn", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -6168,7 +6322,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_list_transactions(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_list_transactions",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_list_transactions",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6227,6 +6381,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *_global_py_pool = NULL ;
   svn_string_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -6235,13 +6390,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_txn_prop",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_txn_prop",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_txn_prop", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -6274,9 +6433,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -6311,7 +6469,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_proplist(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_txn_proplist",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_txn_proplist",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6370,6 +6528,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   svn_string_t value3 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -6378,7 +6537,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_fs_change_txn_prop",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_change_txn_prop",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6386,15 +6545,23 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_change_txn_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj2)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj2);
-      value3.len = PyString_GET_SIZE(obj2);
+      if (PyBytes_AsStringAndSize(obj2, (char **)&(value3.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
@@ -6453,7 +6620,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_txn_props(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_change_txn_props",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_change_txn_props",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6524,7 +6691,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_root(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_revision_root",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_revision_root",2,3,&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()) {
@@ -6599,7 +6766,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_root(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_txn_root",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_txn_root",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6656,7 +6823,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_close_root(PyObject *SWIGUNUSEDPARM(self), PyO
   svn_fs_root_t *arg1 = (svn_fs_root_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_close_root",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_close_root",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6684,7 +6851,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_root_fs(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   svn_fs_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_root_fs",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_root_fs",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6713,7 +6880,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_txn_root(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_is_txn_root",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_is_txn_root",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6741,7 +6908,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_revision_root(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_is_revision_root",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_is_revision_root",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6777,7 +6944,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_root_name(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_txn_root_name",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_txn_root_name",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6819,7 +6986,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_root_base_revision(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_txn_root_base_revision",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_txn_root_base_revision",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6847,7 +7014,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_root_revision(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_revision_root_revision",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_revision_root_revision",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6878,7 +7045,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_path_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change3_t_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6910,7 +7077,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_path_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_string_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6932,7 +7099,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_change_kind_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change3_t_change_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_change_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6959,7 +7126,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_change_kind_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_fs_path_change_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_change_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_change_kind_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6981,7 +7148,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_node_kind_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change3_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_node_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7008,7 +7175,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_node_kind_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_node_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_node_kind_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7030,7 +7197,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_text_mod_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change3_t_text_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_text_mod_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7057,7 +7224,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_text_mod_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_text_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_text_mod_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7079,7 +7246,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_prop_mod_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change3_t_prop_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_prop_mod_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7106,7 +7273,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_prop_mod_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_prop_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_prop_mod_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7128,7 +7295,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_mergeinfo_mod_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change3_t_mergeinfo_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_mergeinfo_mod_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7155,7 +7322,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_mergeinfo_mod_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_mergeinfo_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_mergeinfo_mod_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7177,7 +7344,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_copyfrom_known_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change3_t_copyfrom_known_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_copyfrom_known_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7204,7 +7371,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_copyfrom_known_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_copyfrom_known_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_copyfrom_known_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7226,7 +7393,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_copyfrom_rev_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change3_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7253,7 +7420,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_copyfrom_rev_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7273,8 +7440,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_copyfrom_path_set(PyObject *SWI
   struct svn_fs_path_change3_t *arg1 = (struct svn_fs_path_change3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_fs_path_change3_t_copyfrom_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_copyfrom_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7282,6 +7450,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_copyfrom_path_set(PyObject *SWI
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_fs_path_change3_t_copyfrom_path_set", "copyfrom_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_path) free((char *)arg1->copyfrom_path);
@@ -7302,7 +7474,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_t_copyfrom_path_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change3_t_copyfrom_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_t_copyfrom_path_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7319,7 +7491,7 @@ fail:
 
 SWIGINTERN PyObject *svn_fs_path_change3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_path_change3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7331,7 +7503,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_node_rev_id_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_node_rev_id_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_node_rev_id_set",2,2,&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()) {
@@ -7358,7 +7530,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_node_rev_id_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_fs_id_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_node_rev_id_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_node_rev_id_get",1,1,&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()) {
@@ -7381,7 +7553,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_change_kind_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_change_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_change_kind_set",2,2,&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()) {
@@ -7408,7 +7580,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_change_kind_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_fs_path_change_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_change_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_change_kind_get",1,1,&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()) {
@@ -7430,7 +7602,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_text_mod_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_text_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_text_mod_set",2,2,&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()) {
@@ -7457,7 +7629,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_text_mod_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_text_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_text_mod_get",1,1,&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()) {
@@ -7479,7 +7651,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_prop_mod_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_prop_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_prop_mod_set",2,2,&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()) {
@@ -7506,7 +7678,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_prop_mod_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_prop_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_prop_mod_get",1,1,&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()) {
@@ -7528,7 +7700,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_node_kind_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_node_kind_set",2,2,&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()) {
@@ -7555,7 +7727,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_node_kind_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_node_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_node_kind_get",1,1,&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()) {
@@ -7577,7 +7749,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_known_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_copyfrom_known_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_copyfrom_known_set",2,2,&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()) {
@@ -7604,7 +7776,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_known_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_copyfrom_known_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_copyfrom_known_get",1,1,&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()) {
@@ -7626,7 +7798,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_rev_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_copyfrom_rev_set",2,2,&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()) {
@@ -7653,7 +7825,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_rev_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_copyfrom_rev_get",1,1,&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()) {
@@ -7673,8 +7845,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_path_set(PyObject *SWI
   struct svn_fs_path_change2_t *arg1 = (struct svn_fs_path_change2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_fs_path_change2_t_copyfrom_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_copyfrom_path_set",2,2,&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()) {
@@ -7682,6 +7855,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_path_set(PyObject *SWI
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_fs_path_change2_t_copyfrom_path_set", "copyfrom_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_path) free((char *)arg1->copyfrom_path);
@@ -7702,7 +7879,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_path_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_copyfrom_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_copyfrom_path_get",1,1,&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()) {
@@ -7724,7 +7901,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_mergeinfo_mod_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_mergeinfo_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_mergeinfo_mod_set",2,2,&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()) {
@@ -7751,7 +7928,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_mergeinfo_mod_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_tristate_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_mergeinfo_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_t_mergeinfo_mod_get",1,1,&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()) {
@@ -7768,7 +7945,7 @@ fail:
 
 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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_path_change2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7780,7 +7957,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_node_rev_id_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change_t_node_rev_id_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_t_node_rev_id_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7807,7 +7984,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_node_rev_id_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_fs_id_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_t_node_rev_id_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_t_node_rev_id_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7830,7 +8007,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_change_kind_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change_t_change_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_t_change_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7857,7 +8034,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_change_kind_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_fs_path_change_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_t_change_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_t_change_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7879,7 +8056,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_text_mod_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change_t_text_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_t_text_mod_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7906,7 +8083,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_text_mod_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_t_text_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_t_text_mod_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7928,7 +8105,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_prop_mod_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change_t_prop_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_t_prop_mod_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7955,7 +8132,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_prop_mod_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_t_prop_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_t_prop_mod_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7972,7 +8149,7 @@ fail:
 
 SWIGINTERN PyObject *svn_fs_path_change_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_path_change_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7993,7 +8170,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_create(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_path_change2_create",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change2_create",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8050,7 +8227,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_create(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_path_change3_create",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_create",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_path_change_kind_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -8101,7 +8278,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change3_dup(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_path_change3_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change3_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_path_change3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8147,7 +8324,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_get(PyObject *SWIGUNUSEDPARM(self)
   svn_error_t *result = 0 ;
   
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_path_change_get",1,1,&obj0)) SWIG_fail;
   {
     arg2 = (svn_fs_path_change_iterator_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_iterator_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8211,7 +8388,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_paths_changed3(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_fs_paths_changed3",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_paths_changed3",1,3,&obj0,&obj1,&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()) {
@@ -8297,7 +8474,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_paths_changed2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_paths_changed2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_paths_changed2",1,2,&obj0,&obj1)) 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()) {
@@ -8369,7 +8546,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_paths_changed(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_paths_changed",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_paths_changed",1,2,&obj0,&obj1)) 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()) {
@@ -8435,6 +8612,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_check_path(PyObject *SWIGUNUSEDPARM(self), PyO
   svn_node_kind_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -8443,13 +8621,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_check_path(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_check_path",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_check_path",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_check_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -8506,6 +8688,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_history2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -8519,13 +8702,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_history2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_fs_node_history2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_history2",2,4,&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 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_history2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -8595,6 +8782,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_history(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *_global_py_pool = NULL ;
   svn_fs_history_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -8603,13 +8791,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_history(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_history",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_history",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_history", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -8680,7 +8872,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_history_prev2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_fs_history_prev2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_history_prev2",2,4,&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()) {
@@ -8771,7 +8963,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_history_prev(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_history_prev",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_history_prev",2,3,&obj0,&obj1,&obj2)) 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()) {
@@ -8850,7 +9042,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_history_location(PyObject *SWIGUNUSEDPARM(self
   arg4 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_history_location",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_history_location",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg3 = (svn_fs_history_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_history_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8891,7 +9083,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_history_location(PyObject *SWIGUNUSEDPARM(self
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -8926,6 +9118,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_dir(PyObject *SWIGUNUSEDPARM(self), PyObjec
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -8934,13 +9127,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_dir(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_is_dir",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_is_dir",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_is_dir", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -8997,6 +9194,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_file(PyObject *SWIGUNUSEDPARM(self), PyObje
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9005,13 +9203,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_file(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_is_file",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_is_file",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_is_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9067,6 +9269,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_id(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *_global_py_pool = NULL ;
   svn_fs_id_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9075,13 +9278,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_id(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_id",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_id",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_id", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9139,7 +9346,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_relation(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   
@@ -9147,7 +9356,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_relation(PyObject *SWIGUNUSEDPARM(self),
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_relation",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&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()) {
@@ -9161,11 +9370,19 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_relation(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_node_relation", "path_a");
+    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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_fs_node_relation", "path_b");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -9216,6 +9433,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_created_rev(PyObject *SWIGUNUSEDPARM(self
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9224,13 +9442,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_created_rev(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_created_rev",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_created_rev",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_created_rev", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9287,6 +9509,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_origin_rev(PyObject *SWIGUNUSEDPARM(self)
   svn_revnum_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9295,13 +9518,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_origin_rev(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_origin_rev",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_origin_rev",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_origin_rev", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9357,6 +9584,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_created_path(PyObject *SWIGUNUSEDPARM(sel
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9365,13 +9593,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_created_path(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_created_path",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_created_path",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_created_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9406,7 +9638,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_created_path(PyObject *SWIGUNUSEDPARM(sel
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -9435,6 +9667,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_prop(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   svn_string_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9443,13 +9677,21 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_prop(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Oss|O:svn_fs_node_prop",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_prop",3,4,&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 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_prop", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_node_prop", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -9482,9 +9724,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_prop(PyObject *SWIGUNUSEDPARM(self), PyOb
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -9512,6 +9753,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_proplist(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9520,13 +9762,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_proplist(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_proplist",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_proplist",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_proplist", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9580,6 +9826,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_has_props(PyObject *SWIGUNUSEDPARM(self),
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9588,13 +9835,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_has_props(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_has_props",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_node_has_props",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_node_has_props", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9651,6 +9902,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_node_prop(PyObject *SWIGUNUSEDPARM(self
   PyObject *_global_py_pool = NULL ;
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -9659,7 +9912,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_node_prop(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssO|O:svn_fs_change_node_prop",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_change_node_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9667,15 +9920,27 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_node_prop(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_change_node_prop", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_change_node_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -9731,7 +9996,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_props_different(PyObject *SWIGUNUSEDPARM(self)
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9740,7 +10007,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_props_different(PyObject *SWIGUNUSEDPARM(self)
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_props_different",4,5,&obj0,&obj1,&obj2,&obj3,&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()) {
@@ -9748,11 +10015,19 @@ SWIGINTERN PyObject *_wrap_svn_fs_props_different(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_props_different", "path1");
+    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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_fs_props_different", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -9811,7 +10086,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_props_changed(PyObject *SWIGUNUSEDPARM(self),
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9820,7 +10097,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_props_changed(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_props_changed",&obj0,&arg3,&obj2,&arg5,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_props_changed",4,5,&obj0,&obj1,&obj2,&obj3,&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()) {
@@ -9828,11 +10105,19 @@ SWIGINTERN PyObject *_wrap_svn_fs_props_changed(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_props_changed", "path1");
+    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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_fs_props_changed", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -9891,6 +10176,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_copied_from(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = SWIG_TMPOBJ ;
   char *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9900,13 +10186,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_copied_from(PyObject *SWIGUNUSEDPARM(self), Py
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_copied_from",&obj0,&arg4,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_copied_from",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_copied_from", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9947,7 +10237,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_copied_from(PyObject *SWIGUNUSEDPARM(self), Py
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -9977,6 +10267,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_closest_copy(PyObject *SWIGUNUSEDPARM(self), P
   svn_fs_root_t *temp1 ;
   char *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9986,13 +10277,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_closest_copy(PyObject *SWIGUNUSEDPARM(self), P
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_closest_copy",&obj0,&arg4,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_closest_copy",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_closest_copy", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -10033,7 +10328,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_closest_copy(PyObject *SWIGUNUSEDPARM(self), P
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -10077,7 +10372,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_mergeinfo3(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_fs_get_mergeinfo3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_mergeinfo3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10197,7 +10492,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_mergeinfo2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|OO:svn_fs_get_mergeinfo2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_mergeinfo2",5,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) 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()) {
@@ -10319,7 +10614,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_mergeinfo(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_fs_get_mergeinfo",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_mergeinfo",4,5,&obj0,&obj1,&obj2,&obj3,&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()) {
@@ -10412,8 +10707,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   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 ;
   
@@ -10422,7 +10720,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOsOs|O:svn_fs_merge",&obj0,&arg3,&obj2,&arg5,&obj4,&arg7,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_merge",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) 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()) {
@@ -10430,17 +10728,29 @@ SWIGINTERN PyObject *_wrap_svn_fs_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_merge", "source_path");
+    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;
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_fs_merge", "target_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
     }
   }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_fs_merge", "ancestor_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
     if (obj6 != Py_None && obj6 != _global_py_pool) {
@@ -10475,7 +10785,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -10498,8 +10808,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_name_set(PyObject *SWIGUNUSEDPARM(sel
   struct svn_fs_dirent_t *arg1 = (struct svn_fs_dirent_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_dirent_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_dirent_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10507,6 +10818,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_name_set(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_dirent_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -10527,7 +10842,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_name_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_dirent_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_dirent_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10549,7 +10864,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_id_set(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_dirent_t_id_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_dirent_t_id_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10576,7 +10891,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_id_get(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   svn_fs_id_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_dirent_t_id_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_dirent_t_id_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10599,7 +10914,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_kind_set(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_dirent_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_dirent_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10626,7 +10941,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_kind_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_dirent_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_dirent_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10643,7 +10958,7 @@ fail:
 
 SWIGINTERN PyObject *svn_fs_dirent_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_dirent_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -10658,6 +10973,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dir_entries(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -10666,13 +10982,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_dir_entries(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_dir_entries",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_dir_entries",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_dir_entries", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -10746,7 +11066,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dir_optimal_order(PyObject *SWIGUNUSEDPARM(sel
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_dir_optimal_order",2,4,&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()) {
@@ -10829,6 +11149,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_make_dir(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
   
@@ -10836,13 +11157,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_make_dir(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_make_dir",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_make_dir",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_make_dir", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -10890,6 +11215,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_delete(PyObject *SWIGUNUSEDPARM(self), PyObjec
   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 ;
   
@@ -10897,13 +11223,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_delete(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_delete",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_delete",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_delete", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -10953,7 +11283,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_copy(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
   
@@ -10961,7 +11293,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_copy(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_copy",&obj0,&arg2,&obj2,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_copy",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10969,11 +11301,19 @@ SWIGINTERN PyObject *_wrap_svn_fs_copy(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_copy", "from_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_fs_copy", "to_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -11023,6 +11363,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_link(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11030,7 +11371,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_link(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_fs_revision_link",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_revision_link",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11043,6 +11384,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_link(PyObject *SWIGUNUSEDPARM(self),
       SWIG_fail;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_revision_link", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -11092,6 +11437,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_length(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *_global_py_pool = NULL ;
   apr_int64_t temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11100,13 +11446,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_length(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_file_length",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_file_length",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_file_length", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11162,6 +11512,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_checksum(PyObject *SWIGUNUSEDPARM(self),
   svn_checksum_t *temp1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -11171,7 +11522,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_checksum(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_fs_file_checksum",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_file_checksum",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_checksum_kind_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -11185,6 +11536,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_checksum(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_file_checksum", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -11218,13 +11573,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_checksum(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_fs_file_checksum arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_fs_file_checksum is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -11248,6 +11600,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_md5_checksum(PyObject *SWIGUNUSEDPARM(sel
   PyObject *_global_py_pool = NULL ;
   unsigned char temp1[APR_MD5_DIGESTSIZE] ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11256,13 +11609,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_md5_checksum(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_file_md5_checksum",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_file_md5_checksum",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_file_md5_checksum", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11291,7 +11648,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_md5_checksum(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize((char *)arg1, APR_MD5_DIGESTSIZE));
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyBytes_FromStringAndSize((const char *)arg1, APR_MD5_DIGESTSIZE));
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -11315,6 +11672,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_contents(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   svn_stream_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11323,13 +11681,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_contents(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_file_contents",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_file_contents",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_file_contents", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11388,6 +11750,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_try_process_file_contents(PyObject *SWIGUNUSED
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -11398,7 +11761,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_try_process_file_contents(PyObject *SWIGUNUSED
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_fs_try_process_file_contents",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_try_process_file_contents",4,5,&obj0,&obj1,&obj2,&obj3,&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()) {
@@ -11406,6 +11769,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_try_process_file_contents(PyObject *SWIGUNUSED
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_try_process_file_contents", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_fs_process_contents_func_t * tmp =
     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()) {
@@ -11474,6 +11841,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_make_file(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
   
@@ -11481,13 +11849,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_make_file(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_make_file",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_make_file",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_make_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11540,6 +11912,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_apply_textdelta(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   void *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11558,13 +11933,25 @@ SWIGINTERN PyObject *_wrap_svn_fs_apply_textdelta(PyObject *SWIGUNUSEDPARM(self)
     if (arg1 == NULL) SWIG_fail;
   }
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Oszz|O:svn_fs_apply_textdelta",&obj0,&arg4,&arg5,&arg6,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_apply_textdelta",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_apply_textdelta", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_fs_apply_textdelta", "base_checksum");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_fs_apply_textdelta", "result_checksum");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -11627,6 +12014,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_apply_text(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   svn_stream_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11635,13 +12024,21 @@ SWIGINTERN PyObject *_wrap_svn_fs_apply_text(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Osz|O:svn_fs_apply_text",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_apply_text",3,4,&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 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_apply_text", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_fs_apply_text", "result_checksum");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -11700,7 +12097,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_contents_different(PyObject *SWIGUNUSEDPARM(se
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11709,7 +12108,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_contents_different(PyObject *SWIGUNUSEDPARM(se
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_contents_different",4,5,&obj0,&obj1,&obj2,&obj3,&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()) {
@@ -11717,11 +12116,19 @@ SWIGINTERN PyObject *_wrap_svn_fs_contents_different(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_contents_different", "path1");
+    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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_fs_contents_different", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -11780,7 +12187,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_contents_changed(PyObject *SWIGUNUSEDPARM(self
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11789,7 +12198,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_contents_changed(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_contents_changed",&obj0,&arg3,&obj2,&arg5,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_contents_changed",4,5,&obj0,&obj1,&obj2,&obj3,&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()) {
@@ -11797,11 +12206,19 @@ SWIGINTERN PyObject *_wrap_svn_fs_contents_changed(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_contents_changed", "path1");
+    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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_fs_contents_changed", "path2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -11865,7 +12282,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_youngest_rev(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_youngest_rev",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_youngest_rev",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11944,7 +12361,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_info_format(PyObject *SWIGUNUSEDPARM(self), Py
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_fs_info_format",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_info_format",1,3,&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()) {
@@ -12042,7 +12459,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_info_config_files(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_fs_info_config_files",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_info_config_files",1,3,&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()) {
@@ -12127,7 +12544,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_deltify_revision(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_deltify_revision",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_deltify_revision",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12193,7 +12610,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_refresh_revision_props(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_refresh_revision_props",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_refresh_revision_props",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12253,6 +12670,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop2(PyObject *SWIGUNUSEDPARM(self),
   svn_string_t *temp1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -12267,7 +12685,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|OO:svn_fs_revision_prop2",&obj0,&obj1,&arg4,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_revision_prop2",4,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12281,6 +12699,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_revision_prop2", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -12326,9 +12748,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop2(PyObject *SWIGUNUSEDPARM(self),
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -12364,6 +12785,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop(PyObject *SWIGUNUSEDPARM(self),
   svn_string_t *temp1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -12372,7 +12794,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_fs_revision_prop",&obj0,&obj1,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_revision_prop",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12385,6 +12807,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop(PyObject *SWIGUNUSEDPARM(self),
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_revision_prop", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -12417,9 +12843,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop(PyObject *SWIGUNUSEDPARM(self),
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -12464,7 +12889,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_proplist2(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_fs_revision_proplist2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_revision_proplist2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12558,7 +12983,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_proplist(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_revision_proplist",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_revision_proplist",2,3,&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()) {
@@ -12626,6 +13051,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
   svn_string_t value5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -12635,7 +13061,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_fs_change_rev_prop2",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_change_rev_prop2",5,6,&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()) {
@@ -12649,6 +13075,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_change_rev_prop2", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     SWIG_exception(SWIG_ValueError, "svn_fs_change_rev_prop2 is not implemented yet");
     
   }
@@ -12656,12 +13086,16 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -12697,9 +13131,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
     if (*arg4 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg4)->data, (*arg4)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg4)->data, (*arg4)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -12729,6 +13162,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop(PyObject *SWIGUNUSEDPARM(self)
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -12737,7 +13171,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_fs_change_rev_prop",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_change_rev_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12751,15 +13185,23 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_change_rev_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -12814,7 +13256,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_file_delta_stream(PyObject *SWIGUNUSEDPARM
   PyObject *_global_py_pool = NULL ;
   svn_txdelta_stream_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -12823,7 +13267,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_file_delta_stream(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_get_file_delta_stream",&obj0,&arg3,&obj2,&arg5,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_file_delta_stream",4,5,&obj0,&obj1,&obj2,&obj3,&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()) {
@@ -12831,11 +13275,19 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_file_delta_stream(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_get_file_delta_stream", "source_path");
+    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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_fs_get_file_delta_stream", "target_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -12898,7 +13350,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_get_uuid",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_uuid",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12939,7 +13391,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -12965,6 +13417,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_set_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
   
@@ -12972,13 +13425,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_set_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Oz|O:svn_fs_set_uuid",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_set_uuid",2,3,&obj0,&obj1,&obj2)) 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_string_to_cstring(obj1, TRUE, "svn_fs_set_uuid", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -13025,6 +13482,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock_target_create(PyObject *SWIGUNUSEDPARM(se
   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_fs_lock_target_t *result = 0 ;
@@ -13033,7 +13491,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock_target_create(PyObject *SWIGUNUSEDPARM(se
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_lock_target_create",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, TRUE, "svn_fs_lock_target_create", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_revnum_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -13075,8 +13537,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock_target_set_token(PyObject *SWIGUNUSEDPARM
   svn_fs_lock_target_t *arg1 = (svn_fs_lock_target_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_fs_lock_target_set_token",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_lock_target_set_token",2,2,&obj0,&obj1)) 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()) {
@@ -13084,6 +13547,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock_target_set_token(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_fs_lock_target_set_token", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     svn_fs_lock_target_set_token(arg1,(char const *)arg2);
@@ -13114,6 +13581,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock_many(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -13130,7 +13598,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock_many(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_lock_many",7,9,&obj0,&obj1,&obj2,&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()) {
@@ -13151,6 +13619,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock_many(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_fs_lock_many", "comment");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -13236,6 +13708,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *_global_py_pool = NULL ;
   svn_lock_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -13248,7 +13723,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg10 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OszzOOOO|O:svn_fs_lock",&obj0,&arg3,&arg4,&arg5,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_lock",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13256,6 +13731,18 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_lock", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_fs_lock", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_fs_lock", "comment");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -13336,7 +13823,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_generate_lock_token(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_generate_lock_token",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_generate_lock_token",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13377,7 +13864,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_generate_lock_token(PyObject *SWIGUNUSEDPARM(s
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -13422,7 +13909,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_unlock_many(PyObject *SWIGUNUSEDPARM(self), Py
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_unlock_many",4,6,&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()) {
@@ -13505,6 +13992,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_unlock(PyObject *SWIGUNUSEDPARM(self), PyObjec
   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 ;
@@ -13513,7 +14002,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_unlock(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OszO|O:svn_fs_unlock",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_unlock",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13521,6 +14010,14 @@ SWIGINTERN PyObject *_wrap_svn_fs_unlock(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_unlock", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_fs_unlock", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -13575,6 +14072,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *_global_py_pool = NULL ;
   svn_lock_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -13583,13 +14081,17 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_get_lock",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_lock",2,3,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_get_lock", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -13646,6 +14148,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -13655,7 +14158,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_fs_get_locks2",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_locks2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13663,6 +14166,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_get_locks2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -13721,6 +14228,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -13729,7 +14237,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_fs_get_locks",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_get_locks",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13737,6 +14245,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_get_locks", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_fs_get_locks_callback_t) svn_swig_py_fs_get_locks_func;
     arg4 = obj2;
   }
@@ -13793,16 +14305,22 @@ SWIGINTERN PyObject *_wrap_svn_fs_print_modules(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_print_modules",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_print_modules",1,2,&obj0,&obj1)) SWIG_fail;
   {
-    if (!PyString_Check(obj0)) {
-      PyErr_SetString(PyExc_TypeError, "not a string");
+    if (!PyBytes_Check(obj0)) {
+      PyErr_SetString(PyExc_TypeError, "not a bytes object");
       SWIG_fail;
     }
-    arg1 = svn_stringbuf_ncreate(PyString_AS_STRING(obj0),
-      PyString_GET_SIZE(obj0),
-      /* ### gah... what pool to use? */
-      _global_pool);
+    {
+      Py_ssize_t strBufLen;
+      char *strBufChar;
+      if (-1 == PyBytes_AsStringAndSize(obj0, &strBufChar, &strBufLen)) {
+        SWIG_fail;
+      }
+      arg1 = svn_stringbuf_ncreate(strBufChar, strBufLen,
+        /* ### gah... what pool to use? */
+        _global_pool);
+    }
   }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -13853,6 +14371,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_pack(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -13863,7 +14382,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_pack(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_fs_pack",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_pack",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_pack", "db_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_fs_pack_notify_t * tmp =
     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);
@@ -13936,6 +14459,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_verify(PyObject *SWIGUNUSEDPARM(self), PyObjec
   apr_pool_t *arg9 = (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 ;
@@ -13949,7 +14473,11 @@ SWIGINTERN PyObject *_wrap_svn_fs_verify(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_fs_verify",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_verify",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_fs_verify", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     /* PYTHON-FIXME: Handle None -> NULL. */
     arg2 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
@@ -14039,7 +14567,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_verify_root(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_verify_root",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_verify_root",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14090,8 +14618,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_fs_type_set(PyObject *SWIGUNUSEDPA
   struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_fsfs_info_t_fs_type_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsfs_info_t_fs_type_set",2,2,&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()) {
@@ -14099,6 +14628,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_fs_type_set(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_fsfs_info_t_fs_type_set", "fs_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->fs_type) free((char *)arg1->fs_type);
@@ -14119,7 +14652,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_fs_type_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsfs_info_t_fs_type_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsfs_info_t_fs_type_get",1,1,&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()) {
@@ -14141,7 +14674,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_shard_size_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_fsfs_info_t_shard_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsfs_info_t_shard_size_set",2,2,&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()) {
@@ -14168,7 +14701,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_shard_size_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsfs_info_t_shard_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsfs_info_t_shard_size_get",1,1,&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()) {
@@ -14190,7 +14723,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_min_unpacked_rev_set(PyObject *SWI
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsfs_info_t_min_unpacked_rev_set",2,2,&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()) {
@@ -14217,7 +14750,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_min_unpacked_rev_get(PyObject *SWI
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsfs_info_t_min_unpacked_rev_get",1,1,&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()) {
@@ -14239,7 +14772,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_log_addressing_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_fsfs_info_t_log_addressing_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsfs_info_t_log_addressing_set",2,2,&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()) {
@@ -14266,7 +14799,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_log_addressing_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsfs_info_t_log_addressing_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsfs_info_t_log_addressing_get",1,1,&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()) {
@@ -14283,7 +14816,7 @@ fail:
 
 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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_fsfs_info_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -14293,8 +14826,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_fs_type_set(PyObject *SWIGUNUSEDPAR
   struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_fsx_info_t_fs_type_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsx_info_t_fs_type_set",2,2,&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()) {
@@ -14302,6 +14836,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_fs_type_set(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_fsx_info_t_fs_type_set", "fs_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->fs_type) free((char *)arg1->fs_type);
@@ -14322,7 +14860,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_fs_type_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsx_info_t_fs_type_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsx_info_t_fs_type_get",1,1,&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()) {
@@ -14344,7 +14882,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_shard_size_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_fsx_info_t_shard_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsx_info_t_shard_size_set",2,2,&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()) {
@@ -14371,7 +14909,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_shard_size_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsx_info_t_shard_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsx_info_t_shard_size_get",1,1,&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()) {
@@ -14393,7 +14931,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_min_unpacked_rev_set(PyObject *SWIG
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsx_info_t_min_unpacked_rev_set",2,2,&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()) {
@@ -14420,7 +14958,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_min_unpacked_rev_get(PyObject *SWIG
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_fsx_info_t_min_unpacked_rev_get",1,1,&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()) {
@@ -14437,7 +14975,7 @@ fail:
 
 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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_fsx_info_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -14447,8 +14985,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_info_placeholder_t_fs_type_set(PyObject *SWIGU
   struct svn_fs_info_placeholder_t *arg1 = (struct svn_fs_info_placeholder_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_info_placeholder_t_fs_type_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_info_placeholder_t_fs_type_set",2,2,&obj0,&obj1)) 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()) {
@@ -14456,6 +14995,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_info_placeholder_t_fs_type_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_info_placeholder_t_fs_type_set", "fs_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->fs_type) free((char *)arg1->fs_type);
@@ -14476,7 +15019,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_info_placeholder_t_fs_type_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_info_placeholder_t_fs_type_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_info_placeholder_t_fs_type_get",1,1,&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()) {
@@ -14493,7 +15036,7 @@ fail:
 
 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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_info_placeholder_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -14521,7 +15064,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_info(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_fs_info",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_info",1,3,&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()) {
@@ -14610,7 +15153,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_info_dup(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_info_dup",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (void *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_void, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14666,8 +15209,9 @@ SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_fs_type_set(PyObject *SWIGUNUSEDP
   struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_ioctl_code_t_fs_type_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_ioctl_code_t_fs_type_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_ioctl_code_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_ioctl_code_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14675,6 +15219,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_fs_type_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_ioctl_code_t_fs_type_set", "fs_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->fs_type) free((char *)arg1->fs_type);
@@ -14695,7 +15243,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_fs_type_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_ioctl_code_t_fs_type_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_ioctl_code_t_fs_type_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_ioctl_code_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_ioctl_code_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14717,7 +15265,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_code_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_ioctl_code_t_code_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_ioctl_code_t_code_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_fs_ioctl_code_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_ioctl_code_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14744,7 +15292,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_code_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_ioctl_code_t_code_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_ioctl_code_t_code_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_fs_ioctl_code_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_ioctl_code_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14761,7 +15309,7 @@ fail:
 
 SWIGINTERN PyObject *svn_fs_ioctl_code_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_ioctl_code_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -14798,7 +15346,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_ioctl(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg8 = _global_pool;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:svn_fs_ioctl",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_ioctl",4,6,&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()) {
@@ -14890,56 +15438,56 @@ fail:
 
 SWIGINTERN PyObject *svn_fs_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_access_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_access_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_id_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_id_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_txn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_txn_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_root_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_root_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_path_change_iterator_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_path_change_iterator_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_history_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_history_t, SWIG_NewClientData(obj));
   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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_lock_target_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -14953,7 +15501,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_warning_callback(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_fs_invoke_warning_callback",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_warning_callback",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_fs_warning_callback_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_error_t__void, svn_argnum_obj0);
@@ -15011,7 +15559,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_upgrade_notify(PyObject *SWIGUNUSEDPARM
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_upgrade_notify",4,5,&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);
@@ -15091,7 +15639,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_progress_notify_func(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_fs_invoke_progress_notify_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_progress_notify_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_fs_progress_notify_func_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_long_p_void_p_apr_pool_t__void, svn_argnum_obj0);
@@ -15162,7 +15710,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_hotcopy_notify(PyObject *SWIGUNUSEDPARM
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_hotcopy_notify",4,5,&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);
@@ -15236,7 +15784,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_freeze_func(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_invoke_freeze_func",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_freeze_func",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_fs_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);
@@ -15302,6 +15850,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_mergeinfo_receiver(PyObject *SWIGUNUSED
   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 ;
@@ -15311,7 +15860,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_mergeinfo_receiver(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_fs_invoke_mergeinfo_receiver",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_mergeinfo_receiver",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_fs_mergeinfo_receiver_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -15321,6 +15870,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_mergeinfo_receiver(PyObject *SWIGUNUSED
     arg1 = *tmp;
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_fs_invoke_mergeinfo_receiver", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -15400,7 +15953,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_process_contents_func(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_fs_invoke_process_contents_func",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_process_contents_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_fs_process_contents_func_t * tmp =
     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);
@@ -15480,6 +16033,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -15489,7 +16043,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_lock_callback",5,6,&obj0,&obj1,&obj2,&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);
@@ -15507,6 +16061,10 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_fs_invoke_lock_callback", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_lock_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -15575,7 +16133,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_get_locks_callback(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_fs_invoke_get_locks_callback",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_get_locks_callback",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_fs_get_locks_callback_t * tmp =
     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);
@@ -15657,7 +16215,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_pack_notify(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_fs_invoke_pack_notify",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_fs_invoke_pack_notify",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_fs_pack_notify_t * tmp =
     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);
@@ -15722,70 +16280,70 @@ fail:
 
 SWIGINTERN PyObject *svn_fs_warning_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_error_t__void, SWIG_NewClientData(obj));
   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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_long_p_void_p_apr_pool_t__void, SWIG_NewClientData(obj));
   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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_mergeinfo_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_process_contents_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_fs_pack_notify_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -16105,6 +16663,8 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client_conflict_option_t = {"_p_svn_client_conflict_option_t", "svn_client_conflict_option_t *", 0, 0, (void*)0, 0};
 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_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
@@ -16237,6 +16797,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
+  &_swigt__p_svn_client__shelf_version_t,
+  &_swigt__p_svn_client_conflict_option_t,
   &_swigt__p_svn_commit_info_t,
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
@@ -16369,6 +16931,8 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client_conflict_option_t[] = {  {&_swigt__p_svn_client_conflict_option_t, 0, 0, 0},{0, 0, 0, 0}};
 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_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -16501,6 +17065,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
+  _swigc__p_svn_client__shelf_version_t,
+  _swigc__p_svn_client_conflict_option_t,
   _swigc__p_svn_commit_info_t,
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
diff --git a/subversion/bindings/swig/python/svn_ra.c b/subversion/bindings/swig/python/svn_ra.c
index 36b66fa..9cf46b8 100644
--- a/subversion/bindings/swig/python/svn_ra.c
+++ b/subversion/bindings/swig/python/svn_ra.c
@@ -8,13 +8,15 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+
+
 
 #ifndef SWIGPYTHON
 #define SWIGPYTHON
 #endif
 
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#define SWIG_PYTHON_CLASSIC
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -3093,60 +3095,62 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #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_delta_editor_t swig_types[112]
-#define SWIGTYPE_p_svn_delta_path_driver_state_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_desc3_t 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_ra_callbacks2_t swig_types[139]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[140]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[141]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[142]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[143]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[144]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[145]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[146]
-#define SWIGTYPE_p_svn_stream_t swig_types[147]
-#define SWIGTYPE_p_svn_string_t swig_types[148]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[149]
-#define SWIGTYPE_p_svn_tristate_t swig_types[150]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[151]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[152]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[153]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[154]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[155]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[156]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[157]
-#define SWIGTYPE_p_svn_version_t swig_types[158]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[159]
-#define SWIGTYPE_p_unsigned_long swig_types[160]
-#define SWIGTYPE_p_void swig_types[161]
-static swig_type_info *swig_types[163];
-static swig_module_info swig_module = {swig_types, 162, 0, 0, 0, 0};
+#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[110]
+#define SWIGTYPE_p_svn_client_conflict_option_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_delta_editor_t swig_types[114]
+#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[115]
+#define SWIGTYPE_p_svn_depth_t swig_types[116]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[117]
+#define SWIGTYPE_p_svn_dirent_t swig_types[118]
+#define SWIGTYPE_p_svn_errno_t swig_types[119]
+#define SWIGTYPE_p_svn_error_t swig_types[120]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[121]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[122]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[123]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[124]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[125]
+#define SWIGTYPE_p_svn_lock_t swig_types[126]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[127]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[128]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[129]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[130]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[131]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[132]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[133]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[134]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[135]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[136]
+#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[137]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[138]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[139]
+#define SWIGTYPE_p_svn_prop_kind swig_types[140]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[141]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[142]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[143]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[144]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[145]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[146]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[147]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[148]
+#define SWIGTYPE_p_svn_stream_t swig_types[149]
+#define SWIGTYPE_p_svn_string_t swig_types[150]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[151]
+#define SWIGTYPE_p_svn_tristate_t swig_types[152]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[153]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[154]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[155]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[156]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[157]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[158]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[159]
+#define SWIGTYPE_p_svn_version_t swig_types[160]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[161]
+#define SWIGTYPE_p_unsigned_long swig_types[162]
+#define SWIGTYPE_p_void swig_types[163]
+static swig_type_info *swig_types[165];
+static swig_module_info swig_module = {swig_types, 164, 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)
 
@@ -3157,6 +3161,12 @@ static swig_module_info swig_module = {swig_types, 162, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
 
 /*-----------------------------------------------
               @(target):= _ra.so
@@ -3183,6 +3193,7 @@ static swig_module_info swig_module = {swig_types, 162, 0, 0, 0, 0};
 
 
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 
 
 static PyObject * _global_py_pool = NULL;
@@ -3886,7 +3897,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_version(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_ra_version")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_version",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3910,7 +3921,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_set_path_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_set_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_set_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3937,7 +3948,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_set_path_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_set_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_set_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -3959,7 +3970,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_delete_path_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_delete_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_delete_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -3986,7 +3997,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_delete_path_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_delete_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_delete_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4008,7 +4019,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_link_path_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_link_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_link_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4035,7 +4046,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_link_path_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_link_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_link_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4057,7 +4068,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_finish_report_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_finish_report_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_finish_report_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4084,7 +4095,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_finish_report_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_finish_report_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_finish_report_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4106,7 +4117,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_abort_report_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_abort_report_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_abort_report_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4133,7 +4144,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_abort_report_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_abort_report_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_t_abort_report_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4152,7 +4163,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_reporter3_t(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   struct svn_ra_reporter3_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_ra_reporter3_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_ra_reporter3_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4174,7 +4185,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_reporter3_t(PyObject *SWIGUNUSEDPARM(se
   struct svn_ra_reporter3_t *arg1 = (struct svn_ra_reporter3_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_reporter3_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_ra_reporter3_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4198,7 +4209,7 @@ fail:
 
 SWIGINTERN PyObject *svn_ra_reporter3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_ra_reporter3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4210,7 +4221,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_set_path_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_set_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_set_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4237,7 +4248,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_set_path_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_set_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_set_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4259,7 +4270,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_delete_path_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_delete_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_delete_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4286,7 +4297,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_delete_path_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_delete_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_delete_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4308,7 +4319,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_link_path_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_link_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_link_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4335,7 +4346,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_link_path_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_link_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_link_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4357,7 +4368,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_finish_report_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_finish_report_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_finish_report_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4384,7 +4395,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_finish_report_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_finish_report_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_finish_report_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4406,7 +4417,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_abort_report_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_abort_report_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_abort_report_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4433,7 +4444,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_abort_report_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_abort_report_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_t_abort_report_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4452,7 +4463,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_reporter2_t(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   struct svn_ra_reporter2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_ra_reporter2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_ra_reporter2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4474,7 +4485,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_reporter2_t(PyObject *SWIGUNUSEDPARM(se
   struct svn_ra_reporter2_t *arg1 = (struct svn_ra_reporter2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_reporter2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_ra_reporter2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4498,7 +4509,7 @@ fail:
 
 SWIGINTERN PyObject *svn_ra_reporter2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_ra_reporter2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4510,7 +4521,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_set_path_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_set_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_set_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4537,7 +4548,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_set_path_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_set_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_set_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4559,7 +4570,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_delete_path_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_delete_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_delete_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4586,7 +4597,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_delete_path_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_delete_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_delete_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4608,7 +4619,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_link_path_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_link_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_link_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4635,7 +4646,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_link_path_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_link_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_link_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4657,7 +4668,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_finish_report_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_finish_report_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_finish_report_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4684,7 +4695,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_finish_report_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_finish_report_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_finish_report_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4706,7 +4717,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_abort_report_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_abort_report_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_abort_report_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -4733,7 +4744,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_abort_report_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_abort_report_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_t_abort_report_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4752,7 +4763,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_reporter_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_ra_reporter_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_ra_reporter_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_ra_reporter_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -4774,7 +4785,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_reporter_t(PyObject *SWIGUNUSEDPARM(sel
   struct svn_ra_reporter_t *arg1 = (struct svn_ra_reporter_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_reporter_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_ra_reporter_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -4798,7 +4809,7 @@ fail:
 
 SWIGINTERN PyObject *svn_ra_reporter_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_ra_reporter_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4810,7 +4821,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_open_tmp_file_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_open_tmp_file_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_open_tmp_file_set",2,2,&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()) {
@@ -4837,7 +4848,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_open_tmp_file_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(apr_file_t **,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_open_tmp_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_open_tmp_file_get",1,1,&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()) {
@@ -4859,7 +4870,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_auth_baton_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_auth_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_auth_baton_set",2,2,&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()) {
@@ -4886,7 +4897,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_auth_baton_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_auth_baton_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_auth_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_auth_baton_get",1,1,&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()) {
@@ -4909,7 +4920,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_prop_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_get_wc_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_get_wc_prop_set",2,2,&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()) {
@@ -4938,7 +4949,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_prop_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_ra_get_wc_prop_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_get_wc_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_get_wc_prop_get",1,1,&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()) {
@@ -4979,7 +4990,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_set_wc_prop_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_set_wc_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_set_wc_prop_set",2,2,&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()) {
@@ -5008,7 +5019,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_set_wc_prop_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_ra_set_wc_prop_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_set_wc_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_set_wc_prop_get",1,1,&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()) {
@@ -5049,7 +5060,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_push_wc_prop_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_push_wc_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_push_wc_prop_set",2,2,&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()) {
@@ -5078,7 +5089,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_push_wc_prop_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_ra_push_wc_prop_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_push_wc_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_push_wc_prop_get",1,1,&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()) {
@@ -5119,7 +5130,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_invalidate_wc_props_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_invalidate_wc_props_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_invalidate_wc_props_set",2,2,&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()) {
@@ -5148,7 +5159,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_invalidate_wc_props_get(PyObject
   PyObject * obj0 = 0 ;
   svn_ra_invalidate_wc_props_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_invalidate_wc_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_invalidate_wc_props_get",1,1,&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()) {
@@ -5189,7 +5200,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_func_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_progress_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_progress_func_set",2,2,&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()) {
@@ -5218,7 +5229,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_func_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_ra_progress_notify_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_progress_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_progress_func_get",1,1,&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()) {
@@ -5259,7 +5270,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_baton_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_progress_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_progress_baton_set",2,2,&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()) {
@@ -5288,7 +5299,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_baton_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_progress_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_progress_baton_get",1,1,&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()) {
@@ -5334,7 +5345,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_cancel_func_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_cancel_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_cancel_func_set",2,2,&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()) {
@@ -5363,7 +5374,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_cancel_func_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_cancel_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_cancel_func_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_cancel_func_get",1,1,&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()) {
@@ -5404,7 +5415,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_client_string_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_get_client_string_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_get_client_string_set",2,2,&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()) {
@@ -5433,7 +5444,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_client_string_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_ra_get_client_string_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_get_client_string_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_get_client_string_get",1,1,&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()) {
@@ -5474,7 +5485,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_contents_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_get_wc_contents_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_get_wc_contents_set",2,2,&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()) {
@@ -5503,7 +5514,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_contents_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_ra_get_wc_contents_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_get_wc_contents_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_get_wc_contents_get",1,1,&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()) {
@@ -5544,7 +5555,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_check_tunnel_func_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_check_tunnel_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_check_tunnel_func_set",2,2,&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()) {
@@ -5573,7 +5584,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_check_tunnel_func_get(PyObject *S
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_check_tunnel_func_get",1,1,&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()) {
@@ -5614,7 +5625,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_open_tunnel_func_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_open_tunnel_func_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_open_tunnel_func_set",2,2,&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()) {
@@ -5643,7 +5654,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_open_tunnel_func_get(PyObject *SW
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_open_tunnel_func_get",1,1,&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()) {
@@ -5684,7 +5695,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_tunnel_baton_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_tunnel_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_tunnel_baton_set",2,2,&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()) {
@@ -5713,7 +5724,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_tunnel_baton_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   void *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_tunnel_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_t_tunnel_baton_get",1,1,&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()) {
@@ -5756,7 +5767,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_callbacks2_t(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   struct svn_ra_callbacks2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_ra_callbacks2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_ra_callbacks2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -5778,7 +5789,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_callbacks2_t(PyObject *SWIGUNUSEDPARM(s
   struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_callbacks2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_ra_callbacks2_t",1,1,&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()) {
@@ -5802,7 +5813,7 @@ fail:
 
 SWIGINTERN PyObject *svn_ra_callbacks2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_ra_callbacks2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5814,7 +5825,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_open_tmp_file_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_open_tmp_file_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_open_tmp_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5841,7 +5852,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_open_tmp_file_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(apr_file_t **,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_open_tmp_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_open_tmp_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5863,7 +5874,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_auth_baton_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_auth_baton_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_auth_baton_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5890,7 +5901,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_auth_baton_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_auth_baton_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_auth_baton_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_auth_baton_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5913,7 +5924,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_get_wc_prop_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_get_wc_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_get_wc_prop_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5942,7 +5953,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_get_wc_prop_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_ra_get_wc_prop_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_get_wc_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_get_wc_prop_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5983,7 +5994,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_set_wc_prop_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_set_wc_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_set_wc_prop_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6012,7 +6023,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_set_wc_prop_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_ra_set_wc_prop_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_set_wc_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_set_wc_prop_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6053,7 +6064,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_push_wc_prop_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_push_wc_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_push_wc_prop_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6082,7 +6093,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_push_wc_prop_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_ra_push_wc_prop_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_push_wc_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_push_wc_prop_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6123,7 +6134,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_invalidate_wc_props_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_invalidate_wc_props_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_invalidate_wc_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6152,7 +6163,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_invalidate_wc_props_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_ra_invalidate_wc_props_func_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_invalidate_wc_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_t_invalidate_wc_props_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6190,7 +6201,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_callbacks_t(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   struct svn_ra_callbacks_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_ra_callbacks_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_ra_callbacks_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -6212,7 +6223,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_callbacks_t(PyObject *SWIGUNUSEDPARM(se
   struct svn_ra_callbacks_t *arg1 = (struct svn_ra_callbacks_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_callbacks_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_ra_callbacks_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6236,7 +6247,7 @@ fail:
 
 SWIGINTERN PyObject *svn_ra_callbacks_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_ra_callbacks_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6253,7 +6264,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_initialize(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_ra_initialize",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_initialize",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6308,7 +6319,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_create_callbacks(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_ra_create_callbacks",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_create_callbacks",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6354,6 +6365,137 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_ra_open5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_ra_session_t **arg1 = (svn_ra_session_t **) 0 ;
+  char **arg2 = (char **) 0 ;
+  char **arg3 = (char **) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  svn_ra_callbacks2_t *arg6 = (svn_ra_callbacks2_t *) 0 ;
+  void *arg7 = (void *) 0 ;
+  apr_hash_t *arg8 = (apr_hash_t *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_ra_session_t *temp1 ;
+  char *temp2 ;
+  char *temp3 ;
+  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;
+  arg9 = _global_pool;
+  arg1 = &temp1;
+  arg2 = &temp2;
+  arg3 = &temp3;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_open5",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_ra_open5", "repos_URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_open5", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    svn_swig_py_setup_ra_callbacks(&arg6, &arg7, obj2, _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;
+    }
+    
+    arg8 = svn_swig_py_struct_ptr_hash_from_dict(obj3,
+      SWIGTYPE_p_svn_config_t, _global_pool);
+    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;
+    }
+  }
+  {
+    if (!arg6) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_ra_open5(arg1,(char const **)arg2,(char const **)arg3,(char const *)arg4,(char const *)arg5,(struct svn_ra_callbacks2_t const *)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_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_session_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    PyObject *s;
+    if (*arg2 == NULL) {
+      Py_INCREF(Py_None);
+      s = Py_None;
+    }
+    else {
+      s = PyBytes_FromString(*arg2);
+      if (s == NULL)
+      SWIG_fail;
+    }
+    resultobj = SWIG_Python_AppendOutput(resultobj, s);
+  }
+  {
+    PyObject *s;
+    if (*arg3 == NULL) {
+      Py_INCREF(Py_None);
+      s = Py_None;
+    }
+    else {
+      s = PyBytes_FromString(*arg3);
+      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_ra_open4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_ra_session_t **arg1 = (svn_ra_session_t **) 0 ;
@@ -6368,6 +6510,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_open4(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *_global_py_pool = NULL ;
   svn_ra_session_t *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -6379,7 +6523,15 @@ SWIGINTERN PyObject *_wrap_svn_ra_open4(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg8 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_ra_open4",&arg3,&arg4,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_open4",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_ra_open4", "repos_URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_open4", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_setup_ra_callbacks(&arg5, &arg6, obj2, _global_pool);
   }
@@ -6441,7 +6593,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_open4(PyObject *SWIGUNUSEDPARM(self), PyObject
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -6471,6 +6623,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_open3(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_ra_session_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -6481,7 +6635,15 @@ SWIGINTERN PyObject *_wrap_svn_ra_open3(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_ra_open3",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_open3",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_ra_open3", "repos_URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_open3", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_setup_ra_callbacks(&arg4, &arg5, obj2, _global_pool);
   }
@@ -6559,6 +6721,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_open2(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_ra_session_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -6569,7 +6732,11 @@ SWIGINTERN PyObject *_wrap_svn_ra_open2(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_ra_open2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_open2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_ra_open2", "repos_URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_setup_ra_callbacks(&arg3, &arg4, obj1, _global_pool);
   }
@@ -6647,6 +6814,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_open(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_ra_session_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -6658,7 +6826,11 @@ SWIGINTERN PyObject *_wrap_svn_ra_open(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_ra_open",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_open",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_ra_open", "repos_URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -6739,6 +6911,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reparent(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
   
@@ -6746,13 +6919,17 @@ SWIGINTERN PyObject *_wrap_svn_ra_reparent(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_reparent",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reparent",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_reparent", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -6809,7 +6986,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_session_url(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_session_url",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_session_url",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -6850,7 +7027,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_session_url(PyObject *SWIGUNUSEDPARM(self)
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -6878,6 +7055,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_path_relative_to_session(PyObject *SWIGUNU
   PyObject *_global_py_pool = NULL ;
   char *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -6886,13 +7064,17 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_path_relative_to_session(PyObject *SWIGUNU
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_path_relative_to_session",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_path_relative_to_session",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_path_relative_to_session", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -6927,7 +7109,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_path_relative_to_session(PyObject *SWIGUNU
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -6955,6 +7137,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_path_relative_to_root(PyObject *SWIGUNUSED
   PyObject *_global_py_pool = NULL ;
   char *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -6963,13 +7146,17 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_path_relative_to_root(PyObject *SWIGUNUSED
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_path_relative_to_root",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_path_relative_to_root",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_path_relative_to_root", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -7004,7 +7191,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_path_relative_to_root(PyObject *SWIGUNUSED
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -7040,7 +7227,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_latest_revnum(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_latest_revnum",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_latest_revnum",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7112,7 +7299,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dated_revision(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_get_dated_revision",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_dated_revision",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7178,6 +7365,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
   svn_string_t value5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -7187,7 +7375,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_ra_change_rev_prop2",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_change_rev_prop2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7201,6 +7389,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_change_rev_prop2", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     SWIG_exception(SWIG_ValueError, "svn_ra_change_rev_prop2 is not implemented yet");
     
   }
@@ -7208,12 +7400,16 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -7249,9 +7445,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
     if (*arg4 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg4)->data, (*arg4)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg4)->data, (*arg4)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -7281,6 +7476,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop(PyObject *SWIGUNUSEDPARM(self)
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -7289,7 +7485,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_ra_change_rev_prop",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_change_rev_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7303,15 +7499,23 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_change_rev_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -7373,7 +7577,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_rev_proplist(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg4 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_rev_proplist",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_rev_proplist",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7440,6 +7644,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_rev_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
   svn_string_t *temp4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -7448,7 +7653,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_rev_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_ra_rev_prop",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_rev_prop",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7461,6 +7666,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_rev_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
       SWIG_fail;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_rev_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -7493,9 +7702,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_rev_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
     if (*arg4 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg4)->data, (*arg4)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg4)->data, (*arg4)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -7542,7 +7750,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor3(PyObject *SWIGUNUSEDPARM(se
   arg9 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_ra_get_commit_editor3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_commit_editor3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7643,6 +7851,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor2(PyObject *SWIGUNUSEDPARM(se
   svn_delta_editor_t *temp2 ;
   void *temp3 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -7655,7 +7864,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor2(PyObject *SWIGUNUSEDPARM(se
   arg9 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_ra_get_commit_editor2",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_commit_editor2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7663,6 +7872,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_commit_editor2", "log_msg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = svn_swig_py_commit_callback2;
     arg6 = (void *)obj2;
   }
@@ -7743,6 +7956,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor(PyObject *SWIGUNUSEDPARM(sel
   svn_delta_editor_t *temp2 ;
   void *temp3 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -7755,7 +7969,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor(PyObject *SWIGUNUSEDPARM(sel
   arg9 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_ra_get_commit_editor",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_commit_editor",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7763,6 +7977,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_commit_editor", "log_msg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = svn_swig_py_commit_callback;
     arg6 = (void *)obj2;
   }
@@ -7842,6 +8060,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file(PyObject *SWIGUNUSEDPARM(self), PyObj
   int res5 = SWIG_TMPOBJ ;
   apr_hash_t *temp6 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -7853,7 +8072,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg7 = _global_pool;
   arg5 = &temp5;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_ra_get_file",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_file",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7861,6 +8080,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -7942,6 +8165,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dir2(PyObject *SWIGUNUSEDPARM(self), PyObj
   int res3 = SWIG_TMPOBJ ;
   apr_hash_t *temp4 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -7954,7 +8178,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dir2(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_ra_get_dir2",&obj0,&arg5,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_dir2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7962,6 +8186,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dir2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_dir2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -8046,6 +8274,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dir(PyObject *SWIGUNUSEDPARM(self), PyObje
   int res5 = SWIG_TMPOBJ ;
   apr_hash_t *temp6 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -8057,7 +8286,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dir(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg4 = &temp4;
   arg5 = &temp5;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_ra_get_dir",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_dir",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8065,6 +8294,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dir(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_dir", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -8141,6 +8374,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_list(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -8154,7 +8388,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_list(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOO|O:svn_ra_list",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_list",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8162,6 +8396,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_list(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_list", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -8263,7 +8501,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_mergeinfo(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg7 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_ra_get_mergeinfo",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_mergeinfo",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8368,6 +8606,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update3(PyObject *SWIGUNUSEDPARM(self), PyO
   void *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -8387,7 +8626,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update3(PyObject *SWIGUNUSEDPARM(self), PyO
   arg12 = _global_pool;
   arg2 = &temp2;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_update3",8,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8401,6 +8640,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_update3", "update_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -8515,6 +8758,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update2(PyObject *SWIGUNUSEDPARM(self), PyO
   void *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -8528,7 +8772,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg10 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOOO|O:svn_ra_do_update2",&obj0,&obj1,&arg5,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_update2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8542,6 +8786,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_update2", "update_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -8635,6 +8883,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update(PyObject *SWIGUNUSEDPARM(self), PyOb
   void *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -8647,7 +8896,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg9 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_ra_do_update",&obj0,&obj1,&arg5,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_update",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8661,6 +8910,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_update", "update_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -8752,7 +9005,9 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch3(PyObject *SWIGUNUSEDPARM(self), PyO
   void *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -8771,7 +9026,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch3(PyObject *SWIGUNUSEDPARM(self), PyO
   arg13 = _global_pool;
   arg2 = &temp2;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_switch3",9,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8785,12 +9040,20 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_switch3", "switch_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_ra_do_switch3", "switch_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -8899,7 +9162,9 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch2(PyObject *SWIGUNUSEDPARM(self), PyO
   void *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -8911,7 +9176,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg10 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOsOO|O:svn_ra_do_switch2",&obj0,&obj1,&arg5,&obj3,&arg7,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_switch2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8925,12 +9190,20 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_switch2", "switch_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_ra_do_switch2", "switch_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -9013,7 +9286,9 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch(PyObject *SWIGUNUSEDPARM(self), PyOb
   void *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -9025,7 +9300,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg10 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOsOO|O:svn_ra_do_switch",&obj0,&obj1,&arg5,&obj3,&arg7,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_switch",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9039,12 +9314,20 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_switch", "switch_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_ra_do_switch", "switch_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -9125,6 +9408,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status2(PyObject *SWIGUNUSEDPARM(self), PyO
   svn_ra_reporter3_t *temp2 ;
   void *temp3 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -9138,7 +9422,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg9 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_ra_do_status2",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_status2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9146,6 +9430,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_do_status2", "status_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -9238,6 +9526,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status(PyObject *SWIGUNUSEDPARM(self), PyOb
   svn_ra_reporter2_t *temp2 ;
   void *temp3 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -9251,7 +9540,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg9 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_ra_do_status",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_status",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9259,6 +9548,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_do_status", "status_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -9355,9 +9648,11 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff3(PyObject *SWIGUNUSEDPARM(self), PyObj
   void *temp3 ;
   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 ;
@@ -9369,7 +9664,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff3(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg12 = _global_pool;
   arg2 = &temp2;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_diff3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9383,6 +9678,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff3(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_diff3", "diff_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -9401,6 +9700,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff3(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_ra_do_diff3", "versus_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -9485,9 +9788,11 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff2(PyObject *SWIGUNUSEDPARM(self), PyObj
   void *temp3 ;
   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 ;
@@ -9499,7 +9804,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff2(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg12 = _global_pool;
   arg2 = &temp2;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_diff2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9513,6 +9818,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_diff2", "diff_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -9531,6 +9840,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_ra_do_diff2", "versus_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -9614,8 +9927,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff(PyObject *SWIGUNUSEDPARM(self), PyObje
   void *temp3 ;
   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 ;
@@ -9627,7 +9942,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg11 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOsOO|O:svn_ra_do_diff",&obj0,&obj1,&arg5,&obj3,&obj4,&arg8,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_do_diff",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9641,6 +9956,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_do_diff", "diff_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -9653,6 +9972,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg8 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_ra_do_diff", "versus_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -9750,7 +10073,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_log2(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_log2",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9883,7 +10206,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_log(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_log",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9984,6 +10307,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_check_path(PyObject *SWIGUNUSEDPARM(self), PyO
   svn_node_kind_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -9993,7 +10317,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_check_path(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg5 = _global_pool;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_ra_check_path",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_check_path",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10001,6 +10325,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_check_path(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_check_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -10062,6 +10390,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_stat(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *_global_py_pool = NULL ;
   svn_dirent_t *temp4 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -10071,7 +10400,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_stat(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_ra_stat",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_stat",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10079,6 +10408,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_stat(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_stat", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -10146,7 +10479,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_uuid2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_uuid2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_uuid2",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10187,7 +10520,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_uuid2(PyObject *SWIGUNUSEDPARM(self), PyOb
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -10222,7 +10555,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_uuid",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_uuid",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10263,7 +10596,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -10298,7 +10631,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_repos_root2(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_repos_root2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_repos_root2",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10339,7 +10672,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_repos_root2(PyObject *SWIGUNUSEDPARM(self)
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -10374,7 +10707,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_repos_root(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_repos_root",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_repos_root",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10415,7 +10748,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_repos_root(PyObject *SWIGUNUSEDPARM(self),
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -10445,6 +10778,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locations(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -10455,7 +10789,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locations(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_ra_get_locations",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_locations",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10463,6 +10797,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locations(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_locations", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -10532,6 +10870,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_location_segments(PyObject *SWIGUNUSEDPARM
   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 ;
@@ -10543,7 +10882,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_location_segments(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_ra_get_location_segments",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_location_segments",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10551,6 +10890,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_location_segments(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_location_segments", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -10624,6 +10967,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -10636,7 +10980,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_file_revs2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10644,6 +10988,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_file_revs2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -10728,6 +11076,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -10738,7 +11087,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_ra_get_file_revs",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_file_revs",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10746,6 +11095,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_file_revs", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -10813,6 +11166,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -10822,7 +11176,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOzOO|O:svn_ra_lock",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_lock",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10833,6 +11187,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
     arg2 = svn_swig_py_path_revs_hash_from_dict(obj1, _global_pool);
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_ra_lock", "comment");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -10902,7 +11260,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_unlock(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_ra_unlock",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_unlock",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10971,6 +11329,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *_global_py_pool = NULL ;
   svn_lock_t *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -10979,13 +11338,17 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_lock",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_lock",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_lock", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11042,6 +11405,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -11051,7 +11415,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_ra_get_locks2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_locks2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11059,6 +11423,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_locks2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -11122,6 +11490,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locks(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11130,13 +11499,17 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locks(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_locks",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_locks",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_locks", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11213,7 +11586,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_replay_range(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_replay_range",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11331,7 +11704,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_replay(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_ra_replay",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_replay",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11422,6 +11795,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_deleted_rev(PyObject *SWIGUNUSEDPARM(self)
   svn_revnum_t temp5 ;
   int res5 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -11432,7 +11806,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_deleted_rev(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg6 = _global_pool;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_ra_get_deleted_rev",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_deleted_rev",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11440,6 +11814,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_deleted_rev(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_deleted_rev", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -11508,6 +11886,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_inherited_props(PyObject *SWIGUNUSEDPARM(s
   PyObject *_global_py_pool = NULL ;
   apr_array_header_t *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -11522,7 +11901,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_inherited_props(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|OO:svn_ra_get_inherited_props",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_inherited_props",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11530,6 +11909,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_inherited_props(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_inherited_props", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -11602,6 +11985,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_has_capability(PyObject *SWIGUNUSEDPARM(self),
   svn_boolean_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11610,13 +11994,17 @@ SWIGINTERN PyObject *_wrap_svn_ra_has_capability(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_has_capability",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_has_capability",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_has_capability", "capability");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11676,16 +12064,22 @@ SWIGINTERN PyObject *_wrap_svn_ra_print_modules(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_print_modules",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_print_modules",1,2,&obj0,&obj1)) SWIG_fail;
   {
-    if (!PyString_Check(obj0)) {
-      PyErr_SetString(PyExc_TypeError, "not a string");
+    if (!PyBytes_Check(obj0)) {
+      PyErr_SetString(PyExc_TypeError, "not a bytes object");
       SWIG_fail;
     }
-    arg1 = svn_stringbuf_ncreate(PyString_AS_STRING(obj0),
-      PyString_GET_SIZE(obj0),
-      /* ### gah... what pool to use? */
-      _global_pool);
+    {
+      Py_ssize_t strBufLen;
+      char *strBufChar;
+      if (-1 == PyBytes_AsStringAndSize(obj0, &strBufChar, &strBufLen)) {
+        SWIG_fail;
+      }
+      arg1 = svn_stringbuf_ncreate(strBufChar, strBufLen,
+        /* ### gah... what pool to use? */
+        _global_pool);
+    }
   }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -11743,7 +12137,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_print_ra_libraries(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_print_ra_libraries",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_print_ra_libraries",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -11784,9 +12178,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_print_ra_libraries(PyObject *SWIGUNUSEDPARM(se
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -11809,8 +12202,9 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_name_set(PyObject *SWIGUNUSEDPARM(sel
   struct svn_ra_plugin_t *arg1 = (struct svn_ra_plugin_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_ra_plugin_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11818,6 +12212,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_name_set(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_plugin_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -11838,7 +12236,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_name_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11858,8 +12256,9 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_description_set(PyObject *SWIGUNUSEDP
   struct svn_ra_plugin_t *arg1 = (struct svn_ra_plugin_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_ra_plugin_t_description_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_description_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11867,6 +12266,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_description_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_plugin_t_description_set", "description");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->description) free((char *)arg1->description);
@@ -11887,7 +12290,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_description_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_description_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_description_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11909,7 +12312,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_open_set(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_open_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_open_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11936,7 +12339,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_open_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_open_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_open_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11958,7 +12361,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_latest_revnum_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_latest_revnum_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_latest_revnum_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11985,7 +12388,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_latest_revnum_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_revnum_t *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_latest_revnum_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_latest_revnum_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12007,7 +12410,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_dated_revision_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_dated_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_dated_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12034,7 +12437,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_dated_revision_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_dated_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_dated_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12056,7 +12459,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_change_rev_prop_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_change_rev_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_change_rev_prop_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12083,7 +12486,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_change_rev_prop_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_change_rev_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_change_rev_prop_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12105,7 +12508,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_rev_proplist_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_rev_proplist_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_rev_proplist_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12132,7 +12535,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_rev_proplist_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_rev_proplist_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_rev_proplist_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12154,7 +12557,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_rev_prop_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_rev_prop_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_rev_prop_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12181,7 +12584,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_rev_prop_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_rev_prop_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_rev_prop_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12203,7 +12606,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_commit_editor_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_commit_editor_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_commit_editor_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12230,7 +12633,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_commit_editor_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_commit_editor_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_commit_editor_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12252,7 +12655,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_file_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_file_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12279,7 +12682,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_file_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12301,7 +12704,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_dir_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_dir_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_dir_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12328,7 +12731,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_dir_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_dir_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_dir_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12350,7 +12753,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_update_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_do_update_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_do_update_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12377,7 +12780,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_update_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_do_update_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_do_update_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12399,7 +12802,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_switch_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_do_switch_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_do_switch_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12426,7 +12829,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_switch_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_do_switch_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_do_switch_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12448,7 +12851,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_status_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_do_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_do_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12475,7 +12878,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_status_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_do_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_do_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12497,7 +12900,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_diff_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_do_diff_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_do_diff_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12524,7 +12927,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_diff_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(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 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_do_diff_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_do_diff_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12546,7 +12949,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_log_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_log_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_log_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12573,7 +12976,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_log_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(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 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_log_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_log_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12595,7 +12998,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_check_path_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_check_path_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_check_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12622,7 +13025,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_check_path_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_check_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_check_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12644,7 +13047,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_uuid_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_uuid_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_uuid_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12671,7 +13074,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_uuid_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const **,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_uuid_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_uuid_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12693,7 +13096,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_repos_root_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_repos_root_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_repos_root_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12720,7 +13123,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_repos_root_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const **,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_repos_root_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_repos_root_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12742,7 +13145,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_locations_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_locations_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_locations_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12769,7 +13172,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_locations_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_locations_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_locations_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12791,7 +13194,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_file_revs_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_file_revs_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_file_revs_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12818,7 +13221,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_file_revs_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_file_revs_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_file_revs_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12840,7 +13243,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_version_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_version_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_version_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12867,7 +13270,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_version_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_version_t *(*result)(void) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_version_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_t_get_version_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12886,7 +13289,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_plugin_t(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   struct svn_ra_plugin_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_ra_plugin_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_ra_plugin_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -12908,7 +13311,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_plugin_t(PyObject *SWIGUNUSEDPARM(self)
   struct svn_ra_plugin_t *arg1 = (struct svn_ra_plugin_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_plugin_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_ra_plugin_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12932,7 +13335,7 @@ fail:
 
 SWIGINTERN PyObject *svn_ra_plugin_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_ra_plugin_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -12952,7 +13355,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_init_ra_libs(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_ra_init_ra_libs",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_init_ra_libs",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -13008,6 +13411,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_ra_library(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   svn_ra_plugin_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -13016,7 +13420,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_ra_library(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_ra_library",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_get_ra_library",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -13025,6 +13429,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_ra_library(PyObject *SWIGUNUSEDPARM(self),
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_get_ra_library", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -13072,7 +13480,7 @@ fail:
 
 SWIGINTERN PyObject *svn_ra_session_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_ra_session_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -13091,9 +13499,11 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_set_path(PyObject *SWIGUNUSED
   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 ;
   svn_error_t *result = 0 ;
   
@@ -13101,7 +13511,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_set_path(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_invoke_set_path",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13117,6 +13527,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_set_path(PyObject *SWIGUNUSED
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter3_invoke_set_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -13134,6 +13548,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_set_path(PyObject *SWIGUNUSED
       SWIG_fail;
     }
   }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_ra_reporter3_invoke_set_path", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
     if (obj7 != Py_None && obj7 != _global_py_pool) {
@@ -13183,6 +13601,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_delete_path(PyObject *SWIGUNU
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -13190,7 +13609,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_delete_path(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_ra_reporter3_invoke_delete_path",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_invoke_delete_path",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13205,6 +13624,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_delete_path(PyObject *SWIGUNU
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter3_invoke_delete_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -13259,9 +13682,12 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_link_path(PyObject *SWIGUNUSE
   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 ;
   svn_error_t *result = 0 ;
   
@@ -13269,7 +13695,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_link_path(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_invoke_link_path",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13285,6 +13711,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_link_path(PyObject *SWIGUNUSE
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter3_invoke_link_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_reporter3_invoke_link_path", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -13302,6 +13736,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_link_path(PyObject *SWIGUNUSE
       SWIG_fail;
     }
   }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_ra_reporter3_invoke_link_path", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj8) {
     /* Verify that the user supplied a valid pool */
     if (obj8 != Py_None && obj8 != _global_py_pool) {
@@ -13357,7 +13795,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_finish_report(PyObject *SWIGU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter3_invoke_finish_report",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_invoke_finish_report",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13427,7 +13865,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_abort_report(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter3_invoke_abort_report",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter3_invoke_abort_report",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13494,8 +13932,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_set_path(PyObject *SWIGUNUSED
   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 ;
   
@@ -13503,7 +13943,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_set_path(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_invoke_set_path",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13519,6 +13959,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_set_path(PyObject *SWIGUNUSED
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter2_invoke_set_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -13530,6 +13974,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_set_path(PyObject *SWIGUNUSED
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_ra_reporter2_invoke_set_path", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
     if (obj6 != Py_None && obj6 != _global_py_pool) {
@@ -13579,6 +14027,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_delete_path(PyObject *SWIGUNU
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -13586,7 +14035,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_delete_path(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_ra_reporter2_invoke_delete_path",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_invoke_delete_path",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13601,6 +14050,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_delete_path(PyObject *SWIGUNU
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter2_invoke_delete_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -13654,8 +14107,11 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_link_path(PyObject *SWIGUNUSE
   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 ;
   svn_error_t *result = 0 ;
   
@@ -13663,7 +14119,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_link_path(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_invoke_link_path",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13679,6 +14135,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_link_path(PyObject *SWIGUNUSE
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter2_invoke_link_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_reporter2_invoke_link_path", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -13690,6 +14154,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_link_path(PyObject *SWIGUNUSE
       SWIG_fail;
     }
   }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_ra_reporter2_invoke_link_path", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
     if (obj7 != Py_None && obj7 != _global_py_pool) {
@@ -13745,7 +14213,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_finish_report(PyObject *SWIGU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter2_invoke_finish_report",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_invoke_finish_report",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13815,7 +14283,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_abort_report(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter2_invoke_abort_report",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter2_invoke_abort_report",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13881,6 +14349,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_set_path(PyObject *SWIGUNUSEDP
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -13890,7 +14359,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_set_path(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_ra_reporter_invoke_set_path",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_invoke_set_path",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13906,6 +14375,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_set_path(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter_invoke_set_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -13966,6 +14439,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_delete_path(PyObject *SWIGUNUS
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -13973,7 +14447,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_delete_path(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_ra_reporter_invoke_delete_path",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_invoke_delete_path",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13988,6 +14462,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_delete_path(PyObject *SWIGUNUS
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter_invoke_delete_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -14040,6 +14518,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_link_path(PyObject *SWIGUNUSED
   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 ;
@@ -14049,7 +14529,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_link_path(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_invoke_link_path",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14065,6 +14545,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_link_path(PyObject *SWIGUNUSED
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_reporter_invoke_link_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_reporter_invoke_link_path", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -14131,7 +14619,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_finish_report(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter_invoke_finish_report",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_invoke_finish_report",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14201,7 +14689,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_abort_report(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter_invoke_abort_report",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_reporter_invoke_abort_report",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14274,7 +14762,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_invoke_open_tmp_file(PyObject *SWIG
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_callbacks2_invoke_open_tmp_file",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks2_invoke_open_tmp_file",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14353,7 +14841,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_invoke_open_tmp_file(PyObject *SWIGU
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_callbacks_invoke_open_tmp_file",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_callbacks_invoke_open_tmp_file",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14426,6 +14914,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_open(PyObject *SWIGUNUSEDPARM(se
   PyObject *_global_py_pool = NULL ;
   void *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -14437,7 +14926,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_open(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg7 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_ra_plugin_invoke_open",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_open",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14445,6 +14934,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_open(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_ra_plugin_invoke_open", "repos_URL");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -14536,7 +15029,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_latest_revnum(PyObject *SWIG
   SWIG_fail;
   arg4 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_plugin_invoke_get_latest_revnum",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_latest_revnum",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14618,7 +15111,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_dated_revision(PyObject *SWI
   SWIG_fail;
   arg5 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_ra_plugin_invoke_get_dated_revision",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_dated_revision",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14693,6 +15186,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_change_rev_prop(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -14701,7 +15195,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_change_rev_prop(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_change_rev_prop",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14723,15 +15217,23 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_change_rev_prop(PyObject *SWIGUN
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_plugin_invoke_change_rev_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -14795,7 +15297,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_rev_proplist(PyObject *SWIGUNUSE
   SWIG_fail;
   arg5 = _global_pool;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_ra_plugin_invoke_rev_proplist",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_rev_proplist",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14872,6 +15374,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_rev_prop(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -14880,7 +15383,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_rev_prop(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg6 = _global_pool;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOOs|O:svn_ra_plugin_invoke_rev_prop",&obj0,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_rev_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14901,6 +15404,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_rev_prop(PyObject *SWIGUNUSEDPAR
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_plugin_invoke_rev_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -14933,9 +15440,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_rev_prop(PyObject *SWIGUNUSEDPAR
     if (*arg5 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg5)->data, (*arg5)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg5)->data, (*arg5)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -14969,6 +15475,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_commit_editor(PyObject *SWIG
   void *temp4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -14979,7 +15486,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_commit_editor(PyObject *SWIG
   arg8 = _global_pool;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_ra_plugin_invoke_get_commit_editor",&obj0,&obj1,&arg5,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_commit_editor",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14995,6 +15502,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_commit_editor(PyObject *SWIG
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_plugin_invoke_get_commit_editor", "log_msg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = svn_swig_py_commit_callback;
     arg7 = (void *)obj3;
   }
@@ -15066,6 +15577,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file(PyObject *SWIGUNUSEDPAR
   apr_hash_t *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -15077,7 +15589,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file(PyObject *SWIGUNUSEDPAR
   arg8 = _global_pool;
   arg6 = &temp6;
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_ra_plugin_invoke_get_file",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_file",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15093,6 +15605,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_plugin_invoke_get_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -15175,6 +15691,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_dir(PyObject *SWIGUNUSEDPARM
   apr_hash_t *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -15186,7 +15703,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_dir(PyObject *SWIGUNUSEDPARM
   arg5 = &temp5;
   arg6 = &temp6;
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_ra_plugin_invoke_get_dir",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_dir",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15202,6 +15719,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_dir(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_plugin_invoke_get_dir", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -15283,6 +15804,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_update(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -15295,7 +15817,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_update(PyObject *SWIGUNUSEDPA
   arg10 = _global_pool;
   arg3 = &temp3;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_do_update",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15317,6 +15839,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_update(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_plugin_invoke_do_update", "update_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -15407,7 +15933,9 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_switch(PyObject *SWIGUNUSEDPA
   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 ;
@@ -15419,7 +15947,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_switch(PyObject *SWIGUNUSEDPA
   arg11 = _global_pool;
   arg3 = &temp3;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_do_switch",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15441,12 +15969,20 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_switch(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_plugin_invoke_do_switch", "switch_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
     }
   }
   {
+    arg8 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_ra_plugin_invoke_do_switch", "switch_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -15529,6 +16065,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_status(PyObject *SWIGUNUSEDPA
   void *temp4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -15542,7 +16079,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_status(PyObject *SWIGUNUSEDPA
   arg10 = _global_pool;
   arg3 = &temp3;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_do_status",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15558,6 +16095,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_status(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_plugin_invoke_do_status", "status_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -15655,8 +16196,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_diff(PyObject *SWIGUNUSEDPARM
   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 ;
@@ -15668,7 +16211,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_diff(PyObject *SWIGUNUSEDPARM
   arg12 = _global_pool;
   arg3 = &temp3;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_do_diff",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15690,6 +16233,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_diff(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_plugin_invoke_do_diff", "diff_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -15702,6 +16249,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_diff(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_ra_plugin_invoke_do_diff", "versus_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -15795,7 +16346,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_log(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_log",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15900,6 +16451,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_check_path(PyObject *SWIGUNUSEDP
   int res5 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -15909,7 +16461,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_check_path(PyObject *SWIGUNUSEDP
   SWIG_fail;
   arg6 = _global_pool;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_ra_plugin_invoke_check_path",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_check_path",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15925,6 +16477,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_check_path(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_plugin_invoke_check_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -15994,7 +16550,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_uuid(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg4 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_plugin_invoke_get_uuid",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_uuid",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16043,7 +16599,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_uuid(PyObject *SWIGUNUSEDPAR
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -16080,7 +16636,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_repos_root(PyObject *SWIGUNU
   SWIG_fail;
   arg4 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_plugin_invoke_get_repos_root",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_repos_root",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16129,7 +16685,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_repos_root(PyObject *SWIGUNU
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -16161,6 +16717,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_locations(PyObject *SWIGUNUS
   apr_hash_t *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -16171,7 +16728,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_locations(PyObject *SWIGUNUS
   SWIG_fail;
   arg7 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_ra_plugin_invoke_get_locations",&obj0,&obj1,&arg4,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_locations",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16187,6 +16744,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_locations(PyObject *SWIGUNUS
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_plugin_invoke_get_locations", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -16257,6 +16818,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file_revs(PyObject *SWIGUNUS
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -16267,7 +16829,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file_revs(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_file_revs",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16283,6 +16845,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file_revs(PyObject *SWIGUNUS
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_plugin_invoke_get_file_revs", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -16343,7 +16909,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_version(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_invoke_get_version",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_plugin_invoke_get_version",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16379,6 +16945,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_prop_func(PyObject *SWIGUNUSEDPA
   svn_string_t *temp5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -16387,7 +16955,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_prop_func(PyObject *SWIGUNUSEDPA
   SWIG_fail;
   arg6 = _global_pool;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOss|O:svn_ra_invoke_get_wc_prop_func",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_get_wc_prop_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_ra_get_wc_prop_func_t * tmp =
     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);
@@ -16404,6 +16972,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_prop_func(PyObject *SWIGUNUSEDPA
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_invoke_get_wc_prop_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_invoke_get_wc_prop_func", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -16436,9 +17012,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_prop_func(PyObject *SWIGUNUSEDPA
     if (*arg5 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg5)->data, (*arg5)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg5)->data, (*arg5)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -16469,6 +17044,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_set_wc_prop_func(PyObject *SWIGUNUSEDPA
   svn_string_t value5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -16477,7 +17054,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_set_wc_prop_func(PyObject *SWIGUNUSEDPA
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOssO|O:svn_ra_invoke_set_wc_prop_func",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_set_wc_prop_func",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_ra_set_wc_prop_func_t * tmp =
     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);
@@ -16495,15 +17072,27 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_set_wc_prop_func(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_invoke_set_wc_prop_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_invoke_set_wc_prop_func", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -16559,6 +17148,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_push_wc_prop_func(PyObject *SWIGUNUSEDP
   svn_string_t value5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -16567,7 +17158,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_push_wc_prop_func(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOssO|O:svn_ra_invoke_push_wc_prop_func",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_push_wc_prop_func",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_ra_push_wc_prop_func_t * tmp =
     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);
@@ -16585,15 +17176,27 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_push_wc_prop_func(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_invoke_push_wc_prop_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_invoke_push_wc_prop_func", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -16647,6 +17250,8 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_invalidate_wc_props_func(PyObject *SWIG
   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 ;
   
@@ -16654,7 +17259,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_invalidate_wc_props_func(PyObject *SWIG
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOss|O:svn_ra_invoke_invalidate_wc_props_func",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_invalidate_wc_props_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_ra_invalidate_wc_props_func_t * tmp =
     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);
@@ -16671,6 +17276,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_invalidate_wc_props_func(PyObject *SWIG
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_invoke_invalidate_wc_props_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_invoke_invalidate_wc_props_func", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -16731,7 +17344,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_contents_func(PyObject *SWIGUNUS
   SWIG_fail;
   arg5 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_ra_invoke_get_wc_contents_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_get_wc_contents_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_ra_get_wc_contents_func_t * tmp =
     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);
@@ -16811,7 +17424,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_latest_revnum_func(PyObject *SWIGUN
   svn_error_t *result = 0 ;
   
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_invoke_get_latest_revnum_func",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_get_latest_revnum_func",2,2,&obj0,&obj1)) SWIG_fail;
   {
     svn_ra_get_latest_revnum_func_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t, svn_argnum_obj0);
@@ -16878,7 +17491,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_client_string_func(PyObject *SWIGUN
   SWIG_fail;
   arg4 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_invoke_get_client_string_func",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_get_client_string_func",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_ra_get_client_string_func_t * tmp =
     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);
@@ -16929,7 +17542,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_client_string_func(PyObject *SWIGUN
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -16963,6 +17576,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_file_rev_handler(PyObject *SWIGUNUSEDPA
   void *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -16984,7 +17598,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_file_rev_handler(PyObject *SWIGUNUSEDPA
     if (arg6 == NULL) SWIG_fail;
   }
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_ra_invoke_file_rev_handler",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_file_rev_handler",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_ra_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);
@@ -17002,6 +17616,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_file_rev_handler(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_invoke_file_rev_handler", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -17083,6 +17701,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -17093,7 +17712,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_ra_invoke_lock_callback",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_lock_callback",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_ra_lock_callback_t * tmp =
     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);
@@ -17111,6 +17730,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_invoke_lock_callback", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -17186,7 +17809,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_progress_notify_func(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_ra_invoke_progress_notify_func",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_progress_notify_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_ra_progress_notify_func_t * tmp =
     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);
@@ -17260,7 +17883,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_replay_revstart_callback(PyObject *SWIG
   arg7 = _global_pool;
   arg4 = &temp4;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_ra_invoke_replay_revstart_callback",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_replay_revstart_callback",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_ra_replay_revstart_callback_t * tmp =
     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);
@@ -17364,7 +17987,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_replay_revfinish_callback(PyObject *SWI
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_ra_invoke_replay_revfinish_callback",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_replay_revfinish_callback",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_ra_replay_revfinish_callback_t * tmp =
     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);
@@ -17453,9 +18076,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_check_tunnel_func(PyObject *SWIGUNUSEDP
   char *arg3 = (char *) 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOs:svn_ra_invoke_check_tunnel_func",&obj0,&obj1,&arg3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_check_tunnel_func",3,3,&obj0,&obj1,&obj2)) 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);
@@ -17473,6 +18097,10 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_check_tunnel_func(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_invoke_check_tunnel_func", "tunnel_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_boolean_t)svn_ra_invoke_check_tunnel_func(arg1,arg2,(char const *)arg3);
@@ -17496,7 +18124,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_close_tunnel_func(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_ra_invoke_close_tunnel_func",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_close_tunnel_func",3,3,&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);
@@ -17558,6 +18186,9 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_open_tunnel_func(PyObject *SWIGUNUSEDPA
   void *temp5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -17580,7 +18211,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_open_tunnel_func(PyObject *SWIGUNUSEDPA
     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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_open_tunnel_func",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&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);
@@ -17598,6 +18229,18 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_open_tunnel_func(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_ra_invoke_open_tunnel_func", "tunnel_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_ra_invoke_open_tunnel_func", "user");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_ra_invoke_open_tunnel_func", "hostname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg10 = (int)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -17691,7 +18334,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_init_func(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_ra_invoke_init_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_ra_invoke_init_func",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_ra_init_func_t * tmp =
     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);
@@ -17762,112 +18405,112 @@ fail:
 
 SWIGINTERN PyObject *svn_ra_get_wc_prop_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_set_wc_prop_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_push_wc_prop_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_invalidate_wc_props_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_get_wc_contents_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_get_latest_revnum_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_get_client_string_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_file_rev_handler_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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_ra_lock_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_progress_notify_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_replay_revstart_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_ra_replay_revfinish_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -17962,6 +18605,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_ra_callbacks_t_swigregister", svn_ra_callbacks_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_ra_initialize", _wrap_svn_ra_initialize, METH_VARARGS, (char *)"svn_ra_initialize(apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_ra_create_callbacks", _wrap_svn_ra_create_callbacks, METH_VARARGS, (char *)"svn_ra_create_callbacks(apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_ra_open5", _wrap_svn_ra_open5, METH_VARARGS, (char *)"svn_ra_open5(char const * repos_URL, char const * uuid, svn_ra_callbacks2_t callbacks, apr_hash_t config, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_ra_open4", _wrap_svn_ra_open4, METH_VARARGS, (char *)"svn_ra_open4(char const * repos_URL, char const * uuid, svn_ra_callbacks2_t callbacks, apr_hash_t config, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_ra_open3", _wrap_svn_ra_open3, METH_VARARGS, (char *)"svn_ra_open3(char const * repos_URL, char const * uuid, svn_ra_callbacks2_t callbacks, apr_hash_t config, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_ra_open2", _wrap_svn_ra_open2, METH_VARARGS, (char *)"svn_ra_open2(char const * repos_URL, svn_ra_callbacks2_t callbacks, apr_hash_t config, apr_pool_t pool) -> svn_error_t"},
@@ -18254,6 +18898,8 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client_conflict_option_t = {"_p_svn_client_conflict_option_t", "svn_client_conflict_option_t *", 0, 0, (void*)0, 0};
 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_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
@@ -18418,6 +19064,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
+  &_swigt__p_svn_client__shelf_version_t,
+  &_swigt__p_svn_client_conflict_option_t,
   &_swigt__p_svn_commit_info_t,
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
@@ -18582,6 +19230,8 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client_conflict_option_t[] = {  {&_swigt__p_svn_client_conflict_option_t, 0, 0, 0},{0, 0, 0, 0}};
 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_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -18746,6 +19396,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
+  _swigc__p_svn_client__shelf_version_t,
+  _swigc__p_svn_client_conflict_option_t,
   _swigc__p_svn_commit_info_t,
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
diff --git a/subversion/bindings/swig/python/svn_repos.c b/subversion/bindings/swig/python/svn_repos.c
index e410897..d845946 100644
--- a/subversion/bindings/swig/python/svn_repos.c
+++ b/subversion/bindings/swig/python/svn_repos.c
@@ -8,13 +8,15 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+
+
 
 #ifndef SWIGPYTHON
 #define SWIGPYTHON
 #endif
 
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#define SWIG_PYTHON_CLASSIC
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -3066,83 +3068,85 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_svn_checksum_ctx_t swig_types[80]
 #define SWIGTYPE_p_svn_checksum_kind_t swig_types[81]
 #define SWIGTYPE_p_svn_checksum_t swig_types[82]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[83]
-#define SWIGTYPE_p_svn_config_t swig_types[84]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[85]
-#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[86]
-#define SWIGTYPE_p_svn_depth_t swig_types[87]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[88]
-#define SWIGTYPE_p_svn_dirent_t swig_types[89]
-#define SWIGTYPE_p_svn_errno_t swig_types[90]
-#define SWIGTYPE_p_svn_error_t swig_types[91]
-#define SWIGTYPE_p_svn_fs_access_t swig_types[92]
-#define SWIGTYPE_p_svn_fs_dirent_t swig_types[93]
-#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[94]
-#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[95]
-#define SWIGTYPE_p_svn_fs_history_t swig_types[96]
-#define SWIGTYPE_p_svn_fs_id_t swig_types[97]
-#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[98]
-#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[99]
-#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[100]
-#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[101]
-#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[102]
-#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[103]
-#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[104]
-#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[105]
-#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[106]
-#define SWIGTYPE_p_svn_fs_path_change_t swig_types[107]
-#define SWIGTYPE_p_svn_fs_root_t swig_types[108]
-#define SWIGTYPE_p_svn_fs_t swig_types[109]
-#define SWIGTYPE_p_svn_fs_txn_t swig_types[110]
-#define SWIGTYPE_p_svn_fs_upgrade_notify_action_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_desc3_t swig_types[127]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[128]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[129]
-#define SWIGTYPE_p_svn_prop_kind swig_types[130]
-#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[131]
-#define SWIGTYPE_p_svn_repos_log_entry_t swig_types[132]
-#define SWIGTYPE_p_svn_repos_node_t swig_types[133]
-#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[134]
-#define SWIGTYPE_p_svn_repos_notify_t swig_types[135]
-#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[136]
-#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[137]
-#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[138]
-#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[139]
-#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[140]
-#define SWIGTYPE_p_svn_repos_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 SWIGTYPE_p_svn_client__shelf_version_t swig_types[83]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[84]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[85]
+#define SWIGTYPE_p_svn_config_t swig_types[86]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[87]
+#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[88]
+#define SWIGTYPE_p_svn_depth_t swig_types[89]
+#define SWIGTYPE_p_svn_diff_hunk_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_fs_access_t swig_types[94]
+#define SWIGTYPE_p_svn_fs_dirent_t swig_types[95]
+#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[96]
+#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[97]
+#define SWIGTYPE_p_svn_fs_history_t swig_types[98]
+#define SWIGTYPE_p_svn_fs_id_t swig_types[99]
+#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[100]
+#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[101]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[102]
+#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[103]
+#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[104]
+#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[105]
+#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[106]
+#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[107]
+#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[108]
+#define SWIGTYPE_p_svn_fs_path_change_t swig_types[109]
+#define SWIGTYPE_p_svn_fs_root_t swig_types[110]
+#define SWIGTYPE_p_svn_fs_t swig_types[111]
+#define SWIGTYPE_p_svn_fs_txn_t swig_types[112]
+#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[113]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[114]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[115]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[116]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[117]
+#define SWIGTYPE_p_svn_lock_t swig_types[118]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[119]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[120]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[121]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[122]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[123]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[124]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[125]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[126]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[127]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[128]
+#define SWIGTYPE_p_svn_opt_subcommand_desc3_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_repos_authz_access_t swig_types[133]
+#define SWIGTYPE_p_svn_repos_log_entry_t swig_types[134]
+#define SWIGTYPE_p_svn_repos_node_t swig_types[135]
+#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[136]
+#define SWIGTYPE_p_svn_repos_notify_t swig_types[137]
+#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[138]
+#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[139]
+#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[140]
+#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[141]
+#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[142]
+#define SWIGTYPE_p_svn_repos_t swig_types[143]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[144]
+#define SWIGTYPE_p_svn_stream_t swig_types[145]
+#define SWIGTYPE_p_svn_string_t swig_types[146]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[147]
+#define SWIGTYPE_p_svn_tristate_t swig_types[148]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[149]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[150]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[151]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[152]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[153]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[154]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[155]
+#define SWIGTYPE_p_svn_version_t swig_types[156]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[157]
+#define SWIGTYPE_p_unsigned_long swig_types[158]
+#define SWIGTYPE_p_void swig_types[159]
+static swig_type_info *swig_types[161];
+static swig_module_info swig_module = {swig_types, 160, 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)
 
@@ -3153,6 +3157,12 @@ static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
 
 /*-----------------------------------------------
               @(target):= _repos.so
@@ -3179,6 +3189,7 @@ static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0};
 
 
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 
 
 static PyObject * _global_py_pool = NULL;
@@ -3863,7 +3874,7 @@ SWIGINTERN PyObject *_wrap_svn_swig_py_make_parse_fns3(PyObject *SWIGUNUSEDPARM(
   arg4 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_swig_py_make_parse_fns3",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_swig_py_make_parse_fns3",1,2,&obj0,&obj1)) SWIG_fail;
   arg3 = obj0;
   if (obj1) {
     /* Verify that the user supplied a valid pool */
@@ -3910,7 +3921,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_version(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_repos_version")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_version",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3934,7 +3945,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_action_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_action_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_action_set",2,2,&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()) {
@@ -3961,7 +3972,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_action_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_repos_notify_action_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_action_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_action_get",1,1,&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()) {
@@ -3983,7 +3994,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_revision_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_revision_set",2,2,&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()) {
@@ -4010,7 +4021,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_revision_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_revision_get",1,1,&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()) {
@@ -4030,8 +4041,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_str_set(PyObject *SWIGUNUS
   struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_repos_notify_t_warning_str_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_warning_str_set",2,2,&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()) {
@@ -4039,6 +4051,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_str_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_notify_t_warning_str_set", "warning_str");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->warning_str) free((char *)arg1->warning_str);
@@ -4059,7 +4075,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_str_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_warning_str_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_warning_str_get",1,1,&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()) {
@@ -4081,7 +4097,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_warning_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_warning_set",2,2,&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()) {
@@ -4108,7 +4124,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_repos_notify_warning_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_warning_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_warning_get",1,1,&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()) {
@@ -4130,7 +4146,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_shard_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_shard_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_shard_set",2,2,&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()) {
@@ -4152,7 +4168,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_shard_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   apr_int64_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_shard_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_shard_get",1,1,&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()) {
@@ -4174,7 +4190,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_new_revision_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_new_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_new_revision_set",2,2,&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()) {
@@ -4201,7 +4217,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_new_revision_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_new_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_new_revision_get",1,1,&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()) {
@@ -4223,7 +4239,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_old_revision_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_old_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_old_revision_set",2,2,&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()) {
@@ -4250,7 +4266,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_old_revision_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_old_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_old_revision_get",1,1,&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()) {
@@ -4272,7 +4288,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_node_action_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_node_action_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_node_action_set",2,2,&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()) {
@@ -4299,7 +4315,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_node_action_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   enum svn_node_action result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_node_action_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_node_action_get",1,1,&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()) {
@@ -4319,8 +4335,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_path_set(PyObject *SWIGUNUSEDPARM(
   struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_repos_notify_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_path_set",2,2,&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()) {
@@ -4328,6 +4345,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_path_set(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_notify_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -4348,7 +4369,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_path_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_path_get",1,1,&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()) {
@@ -4370,7 +4391,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_start_revision_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_start_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_start_revision_set",2,2,&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()) {
@@ -4397,7 +4418,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_start_revision_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_start_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_start_revision_get",1,1,&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()) {
@@ -4419,7 +4440,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_end_revision_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_end_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_end_revision_set",2,2,&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()) {
@@ -4446,7 +4467,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_end_revision_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_end_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_t_end_revision_get",1,1,&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()) {
@@ -4463,7 +4484,7 @@ fail:
 
 SWIGINTERN PyObject *svn_repos_notify_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_repos_notify_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4482,7 +4503,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_create(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_notify_create",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_notify_create",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_repos_notify_action_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -4525,6 +4546,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_find_root_path(PyObject *SWIGUNUSEDPARM(sel
   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 ;
   
@@ -4532,7 +4554,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_find_root_path(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_repos_find_root_path",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_find_root_path",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_find_root_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -4572,6 +4598,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_open3(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_repos_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -4586,7 +4613,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_open3(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_repos_open3",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_open3",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_open3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     /* PYTHON-FIXME: Handle None -> NULL. */
     arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
@@ -4659,6 +4690,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_open2(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_repos_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -4668,7 +4700,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_open2(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_repos_open2",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_open2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_open2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     /* PYTHON-FIXME: Handle None -> NULL. */
     arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
@@ -4726,6 +4762,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_open(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_repos_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -4734,7 +4771,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_open(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_repos_open",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_open",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_open", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -4792,6 +4833,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_create(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_repos_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -4802,7 +4846,19 @@ SWIGINTERN PyObject *_wrap_svn_repos_create(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"szzOO|O:svn_repos_create",&arg2,&arg3,&arg4,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_create",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_create", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_repos_create", "unused_1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_repos_create", "unused_2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (_global_pool == NULL)
     {
@@ -4874,6 +4930,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_upgrade2(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -4884,7 +4941,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_upgrade2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_repos_upgrade2",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_upgrade2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_upgrade2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -4955,6 +5016,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_upgrade(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -4965,7 +5027,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_upgrade(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_repos_upgrade",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_upgrade",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_upgrade", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -5031,6 +5097,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_delete(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
   
@@ -5038,7 +5105,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_delete(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_repos_delete",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_delete",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_delete", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -5089,6 +5160,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_has_capability(PyObject *SWIGUNUSEDPARM(sel
   svn_boolean_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -5097,13 +5169,17 @@ SWIGINTERN PyObject *_wrap_svn_repos_has_capability(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_has_capability",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_has_capability",2,3,&obj0,&obj1,&obj2)) 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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_has_capability", "capability");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -5172,7 +5248,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_capabilities(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_repos_capabilities",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_capabilities",1,3,&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()) {
@@ -5215,13 +5291,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_capabilities(PyObject *SWIGUNUSEDPARM(self)
     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");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_hash_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -5249,7 +5322,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_remember_client_capabilities(PyObject *SWIG
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_remember_client_capabilities",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_remember_client_capabilities",2,2,&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()) {
@@ -5293,7 +5366,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   svn_fs_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_fs",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5330,7 +5403,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_type(PyObject *SWIGUNUSEDPARM(self), PyO
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_type",1,2,&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()) {
@@ -5379,6 +5452,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_hotcopy3(PyObject *SWIGUNUSEDPARM(self), Py
   apr_pool_t *arg9 = (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 ;
@@ -5391,7 +5466,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_hotcopy3(PyObject *SWIGUNUSEDPARM(self), Py
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_hotcopy3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_hotcopy3", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_hotcopy3", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -5474,6 +5557,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_hotcopy2(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -5484,7 +5569,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_hotcopy2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_repos_hotcopy2",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_hotcopy2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_hotcopy2", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_hotcopy2", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -5548,6 +5641,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_hotcopy(PyObject *SWIGUNUSEDPARM(self), PyO
   apr_pool_t *arg4 = (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 ;
   svn_error_t *result = 0 ;
@@ -5556,7 +5651,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_hotcopy(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_repos_hotcopy",&arg1,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_hotcopy",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_hotcopy", "src_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_hotcopy", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -5623,7 +5726,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_pack2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_fs_pack2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_pack2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5710,7 +5813,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_pack(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_fs_pack",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_pack",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -5787,6 +5890,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover4(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -5798,7 +5902,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover4(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_repos_recover4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_recover4",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_recover4", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -5875,6 +5983,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover3(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -5886,7 +5995,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover3(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_repos_recover3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_recover3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_recover3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -5959,6 +6072,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover2(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -5969,7 +6083,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_repos_recover2",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_recover2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_recover2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -6035,6 +6153,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
   
@@ -6042,7 +6161,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_repos_recover",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_recover",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_recover", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -6099,7 +6222,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_freeze(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_freeze",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_freeze",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
       sizeof(const char *),
@@ -6161,6 +6284,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_db_logfiles(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -6170,7 +6294,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_db_logfiles(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_repos_db_logfiles",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_db_logfiles",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_db_logfiles", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -6233,7 +6361,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_path(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_path",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_path",1,2,&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()) {
@@ -6283,7 +6411,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_db_env(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_db_env",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_db_env",1,2,&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()) {
@@ -6333,7 +6461,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_conf_dir(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_conf_dir",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_conf_dir",1,2,&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()) {
@@ -6383,7 +6511,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_svnserve_conf(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_svnserve_conf",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_svnserve_conf",1,2,&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()) {
@@ -6433,7 +6561,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_lock_dir(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_lock_dir",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_lock_dir",1,2,&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()) {
@@ -6483,7 +6611,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_db_lockfile(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_db_lockfile",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_db_lockfile",1,2,&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()) {
@@ -6533,7 +6661,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_db_logs_lockfile(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_db_logs_lockfile",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_db_logs_lockfile",1,2,&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()) {
@@ -6583,7 +6711,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_hook_dir(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_hook_dir",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_hook_dir",1,2,&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()) {
@@ -6633,7 +6761,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_start_commit_hook(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_start_commit_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_start_commit_hook",1,2,&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()) {
@@ -6683,7 +6811,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_pre_commit_hook(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_pre_commit_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_pre_commit_hook",1,2,&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()) {
@@ -6733,7 +6861,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_post_commit_hook(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_post_commit_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_post_commit_hook",1,2,&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()) {
@@ -6783,7 +6911,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_pre_revprop_change_hook(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_pre_revprop_change_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_pre_revprop_change_hook",1,2,&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()) {
@@ -6833,7 +6961,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_post_revprop_change_hook(PyObject *SWIGUNUS
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_post_revprop_change_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_post_revprop_change_hook",1,2,&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()) {
@@ -6883,7 +7011,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_pre_lock_hook(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_pre_lock_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_pre_lock_hook",1,2,&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()) {
@@ -6933,7 +7061,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_post_lock_hook(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_post_lock_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_post_lock_hook",1,2,&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()) {
@@ -6983,7 +7111,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_pre_unlock_hook(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_pre_unlock_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_pre_unlock_hook",1,2,&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()) {
@@ -7033,7 +7161,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_post_unlock_hook(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_post_unlock_hook",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_post_unlock_hook",1,2,&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()) {
@@ -7077,6 +7205,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_hooks_setenv(PyObject *SWIGUNUSEDPARM(self)
   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 ;
   
@@ -7084,13 +7213,17 @@ SWIGINTERN PyObject *_wrap_svn_repos_hooks_setenv(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_hooks_setenv",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_hooks_setenv",2,3,&obj0,&obj1,&obj2)) 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_string_to_cstring(obj1, FALSE, "svn_repos_hooks_setenv", "hooks_env_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -7153,6 +7286,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report3(PyObject *SWIGUNUSEDPARM(self
   void *temp1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -7169,7 +7305,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report3(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg16 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOsszOOOOOOOO|O:svn_repos_begin_report3",&obj0,&obj1,&arg4,&arg5,&arg6,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_begin_report3",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     arg2 = (svn_revnum_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -7183,6 +7319,18 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report3(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_begin_report3", "fs_base");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_begin_report3", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_begin_report3", "tgt_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -7298,6 +7446,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report2(PyObject *SWIGUNUSEDPARM(self
   void *temp1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -7313,7 +7464,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report2(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg15 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOsszOOOOOOO|O:svn_repos_begin_report2",&obj0,&obj1,&arg4,&arg5,&arg6,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_begin_report2",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg2 = (svn_revnum_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -7327,6 +7478,18 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_begin_report2", "fs_base");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_begin_report2", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_begin_report2", "tgt_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -7435,7 +7598,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   void *temp1 ;
   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 ;
@@ -7450,7 +7617,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg15 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OzOsszOOOOOO|O:svn_repos_begin_report",&obj0,&arg3,&obj2,&arg5,&arg6,&arg7,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_begin_report",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg2 = (svn_revnum_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
@@ -7458,12 +7625,28 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_repos_begin_report", "username");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_repos_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_begin_report", "fs_base");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_repos_begin_report", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_begin_report", "tgt_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_boolean_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -7557,9 +7740,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path3(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   
@@ -7567,7 +7752,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path3(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOz|O:svn_repos_set_path3",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_set_path3",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7577,6 +7762,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path3(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_set_path3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -7594,6 +7783,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path3(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_set_path3", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
     if (obj6 != Py_None && obj6 != _global_py_pool) {
@@ -7644,8 +7837,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path2(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   
@@ -7653,7 +7848,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOz|O:svn_repos_set_path2",&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_set_path2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7663,6 +7858,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_set_path2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -7674,6 +7873,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path2(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_set_path2", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -7723,6 +7926,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -7732,7 +7936,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_repos_set_path",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_set_path",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7742,6 +7946,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_set_path(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_set_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -7805,9 +8013,12 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path3(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   svn_error_t *result = 0 ;
   
@@ -7815,7 +8026,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path3(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssOOOz|O:svn_repos_link_path3",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_link_path3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7825,6 +8036,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_link_path3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_link_path3", "link_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -7842,6 +8061,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path3(PyObject *SWIGUNUSEDPARM(self),
       SWIG_fail;
     }
   }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_repos_link_path3", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
     if (obj7 != Py_None && obj7 != _global_py_pool) {
@@ -7893,8 +8116,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   
@@ -7902,7 +8128,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssOOz|O:svn_repos_link_path2",&obj0,&arg2,&arg3,&obj3,&obj4,&arg6,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_link_path2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7912,6 +8138,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_link_path2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_link_path2", "link_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -7923,6 +8157,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path2(PyObject *SWIGUNUSEDPARM(self),
       SWIG_fail;
     }
   }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_link_path2", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
     if (obj6 != Py_None && obj6 != _global_py_pool) {
@@ -7973,6 +8211,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
@@ -7982,7 +8222,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssOO|O:svn_repos_link_path",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_link_path",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -7992,6 +8232,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_link_path(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_link_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_link_path", "link_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -8050,6 +8298,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_delete_path(PyObject *SWIGUNUSEDPARM(self),
   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 ;
   
@@ -8057,7 +8306,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_delete_path(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_delete_path",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_delete_path",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -8066,6 +8315,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_delete_path(PyObject *SWIGUNUSEDPARM(self),
       PyErr_Clear();
     }
   }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_delete_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -8119,7 +8372,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_finish_report(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_finish_report",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_finish_report",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -8181,7 +8434,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_abort_report(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_abort_report",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_abort_report",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -8248,7 +8501,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -8263,7 +8519,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_dir_delta2",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8271,12 +8527,24 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_dir_delta2", "src_parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_repos_dir_delta2", "src_entry");
+    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;
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_dir_delta2", "tgt_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -8377,7 +8645,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
@@ -8392,7 +8663,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_dir_delta",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8400,12 +8671,24 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_dir_delta", "src_parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_repos_dir_delta", "src_entry");
+    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;
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_dir_delta", "tgt_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -8501,6 +8784,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_replay2(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -8513,7 +8797,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_replay2(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_repos_replay2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_replay2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8521,6 +8805,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_replay2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_replay2", "base_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -8608,7 +8896,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_replay(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_replay",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_replay",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8688,6 +8976,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor5(PyObject *SWIGUNUSEDPARM
   void *temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -8701,7 +8991,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor5(PyObject *SWIGUNUSEDPARM
   arg12 = _global_pool;
   arg1 = &temp1;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_commit_editor5",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8715,6 +9005,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor5(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_get_commit_editor5", "repos_url_decoded");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_get_commit_editor5", "base_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -8819,6 +9117,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor4(PyObject *SWIGUNUSEDPARM
   void *temp2 ;
   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 ;
@@ -8831,7 +9133,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor4(PyObject *SWIGUNUSEDPARM
   arg13 = _global_pool;
   arg1 = &temp1;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_commit_editor4",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8845,6 +9147,22 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor4(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_get_commit_editor4", "repos_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_get_commit_editor4", "base_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_get_commit_editor4", "user");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_get_commit_editor4", "log_msg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = svn_swig_py_commit_callback2;
     arg10 = (void *)obj6;
   }
@@ -8936,6 +9254,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor3(PyObject *SWIGUNUSEDPARM
   void *temp2 ;
   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 ;
@@ -8948,7 +9270,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor3(PyObject *SWIGUNUSEDPARM
   arg13 = _global_pool;
   arg1 = &temp1;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_commit_editor3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -8962,6 +9284,22 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor3(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_get_commit_editor3", "repos_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_get_commit_editor3", "base_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_get_commit_editor3", "user");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_get_commit_editor3", "log_msg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = svn_swig_py_commit_callback;
     arg10 = (void *)obj6;
   }
@@ -9051,6 +9389,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor2(PyObject *SWIGUNUSEDPARM
   void *temp2 ;
   PyObject * obj0 = 0 ;
   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 ;
@@ -9061,7 +9403,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor2(PyObject *SWIGUNUSEDPARM
   arg11 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOsszzO|O:svn_repos_get_commit_editor2",&obj0,&obj1,&arg5,&arg6,&arg7,&arg8,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_commit_editor2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9075,6 +9417,22 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor2(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_get_commit_editor2", "repos_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_get_commit_editor2", "base_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_get_commit_editor2", "user");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_get_commit_editor2", "log_msg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = svn_swig_py_commit_callback;
     arg10 = (void *)obj6;
   }
@@ -9146,6 +9504,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor(PyObject *SWIGUNUSEDPARM(
   svn_delta_editor_t *temp1 ;
   void *temp2 ;
   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 ;
@@ -9156,7 +9518,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor(PyObject *SWIGUNUSEDPARM(
   arg10 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsszzO|O:svn_repos_get_commit_editor",&obj0,&arg4,&arg5,&arg6,&arg7,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_commit_editor",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9164,6 +9526,22 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_get_commit_editor", "repos_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_get_commit_editor", "base_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_repos_get_commit_editor", "user");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_get_commit_editor", "log_msg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = svn_swig_py_commit_callback;
     arg9 = (void *)obj5;
   }
@@ -9238,7 +9616,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dated_revision(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_dated_revision",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_dated_revision",2,3,&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()) {
@@ -9306,6 +9684,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_committed_info(PyObject *SWIGUNUSEDPARM
   char *temp2 ;
   char *temp3 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9316,13 +9695,17 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_committed_info(PyObject *SWIGUNUSEDPARM
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_get_committed_info",&obj0,&arg5,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_committed_info",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_get_committed_info", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9363,7 +9746,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_committed_info(PyObject *SWIGUNUSEDPARM
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -9376,7 +9759,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_committed_info(PyObject *SWIGUNUSEDPARM
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -9404,6 +9787,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_stat(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *_global_py_pool = NULL ;
   svn_dirent_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -9412,13 +9796,17 @@ SWIGINTERN PyObject *_wrap_svn_repos_stat(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_stat",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_stat",2,3,&obj0,&obj1,&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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_stat", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9481,6 +9869,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_list(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -9495,7 +9884,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_list(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_repos_list",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_list",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9503,6 +9892,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_list(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_list", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -9595,6 +9988,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_deleted_rev(PyObject *SWIGUNUSEDPARM(self),
   svn_revnum_t temp5 ;
   int res5 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -9605,7 +9999,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_deleted_rev(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_repos_deleted_rev",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_deleted_rev",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9613,6 +10007,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_deleted_rev(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_deleted_rev", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -9684,6 +10082,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_history2(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -9696,7 +10095,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_history2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_repos_history2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_history2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9704,6 +10103,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_history2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_history2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_repos_history_func_t) svn_swig_py_repos_history_func;
     arg4 = obj2;
   }
@@ -9782,6 +10185,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_history(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -9793,7 +10197,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_history(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_repos_history",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_history",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9801,6 +10205,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_history(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_history", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_repos_history_func_t) svn_swig_py_repos_history_func;
     arg4 = obj2;
   }
@@ -9875,6 +10283,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_trace_node_locations(PyObject *SWIGUNUSEDPA
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -9886,7 +10295,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_trace_node_locations(PyObject *SWIGUNUSEDPA
   SWIG_fail;
   arg8 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_repos_trace_node_locations",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_trace_node_locations",5,6,&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()) {
@@ -9894,6 +10303,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_trace_node_locations(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_trace_node_locations", "fs_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -9970,6 +10383,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_location_segments(PyObject *SWIGUNUSED
   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 ;
@@ -9982,7 +10396,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_location_segments(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_location_segments",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -9990,6 +10404,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_location_segments(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_node_location_segments", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -10067,7 +10485,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_path_change_create(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_repos_path_change_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_path_change_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -10112,7 +10530,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_path_change_dup(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_path_change_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_path_change_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_repos_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10156,7 +10574,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_revision_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_log_entry_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10183,7 +10601,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_revision_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_log_entry_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10207,7 +10625,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_revprops_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_log_entry_t_revprops_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_revprops_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10241,7 +10659,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_revprops_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_log_entry_t_revprops_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_revprops_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10265,7 +10683,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_has_children_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_log_entry_t_has_children_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_has_children_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10292,7 +10710,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_has_children_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_log_entry_t_has_children_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_has_children_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10314,7 +10732,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_non_inheritable_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_log_entry_t_non_inheritable_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_non_inheritable_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10341,7 +10759,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_non_inheritable_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_log_entry_t_non_inheritable_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_non_inheritable_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10363,7 +10781,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_subtractive_merge_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_log_entry_t_subtractive_merge_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_subtractive_merge_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10390,7 +10808,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_t_subtractive_merge_get(PyObject
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_log_entry_t_subtractive_merge_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_t_subtractive_merge_get",1,1,&obj0)) SWIG_fail;
   {
     arg1 = (struct svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10407,7 +10825,7 @@ fail:
 
 SWIGINTERN PyObject *svn_repos_log_entry_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_repos_log_entry_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -10424,7 +10842,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_create(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_repos_log_entry_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -10469,7 +10887,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_log_entry_dup(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_log_entry_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_log_entry_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_repos_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10545,7 +10963,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs5(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg15 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOO|O:svn_repos_get_logs5",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_logs5",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&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()) {
@@ -10712,7 +11130,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs4(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_logs4",11,12,&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()) {
@@ -10853,7 +11271,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs3(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_logs3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -10977,7 +11395,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_logs2",8,9,&obj0,&obj1,&obj2,&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()) {
@@ -11092,7 +11510,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_repos_get_logs",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_logs",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11204,7 +11622,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_mergeinfo2(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_repos_fs_get_mergeinfo2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_get_mergeinfo2",8,9,&obj0,&obj1,&obj2,&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()) {
@@ -11326,7 +11744,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_mergeinfo(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_repos_fs_get_mergeinfo",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_get_mergeinfo",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11431,6 +11849,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs2(PyObject *SWIGUNUSEDPARM(sel
   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 ;
@@ -11444,7 +11863,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs2(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_file_revs2",8,9,&obj0,&obj1,&obj2,&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()) {
@@ -11452,6 +11871,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs2(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_get_file_revs2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -11543,6 +11966,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs(PyObject *SWIGUNUSEDPARM(self
   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 ;
@@ -11555,7 +11979,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_file_revs",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11563,6 +11987,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_get_file_revs", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -11657,7 +12085,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_commit_txn(PyObject *SWIGUNUSEDPARM(self
   arg5 = _global_pool;
   arg1 = &temp1;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_fs_commit_txn",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_commit_txn",2,3,&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()) {
@@ -11704,7 +12132,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_commit_txn(PyObject *SWIGUNUSEDPARM(self
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -11749,7 +12177,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_commit2(PyObject *SWIGUNUS
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_fs_begin_txn_for_commit2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_begin_txn_for_commit2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11833,6 +12261,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_commit(PyObject *SWIGUNUSE
   svn_fs_txn_t *temp1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11841,7 +12271,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_commit(PyObject *SWIGUNUSE
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOsz|O:svn_repos_fs_begin_txn_for_commit",&obj0,&obj1,&arg4,&arg5,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_begin_txn_for_commit",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11854,6 +12284,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_commit(PyObject *SWIGUNUSE
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_begin_txn_for_commit", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_repos_fs_begin_txn_for_commit", "log_msg");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -11911,6 +12349,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_update(PyObject *SWIGUNUSE
   svn_fs_txn_t *temp1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11919,7 +12358,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_update(PyObject *SWIGUNUSE
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_repos_fs_begin_txn_for_update",&obj0,&obj1,&arg4,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_begin_txn_for_update",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11932,6 +12371,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_update(PyObject *SWIGUNUSE
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_begin_txn_for_update", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -11993,6 +12436,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_lock_many(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -12009,7 +12453,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_lock_many(PyObject *SWIGUNUSEDPARM(self)
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_lock_many",7,9,&obj0,&obj1,&obj2,&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()) {
@@ -12030,6 +12474,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_lock_many(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_repos_fs_lock_many", "comment");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -12115,6 +12563,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   svn_lock_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -12127,7 +12578,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg10 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OszzOOOO|O:svn_repos_fs_lock",&obj0,&arg3,&arg4,&arg5,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_lock",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12135,6 +12586,18 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_fs_lock", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_repos_fs_lock", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_repos_fs_lock", "comment");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -12225,7 +12688,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_unlock_many(PyObject *SWIGUNUSEDPARM(sel
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_unlock_many",4,6,&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()) {
@@ -12308,6 +12771,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_unlock(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
@@ -12316,7 +12781,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_unlock(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OszO|O:svn_repos_fs_unlock",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_unlock",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12324,6 +12789,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_unlock(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_fs_unlock", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_repos_fs_unlock", "token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -12381,6 +12854,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -12391,7 +12865,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_repos_fs_get_locks2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_get_locks2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12399,6 +12873,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_fs_get_locks2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -12469,6 +12947,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -12478,7 +12957,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_repos_fs_get_locks",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_get_locks",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12486,6 +12965,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_fs_get_locks", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     /* FIXME: Handle the NULL case. */
     arg4 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg5 = obj2;
@@ -12556,6 +13039,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop4(PyObject *SWIGUNUSEDPAR
   svn_string_t value6 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -12568,7 +13053,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop4(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_change_rev_prop4",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12582,6 +13067,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop4(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_change_rev_prop4", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_fs_change_rev_prop4", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     SWIG_exception(SWIG_ValueError, "svn_repos_fs_change_rev_prop4 is not implemented yet");
     
   }
@@ -12589,12 +13082,16 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop4(PyObject *SWIGUNUSEDPAR
     if (obj5 == Py_None)
     arg6 = NULL;
     else {
-      if (!PyString_Check(obj5)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj5)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value6.data = PyString_AS_STRING(obj5);
-      value6.len = PyString_GET_SIZE(obj5);
+      if (PyBytes_AsStringAndSize(obj5, (char **)&(value6.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value6.len = pyStrLen;
       arg6 = &value6;
     }
   }
@@ -12647,9 +13144,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop4(PyObject *SWIGUNUSEDPAR
     if (*arg5 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg5)->data, (*arg5)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg5)->data, (*arg5)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -12684,6 +13180,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop3(PyObject *SWIGUNUSEDPAR
   svn_string_t value5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -12695,7 +13193,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop3(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_change_rev_prop3",8,9,&obj0,&obj1,&obj2,&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()) {
@@ -12709,15 +13207,27 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop3(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_change_rev_prop3", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_fs_change_rev_prop3", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -12792,6 +13302,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop2(PyObject *SWIGUNUSEDPAR
   svn_string_t value5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -12801,7 +13313,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop2(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_change_rev_prop2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12815,15 +13327,27 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop2(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_change_rev_prop2", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_fs_change_rev_prop2", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -12884,6 +13408,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop(PyObject *SWIGUNUSEDPARM
   svn_string_t value5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -12892,7 +13418,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOssO|O:svn_repos_fs_change_rev_prop",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_change_rev_prop",5,6,&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()) {
@@ -12906,15 +13432,27 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_change_rev_prop", "author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_fs_change_rev_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -12971,6 +13509,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_prop(PyObject *SWIGUNUSEDPARM(s
   svn_string_t *temp1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -12980,7 +13519,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_prop(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_repos_fs_revision_prop",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_revision_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -12994,6 +13533,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_prop(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_revision_prop", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     /* FIXME: Handle the NULL case. */
     arg5 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg6 = obj3;
@@ -13030,9 +13573,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_prop(PyObject *SWIGUNUSEDPARM(s
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -13072,7 +13614,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_proplist(PyObject *SWIGUNUSEDPA
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_fs_revision_proplist",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_revision_proplist",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13143,6 +13685,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_node_prop(PyObject *SWIGUNUSEDPAR
   PyObject *_global_py_pool = NULL ;
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -13151,7 +13695,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_node_prop(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssO|O:svn_repos_fs_change_node_prop",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_change_node_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13159,15 +13703,27 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_node_prop(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_fs_change_node_prop", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_change_node_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -13224,6 +13780,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_inherited_props(PyObject *SWIGUNUSED
   PyObject *_global_py_pool = NULL ;
   apr_array_header_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -13238,7 +13796,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_inherited_props(PyObject *SWIGUNUSED
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_get_inherited_props",4,6,&obj0,&obj1,&obj2,&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()) {
@@ -13246,6 +13804,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_inherited_props(PyObject *SWIGUNUSED
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_fs_get_inherited_props", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_fs_get_inherited_props", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     /* FIXME: Handle the NULL case. */
     arg5 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg6 = obj3;
@@ -13316,6 +13882,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM
   PyObject *_global_py_pool = NULL ;
   svn_string_t value3 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -13324,7 +13891,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_repos_fs_change_txn_prop",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_change_txn_prop",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13332,15 +13899,23 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_fs_change_txn_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj2)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj2);
-      value3.len = PyString_GET_SIZE(obj2);
+      if (PyBytes_AsStringAndSize(obj2, (char **)&(value3.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
@@ -13399,7 +13974,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_txn_props(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_fs_change_txn_props",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_fs_change_txn_props",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -13458,7 +14033,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_kind_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13485,7 +14060,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_kind_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13527,7 +14102,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_action_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   char result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_action_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_action_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13549,7 +14124,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_text_mod_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_text_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_text_mod_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13576,7 +14151,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_text_mod_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_text_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_text_mod_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13598,7 +14173,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_prop_mod_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_prop_mod_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_prop_mod_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13625,7 +14200,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_prop_mod_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_prop_mod_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_prop_mod_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13645,8 +14220,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_name_set(PyObject *SWIGUNUSEDPARM(se
   struct svn_repos_node_t *arg1 = (struct svn_repos_node_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_repos_node_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13654,6 +14230,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_name_set(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_node_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -13674,7 +14254,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_name_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13696,7 +14276,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_rev_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13723,7 +14303,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_rev_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13743,8 +14323,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_path_set(PyObject *SWIGUNUS
   struct svn_repos_node_t *arg1 = (struct svn_repos_node_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_repos_node_t_copyfrom_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_copyfrom_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13752,6 +14333,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_path_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_repos_node_t_copyfrom_path_set", "copyfrom_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_path) free((char *)arg1->copyfrom_path);
@@ -13772,7 +14357,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_path_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_copyfrom_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_copyfrom_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13794,7 +14379,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_sibling_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_sibling_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_sibling_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13821,7 +14406,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_sibling_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   struct svn_repos_node_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_sibling_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_sibling_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13844,7 +14429,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_child_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_child_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_child_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13871,7 +14456,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_child_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   struct svn_repos_node_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_child_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_child_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13894,7 +14479,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_parent_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_parent_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_parent_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13921,7 +14506,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_parent_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   struct svn_repos_node_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_parent_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_t_parent_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13939,7 +14524,7 @@ fail:
 
 SWIGINTERN PyObject *svn_repos_node_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_repos_node_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -13974,7 +14559,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_editor(PyObject *SWIGUNUSEDPARM(self),
   arg7 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_repos_node_editor",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_editor",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14064,7 +14649,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_from_baton(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_repos_node_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_from_baton",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_node_from_baton",1,1,&obj0)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -14116,7 +14701,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_info_format(PyObject *SWIGUNUSEDPARM(self),
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_repos_info_format",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_info_format",1,3,&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()) {
@@ -14225,7 +14810,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs3(PyObject *SWIGUNUSEDPARM(self),
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_verify_fs3",11,12,&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()) {
@@ -14369,7 +14954,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_repos_verify_fs2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_verify_fs2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14482,7 +15067,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_repos_verify_fs",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_verify_fs",5,6,&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()) {
@@ -14594,7 +15179,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs4(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg15 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOO|O:svn_repos_dump_fs4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_dump_fs4",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&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()) {
@@ -14754,7 +15339,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs3(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_dump_fs3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14884,7 +15469,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_dump_fs2",8,9,&obj0,&obj1,&obj2,&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()) {
@@ -15007,7 +15592,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_repos_dump_fs",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_dump_fs",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15122,6 +15707,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs6(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
@@ -15137,7 +15723,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs6(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg16 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOzOOOOOOOO|O:svn_repos_load_fs6",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_load_fs6",14,15,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15174,6 +15760,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs6(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_load_fs6", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -15286,6 +15876,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs5(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
@@ -15300,7 +15891,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs5(PyObject *SWIGUNUSEDPARM(self), Py
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_load_fs5",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&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()) {
@@ -15337,6 +15928,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs5(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_load_fs5", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -15442,6 +16037,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs4(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
@@ -15455,7 +16051,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs4(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_load_fs4",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15492,6 +16088,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs4(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_repos_load_fs4", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -15587,6 +16187,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs3(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -15600,7 +16201,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs3(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_load_fs3",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15625,6 +16226,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_repos_load_fs3", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -15719,6 +16324,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs2(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -15729,7 +16335,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_load_fs2",8,9,&obj0,&obj1,&obj2,&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()) {
@@ -15765,6 +16371,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_load_fs2", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -15835,6 +16445,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   svn_error_t *result = 0 ;
@@ -15843,7 +16454,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOzO|O:svn_repos_load_fs",&obj0,&obj1,&obj2,&obj3,&arg5,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_load_fs",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -15879,6 +16490,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_load_fs", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg7 = obj5;
   }
@@ -15954,7 +16569,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs_revprops(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg12 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO|O:svn_repos_load_fs_revprops",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_load_fs_revprops",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16068,7 +16683,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_magic_header_record_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_magic_header_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_magic_header_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16095,7 +16710,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_magic_header_record_get(PyObje
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(int,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_magic_header_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_magic_header_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16117,7 +16732,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_uuid_record_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_uuid_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_uuid_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16144,7 +16759,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_uuid_record_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_uuid_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_uuid_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16166,7 +16781,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_new_revision_record_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_new_revision_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_new_revision_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16193,7 +16808,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_new_revision_record_get(PyObje
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_new_revision_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_new_revision_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16215,7 +16830,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_new_node_record_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_new_node_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_new_node_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16242,7 +16857,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_new_node_record_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_new_node_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_new_node_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16264,7 +16879,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_revision_property_set(PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_set_revision_property_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_set_revision_property_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16291,7 +16906,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_revision_property_get(PyOb
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_string_t const *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_set_revision_property_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_set_revision_property_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16313,7 +16928,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_node_property_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_set_node_property_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_set_node_property_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16340,7 +16955,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_node_property_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_string_t const *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_set_node_property_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_set_node_property_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16362,7 +16977,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_delete_node_property_set(PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_delete_node_property_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_delete_node_property_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16389,7 +17004,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_delete_node_property_get(PyObj
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_delete_node_property_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_delete_node_property_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16411,7 +17026,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_remove_node_props_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_remove_node_props_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_remove_node_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16438,7 +17053,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_remove_node_props_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_remove_node_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_remove_node_props_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16460,7 +17075,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_fulltext_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_set_fulltext_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_set_fulltext_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16487,7 +17102,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_fulltext_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_stream_t **,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_set_fulltext_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_set_fulltext_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16509,7 +17124,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_apply_textdelta_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_apply_textdelta_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_apply_textdelta_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16536,7 +17151,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_apply_textdelta_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_txdelta_window_handler_t *,void **,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_apply_textdelta_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_apply_textdelta_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16558,7 +17173,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_close_node_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_close_node_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_close_node_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16585,7 +17200,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_close_node_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_close_node_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_close_node_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16607,7 +17222,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_close_revision_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_close_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_close_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -16634,7 +17249,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_close_revision_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_close_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_t_close_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -16651,7 +17266,7 @@ fail:
 
 SWIGINTERN PyObject *svn_repos_parse_fns3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_repos_parse_fns3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -16679,7 +17294,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream3(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_repos_parse_dumpstream3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_dumpstream3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -16782,6 +17397,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser6(PyObject *SWIGUNUSEDPA
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
@@ -16797,7 +17413,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser6(PyObject *SWIGUNUSEDPA
   arg16 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOzOOOOOO|O:svn_repos_get_fs_build_parser6",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&arg9,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_fs_build_parser6",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -16835,6 +17451,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser6(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_repos_get_fs_build_parser6", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg10 = (svn_boolean_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -16952,6 +17572,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser5(PyObject *SWIGUNUSEDPA
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
@@ -16966,7 +17587,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser5(PyObject *SWIGUNUSEDPA
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_fs_build_parser5",12,13,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&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()) {
@@ -17004,6 +17625,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser5(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_repos_get_fs_build_parser5", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg10 = (svn_boolean_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -17112,6 +17737,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser4(PyObject *SWIGUNUSEDPA
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
@@ -17123,7 +17749,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser4(PyObject *SWIGUNUSEDPA
   arg12 = _global_pool;
   arg1 = &temp1;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_fs_build_parser4",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -17161,6 +17787,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser4(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_repos_get_fs_build_parser4", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_repos_notify_func_t * tmp =
     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()) {
@@ -17234,7 +17864,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_new_revision_record_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_new_revision_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_new_revision_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17261,7 +17891,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_new_revision_record_get(PyObje
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_new_revision_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_new_revision_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17283,7 +17913,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_uuid_record_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_uuid_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_uuid_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17310,7 +17940,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_uuid_record_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_uuid_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_uuid_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17332,7 +17962,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_new_node_record_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_new_node_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_new_node_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17359,7 +17989,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_new_node_record_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_new_node_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_new_node_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17381,7 +18011,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_revision_property_set(PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_set_revision_property_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_set_revision_property_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17408,7 +18038,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_revision_property_get(PyOb
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_string_t const *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_set_revision_property_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_set_revision_property_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17430,7 +18060,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_node_property_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_set_node_property_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_set_node_property_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17457,7 +18087,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_node_property_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_string_t const *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_set_node_property_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_set_node_property_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17479,7 +18109,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_delete_node_property_set(PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_delete_node_property_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_delete_node_property_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17506,7 +18136,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_delete_node_property_get(PyObj
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_delete_node_property_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_delete_node_property_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17528,7 +18158,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_remove_node_props_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_remove_node_props_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_remove_node_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17555,7 +18185,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_remove_node_props_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_remove_node_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_remove_node_props_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17577,7 +18207,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_fulltext_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_set_fulltext_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_set_fulltext_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17604,7 +18234,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_fulltext_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_stream_t **,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_set_fulltext_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_set_fulltext_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17626,7 +18256,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_apply_textdelta_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_apply_textdelta_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_apply_textdelta_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17653,7 +18283,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_apply_textdelta_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_txdelta_window_handler_t *,void **,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_apply_textdelta_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_apply_textdelta_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17675,7 +18305,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_close_node_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_close_node_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_close_node_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17702,7 +18332,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_close_node_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_close_node_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_close_node_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17724,7 +18354,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_close_revision_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_close_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_close_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17751,7 +18381,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_close_revision_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_close_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_t_close_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17768,7 +18398,7 @@ fail:
 
 SWIGINTERN PyObject *svn_repos_parse_fns2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_repos_parse_fns2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -17780,7 +18410,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_new_revision_record_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_new_revision_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_new_revision_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17807,7 +18437,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_new_revision_record_get(PyObje
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_new_revision_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_new_revision_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17829,7 +18459,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_uuid_record_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_uuid_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_uuid_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17856,7 +18486,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_uuid_record_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_uuid_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_uuid_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17878,7 +18508,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_new_node_record_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_new_node_record_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_new_node_record_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17905,7 +18535,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_new_node_record_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void **,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_new_node_record_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_new_node_record_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17927,7 +18557,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_revision_property_set(PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_set_revision_property_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_set_revision_property_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17954,7 +18584,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_revision_property_get(PyOb
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_string_t const *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_set_revision_property_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_set_revision_property_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17976,7 +18606,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_node_property_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_set_node_property_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_set_node_property_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18003,7 +18633,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_node_property_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *,char const *,svn_string_t const *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_set_node_property_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_set_node_property_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18025,7 +18655,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_remove_node_props_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_remove_node_props_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_remove_node_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18052,7 +18682,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_remove_node_props_get(PyObject
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_remove_node_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_remove_node_props_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18074,7 +18704,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_fulltext_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_set_fulltext_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_set_fulltext_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18101,7 +18731,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_fulltext_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_stream_t **,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_set_fulltext_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_set_fulltext_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18123,7 +18753,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_close_node_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_close_node_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_close_node_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18150,7 +18780,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_close_node_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_close_node_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_close_node_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18172,7 +18802,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_close_revision_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_close_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_close_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18199,7 +18829,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_close_revision_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_close_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parser_fns_t_close_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18216,7 +18846,7 @@ fail:
 
 SWIGINTERN PyObject *svn_repos_parser_fns_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_repos_parse_fns_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -18242,7 +18872,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream2(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_parse_dumpstream2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_dumpstream2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -18332,7 +18962,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_parse_dumpstream",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_dumpstream",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -18421,6 +19051,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser3(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -18432,7 +19063,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser3(PyObject *SWIGUNUSEDPA
   arg10 = _global_pool;
   arg1 = &temp1;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_fs_build_parser3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -18458,6 +19089,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser3(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_get_fs_build_parser3", "parent_dir");
+    if (PyErr_Occurred()) 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()) {
@@ -18545,6 +19180,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser2(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -18554,7 +19190,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser2(PyObject *SWIGUNUSEDPA
   arg8 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOz|O:svn_repos_get_fs_build_parser2",&obj0,&obj1,&obj2,&obj3,&arg7,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_fs_build_parser2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -18584,6 +19220,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser2(PyObject *SWIGUNUSEDPA
       }
     }
   }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_get_fs_build_parser2", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -18656,6 +19296,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -18665,7 +19306,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser(PyObject *SWIGUNUSEDPAR
   arg8 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOz|O:svn_repos_get_fs_build_parser",&obj0,&obj1,&obj2,&obj3,&arg7,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_get_fs_build_parser",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -18695,6 +19336,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser(PyObject *SWIGUNUSEDPAR
       }
     }
   }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_repos_get_fs_build_parser", "parent_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -18758,7 +19403,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_initialize(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_repos_authz_initialize",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_authz_initialize",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -18812,6 +19457,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read4(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_authz_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -18829,7 +19476,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read4(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOOO|OO:svn_repos_authz_read4",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_authz_read4",6,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_authz_read4", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_authz_read4", "groups_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -18929,6 +19584,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read3(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_authz_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -18944,7 +19601,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read3(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|OO:svn_repos_authz_read3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_authz_read3",4,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_authz_read3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_authz_read3", "groups_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -19026,6 +19691,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read2(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_authz_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -19035,7 +19702,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_repos_authz_read2",&arg2,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_authz_read2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_authz_read2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_authz_read2", "groups_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -19096,6 +19771,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_authz_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -19105,7 +19781,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_repos_authz_read",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_authz_read",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_repos_authz_read", "file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -19186,7 +19866,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_parse2(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:svn_repos_authz_parse2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_authz_parse2",4,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -19303,7 +19983,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_parse(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_authz_parse",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_authz_parse",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg2 = NULL;
@@ -19385,6 +20065,9 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_check_access(PyObject *SWIGUNUSEDPARM
   svn_boolean_t temp6 ;
   int res6 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -19394,7 +20077,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_check_access(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg7 = _global_pool;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"OsszO|O:svn_repos_authz_check_access",&obj0,&arg2,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_authz_check_access",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     arg1 = (svn_authz_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_authz_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19402,6 +20085,18 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_check_access(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_repos_authz_check_access", "repos_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_authz_check_access", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_repos_authz_check_access", "user");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_repos_authz_access_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -19473,7 +20168,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_check_revision_access(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_check_revision_access",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_check_revision_access",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -19538,14 +20233,14 @@ fail:
 
 SWIGINTERN PyObject *svn_repos_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_repos_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_authz_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_authz_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -19568,7 +20263,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_magic_header_record(PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns3_invoke_magic_header_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_magic_header_record",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -19637,6 +20332,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_uuid_record(PyObject *SWI
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -19645,7 +20341,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_uuid_record(PyObject *SWI
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OzO|O:svn_repos_parse_fns3_invoke_uuid_record",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_uuid_record",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -19653,6 +20349,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_uuid_record(PyObject *SWI
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_repos_parse_fns3_invoke_uuid_record", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -19720,7 +20420,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_new_revision_record(PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns3_invoke_new_revision_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_new_revision_record",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -19807,7 +20507,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_new_node_record(PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns3_invoke_new_node_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_new_node_record",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -19882,10 +20582,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_revision_property(PyO
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_repos_parse_fns3_invoke_set_revision_property",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_set_revision_property",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -19901,15 +20602,23 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_revision_property(PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_parse_fns3_invoke_set_revision_property", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -19947,10 +20656,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_node_property(PyObjec
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_repos_parse_fns3_invoke_set_node_property",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_set_node_property",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -19966,15 +20676,23 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_node_property(PyObjec
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_parse_fns3_invoke_set_node_property", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -20010,9 +20728,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_delete_node_property(PyOb
   char *arg3 = (char *) 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOs:svn_repos_parse_fns3_invoke_delete_node_property",&obj0,&obj1,&arg3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_delete_node_property",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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()) {
@@ -20028,6 +20747,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_delete_node_property(PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_parse_fns3_invoke_delete_node_property", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_repos_parse_fns3_invoke_delete_node_property(arg1,arg2,(char const *)arg3);
@@ -20060,7 +20783,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_remove_node_props(PyObjec
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_remove_node_props",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_remove_node_props",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20111,7 +20834,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_fulltext(PyObject *SW
   svn_error_t *result = 0 ;
   
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_set_fulltext",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_set_fulltext",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20181,7 +20904,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_apply_textdelta(PyObject
     if (arg2 == NULL) SWIG_fail;
   }
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_apply_textdelta",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_apply_textdelta",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20241,7 +20964,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_close_node(PyObject *SWIG
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_close_node",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_close_node",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20289,7 +21012,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_close_revision(PyObject *
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_close_revision",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns3_invoke_close_revision",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20350,7 +21073,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_new_revision_record(PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns2_invoke_new_revision_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_new_revision_record",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -20425,6 +21148,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_uuid_record(PyObject *SWI
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -20433,7 +21157,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_uuid_record(PyObject *SWI
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OzO|O:svn_repos_parse_fns2_invoke_uuid_record",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_uuid_record",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -20441,6 +21165,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_uuid_record(PyObject *SWI
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_repos_parse_fns2_invoke_uuid_record", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
@@ -20508,7 +21236,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_new_node_record(PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns2_invoke_new_node_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_new_node_record",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -20583,10 +21311,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_revision_property(PyO
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_repos_parse_fns2_invoke_set_revision_property",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_set_revision_property",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -20602,15 +21331,23 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_revision_property(PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_parse_fns2_invoke_set_revision_property", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -20648,10 +21385,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_node_property(PyObjec
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_repos_parse_fns2_invoke_set_node_property",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_set_node_property",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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()) {
@@ -20667,15 +21405,23 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_node_property(PyObjec
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_parse_fns2_invoke_set_node_property", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -20711,9 +21457,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_delete_node_property(PyOb
   char *arg3 = (char *) 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOs:svn_repos_parse_fns2_invoke_delete_node_property",&obj0,&obj1,&arg3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_delete_node_property",3,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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()) {
@@ -20729,6 +21476,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_delete_node_property(PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_parse_fns2_invoke_delete_node_property", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_repos_parse_fns2_invoke_delete_node_property(arg1,arg2,(char const *)arg3);
@@ -20761,7 +21512,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_remove_node_props(PyObjec
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_remove_node_props",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_remove_node_props",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20812,7 +21563,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_fulltext(PyObject *SW
   svn_error_t *result = 0 ;
   
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_set_fulltext",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_set_fulltext",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20882,7 +21633,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_apply_textdelta(PyObject
     if (arg2 == NULL) SWIG_fail;
   }
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_apply_textdelta",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_apply_textdelta",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20942,7 +21693,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_close_node(PyObject *SWIG
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_close_node",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_close_node",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -20990,7 +21741,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_close_revision(PyObject *
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_close_revision",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_parse_fns2_invoke_close_revision",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -21044,6 +21795,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_func(PyObject *SWIGUNUSEDPARM(
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -21053,7 +21805,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_func(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_repos_invoke_authz_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_authz_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_repos_authz_func_t * tmp =
     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);
@@ -21069,6 +21821,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_func(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_invoke_authz_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None) {
       arg5 = NULL;
     } else if (SWIG_ConvertPtr(obj3, (void **) &arg5, 0, 0) == -1) {
@@ -21137,6 +21893,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_callback(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -21146,7 +21903,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_callback(PyObject *SWIGUNUSEDP
   SWIG_fail;
   arg7 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOOsO|O:svn_repos_invoke_authz_callback",&obj0,&obj1,&obj2,&arg5,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_authz_callback",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_repos_authz_callback_t * tmp =
     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);
@@ -21168,6 +21925,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_callback(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_repos_invoke_authz_callback", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None) {
       arg6 = NULL;
     } else if (SWIG_ConvertPtr(obj4, (void **) &arg6, 0, 0) == -1) {
@@ -21237,7 +21998,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_notify_func(PyObject *SWIGUNUSEDPARM
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_notify_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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);
@@ -21303,6 +22064,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_dump_filter_func(PyObject *SWIGUNUSE
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -21312,7 +22074,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_dump_filter_func(PyObject *SWIGUNUSE
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_repos_invoke_dump_filter_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_dump_filter_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_repos_dump_filter_func_t * tmp =
     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);
@@ -21328,6 +22090,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_dump_filter_func(PyObject *SWIGUNUSE
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_invoke_dump_filter_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None) {
       arg5 = NULL;
     } else if (SWIG_ConvertPtr(obj3, (void **) &arg5, 0, 0) == -1) {
@@ -21396,7 +22162,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_freeze_func(PyObject *SWIGUNUSEDPARM
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_freeze_func",2,3,&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);
@@ -21463,6 +22229,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_history_func(PyObject *SWIGUNUSEDPAR
   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 ;
@@ -21471,7 +22238,7 @@ 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_UnpackTuple(args,(char *)"svn_repos_invoke_history_func",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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);
@@ -21489,6 +22256,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_history_func(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_invoke_history_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -21551,7 +22322,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_path_change_receiver(PyObject *SWIGU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_invoke_path_change_receiver",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_path_change_receiver",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_repos_path_change_receiver_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -21631,7 +22402,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_log_entry_receiver(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_invoke_log_entry_receiver",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_log_entry_receiver",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_repos_log_entry_receiver_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
@@ -21709,6 +22480,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_file_rev_handler(PyObject *SWIGUNUSE
   void *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -21730,7 +22502,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_file_rev_handler(PyObject *SWIGUNUSE
     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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_file_rev_handler",6,7,&obj0,&obj1,&obj2,&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);
@@ -21748,6 +22520,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_file_rev_handler(PyObject *SWIGUNUSE
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_repos_invoke_file_rev_handler", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -21836,7 +22612,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_verify_callback(PyObject *SWIGUNUSED
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_invoke_verify_callback",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_verify_callback",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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);
@@ -21921,7 +22697,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_warning_func(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_invoke_authz_warning_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_repos_invoke_authz_warning_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_repos_authz_warning_func_t * tmp =
     svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, svn_argnum_obj0);
@@ -21975,77 +22751,77 @@ fail:
 
 SWIGINTERN PyObject *svn_repos_authz_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_repos_authz_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_repos_dump_filter_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_repos_freeze_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_repos_history_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_repos_path_change_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_repos_log_entry_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&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();
 }
 
 SWIGINTERN PyObject *svn_repos_authz_warning_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -22453,6 +23229,8 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client_conflict_option_t = {"_p_svn_client_conflict_option_t", "svn_client_conflict_option_t *", 0, 0, (void*)0, 0};
 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_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
@@ -22613,6 +23391,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
+  &_swigt__p_svn_client__shelf_version_t,
+  &_swigt__p_svn_client_conflict_option_t,
   &_swigt__p_svn_commit_info_t,
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
@@ -22773,6 +23553,8 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client_conflict_option_t[] = {  {&_swigt__p_svn_client_conflict_option_t, 0, 0, 0},{0, 0, 0, 0}};
 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_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -22933,6 +23715,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
+  _swigc__p_svn_client__shelf_version_t,
+  _swigc__p_svn_client_conflict_option_t,
   _swigc__p_svn_commit_info_t,
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
diff --git a/subversion/bindings/swig/python/svn_wc.c b/subversion/bindings/swig/python/svn_wc.c
index dc89b6b..02d2931 100644
--- a/subversion/bindings/swig/python/svn_wc.c
+++ b/subversion/bindings/swig/python/svn_wc.c
@@ -8,13 +8,15 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+
+
 
 #ifndef SWIGPYTHON
 #define SWIGPYTHON
 #endif
 
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#define SWIG_PYTHON_CLASSIC
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -3087,93 +3089,95 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_svn_checksum_ctx_t swig_types[101]
 #define SWIGTYPE_p_svn_checksum_kind_t swig_types[102]
 #define SWIGTYPE_p_svn_checksum_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_delta_path_driver_state_t swig_types[107]
-#define SWIGTYPE_p_svn_depth_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_io_dirent2_t swig_types[114]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[115]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[116]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[117]
-#define SWIGTYPE_p_svn_lock_t swig_types[118]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[119]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[120]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[121]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[122]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[123]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[124]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[125]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[126]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[127]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[128]
-#define SWIGTYPE_p_svn_opt_subcommand_desc3_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_description2_t swig_types[157]
-#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[158]
-#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[159]
-#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[160]
-#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[161]
-#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[162]
-#define SWIGTYPE_p_svn_wc_context_t swig_types[163]
-#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[164]
-#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[165]
-#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[166]
-#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[167]
-#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[168]
-#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[169]
-#define SWIGTYPE_p_svn_wc_entry_t swig_types[170]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[171]
-#define SWIGTYPE_p_svn_wc_external_item_t swig_types[172]
-#define SWIGTYPE_p_svn_wc_info_t swig_types[173]
-#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[174]
-#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[175]
-#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[176]
-#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[177]
-#define SWIGTYPE_p_svn_wc_notify_t swig_types[178]
-#define SWIGTYPE_p_svn_wc_operation_t swig_types[179]
-#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[180]
-#define SWIGTYPE_p_svn_wc_schedule_t swig_types[181]
-#define SWIGTYPE_p_svn_wc_status2_t swig_types[182]
-#define SWIGTYPE_p_svn_wc_status3_t swig_types[183]
-#define SWIGTYPE_p_svn_wc_status_t swig_types[184]
-#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[185]
-#define SWIGTYPE_p_unsigned_char swig_types[186]
-#define SWIGTYPE_p_unsigned_long swig_types[187]
-#define SWIGTYPE_p_void swig_types[188]
-static swig_type_info *swig_types[190];
-static swig_module_info swig_module = {swig_types, 189, 0, 0, 0, 0};
+#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[104]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[105]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[106]
+#define SWIGTYPE_p_svn_config_t swig_types[107]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[108]
+#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[109]
+#define SWIGTYPE_p_svn_depth_t swig_types[110]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[111]
+#define SWIGTYPE_p_svn_dirent_t swig_types[112]
+#define SWIGTYPE_p_svn_errno_t swig_types[113]
+#define SWIGTYPE_p_svn_error_t swig_types[114]
+#define SWIGTYPE_p_svn_fs_lock_target_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_desc3_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_adm_access_t swig_types[155]
+#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[156]
+#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[157]
+#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[158]
+#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[159]
+#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[160]
+#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[161]
+#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[162]
+#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[163]
+#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[164]
+#define SWIGTYPE_p_svn_wc_context_t swig_types[165]
+#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[166]
+#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[167]
+#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[168]
+#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[169]
+#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[170]
+#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[171]
+#define SWIGTYPE_p_svn_wc_entry_t swig_types[172]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[173]
+#define SWIGTYPE_p_svn_wc_external_item_t swig_types[174]
+#define SWIGTYPE_p_svn_wc_info_t swig_types[175]
+#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[176]
+#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[177]
+#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[178]
+#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[179]
+#define SWIGTYPE_p_svn_wc_notify_t swig_types[180]
+#define SWIGTYPE_p_svn_wc_operation_t swig_types[181]
+#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[182]
+#define SWIGTYPE_p_svn_wc_schedule_t swig_types[183]
+#define SWIGTYPE_p_svn_wc_status2_t swig_types[184]
+#define SWIGTYPE_p_svn_wc_status3_t swig_types[185]
+#define SWIGTYPE_p_svn_wc_status_t swig_types[186]
+#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[187]
+#define SWIGTYPE_p_unsigned_char swig_types[188]
+#define SWIGTYPE_p_unsigned_long swig_types[189]
+#define SWIGTYPE_p_void swig_types[190]
+static swig_type_info *swig_types[192];
+static swig_module_info swig_module = {swig_types, 191, 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)
 
@@ -3184,6 +3188,12 @@ static swig_module_info swig_module = {swig_types, 189, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
 
 /*-----------------------------------------------
               @(target):= _wc.so
@@ -3210,6 +3220,7 @@ static swig_module_info swig_module = {swig_types, 189, 0, 0, 0, 0};
 
 
 #include "swigutil_py.h"
+#include "swigutil_py3c.h"
 
 
 static PyObject * _global_py_pool = NULL;
@@ -3916,7 +3927,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_version(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":svn_wc_version")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_version",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -3956,7 +3967,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_context_create(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_wc_context_create",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_context_create",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg2 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -4031,7 +4042,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_context_destroy(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_context_destroy",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_context_destroy",1,1,&obj0)) 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()) {
@@ -4077,6 +4088,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open3(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -4088,7 +4100,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open3(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_adm_open3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_open3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -4096,6 +4108,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_open3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -4168,6 +4184,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open2(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -4178,7 +4195,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_open2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_open2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -4186,6 +4203,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_open2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -4254,6 +4275,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -4264,7 +4286,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_open",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_open",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -4272,6 +4294,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_open", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -4342,6 +4368,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open3(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -4353,7 +4380,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open3(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_adm_probe_open3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_probe_open3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -4361,6 +4388,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open3(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_probe_open3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -4433,6 +4464,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open2(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -4443,7 +4475,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open2(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_probe_open2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_probe_open2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -4451,6 +4483,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open2(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_probe_open2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -4519,6 +4555,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -4529,7 +4566,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_probe_open",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_probe_open",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -4537,6 +4574,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_probe_open", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -4609,6 +4650,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open_anchor(PyObject *SWIGUNUSEDPARM(self)
   svn_wc_adm_access_t *temp1 ;
   svn_wc_adm_access_t *temp2 ;
   char *temp3 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -4622,7 +4664,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open_anchor(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_wc_adm_open_anchor",&arg4,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_open_anchor",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_adm_open_anchor", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg5 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -4685,7 +4731,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open_anchor(PyObject *SWIGUNUSEDPARM(self)
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -4713,6 +4759,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_retrieve(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -4721,13 +4768,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_retrieve(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_adm_retrieve",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_retrieve",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_retrieve", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -4783,6 +4834,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_retrieve(PyObject *SWIGUNUSEDPARM(se
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -4791,13 +4843,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_retrieve(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_adm_probe_retrieve",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_probe_retrieve",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_probe_retrieve", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -4857,6 +4913,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try3(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -4868,7 +4925,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try3(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg8 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_adm_probe_try3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_probe_try3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -4876,6 +4933,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_probe_try3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -4948,6 +5009,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try2(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -4958,7 +5020,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try2(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_probe_try2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_probe_try2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -4966,6 +5028,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_probe_try2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -5034,6 +5100,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   svn_wc_adm_access_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -5044,7 +5111,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try(PyObject *SWIGUNUSEDPARM(self),
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_probe_try",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_probe_try",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -5052,6 +5119,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_adm_probe_try", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -5122,7 +5193,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_close2(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_adm_close2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_close2",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5174,7 +5245,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_close(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_adm_close",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_close",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5212,7 +5283,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_access_path(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_adm_access_path",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_access_path",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5240,7 +5311,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_access_pool(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   apr_pool_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_adm_access_pool",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_access_pool",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5269,7 +5340,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_locked(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_adm_locked",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_adm_locked",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5305,6 +5376,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_locked2(PyObject *SWIGUNUSEDPARM(self), PyObje
   svn_boolean_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -5314,13 +5386,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_locked2(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_locked2",&obj0,&arg4,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_locked2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_locked2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -5381,6 +5457,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_locked(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *_global_py_pool = NULL ;
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -5389,7 +5466,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_locked(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_wc_locked",&arg2,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_locked",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_locked", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -5441,6 +5522,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_is_adm_dir(PyObject *SWIGUNUSEDPARM(self), PyO
   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_boolean_t result;
   
@@ -5448,7 +5530,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_is_adm_dir(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_wc_is_adm_dir",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_is_adm_dir",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_is_adm_dir", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -5490,7 +5576,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_adm_dir(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_wc_get_adm_dir",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_adm_dir",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -5526,6 +5612,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_adm_dir(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
   
@@ -5533,7 +5620,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_adm_dir(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_wc_set_adm_dir",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_set_adm_dir",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_set_adm_dir", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -5585,7 +5676,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_init_traversal_info(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_wc_init_traversal_info",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_init_traversal_info",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -5627,7 +5718,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_edited_externals(PyObject *SWIGUNUSEDPARM(self
   
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_edited_externals",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_edited_externals",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5663,7 +5754,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_traversed_depths(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_traversed_depths",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_traversed_depths",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5693,8 +5784,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_target_dir_set(PyObject *SWIG
   struct svn_wc_external_item2_t *arg1 = (struct svn_wc_external_item2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_external_item2_t_target_dir_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_t_target_dir_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5702,6 +5794,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_target_dir_set(PyObject *SWIG
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_external_item2_t_target_dir_set", "target_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->target_dir) free((char *)arg1->target_dir);
@@ -5722,7 +5818,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_target_dir_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item2_t_target_dir_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_t_target_dir_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5742,8 +5838,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_url_set(PyObject *SWIGUNUSEDP
   struct svn_wc_external_item2_t *arg1 = (struct svn_wc_external_item2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_external_item2_t_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_t_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5751,6 +5848,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_url_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_external_item2_t_url_set", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->url) free((char *)arg1->url);
@@ -5771,7 +5872,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_url_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item2_t_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_t_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5793,7 +5894,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_revision_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_external_item2_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5820,7 +5921,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_revision_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item2_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5843,7 +5944,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_peg_revision_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_external_item2_t_peg_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_t_peg_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -5870,7 +5971,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_peg_revision_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item2_t_peg_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_t_peg_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5890,7 +5991,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_external_item2_t(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   struct svn_wc_external_item2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_external_item2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_external_item2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -5912,7 +6013,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_external_item2_t(PyObject *SWIGUNUSEDPA
   struct svn_wc_external_item2_t *arg1 = (struct svn_wc_external_item2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_external_item2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_external_item2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -5936,7 +6037,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_external_item2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_external_item2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5956,7 +6057,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_create(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_wc_external_item2_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6017,7 +6118,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_create(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg2 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_wc_external_item_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -6077,7 +6178,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_dup(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_external_item2_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item2_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6119,8 +6220,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_target_dir_set(PyObject *SWIGU
   struct svn_wc_external_item_t *arg1 = (struct svn_wc_external_item_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_external_item_t_target_dir_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item_t_target_dir_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6128,6 +6230,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_target_dir_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_external_item_t_target_dir_set", "target_dir");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->target_dir) free((char *)arg1->target_dir);
@@ -6148,7 +6254,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_target_dir_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item_t_target_dir_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item_t_target_dir_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6168,8 +6274,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_url_set(PyObject *SWIGUNUSEDPA
   struct svn_wc_external_item_t *arg1 = (struct svn_wc_external_item_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_external_item_t_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item_t_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6177,6 +6284,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_url_set(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_external_item_t_url_set", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->url) free((char *)arg1->url);
@@ -6197,7 +6308,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_url_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item_t_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item_t_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6219,7 +6330,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_revision_set(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_external_item_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6246,7 +6357,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_revision_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6266,7 +6377,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_external_item_t(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   struct svn_wc_external_item_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_external_item_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_external_item_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -6288,7 +6399,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_external_item_t(PyObject *SWIGUNUSEDPAR
   struct svn_wc_external_item_t *arg1 = (struct svn_wc_external_item_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_external_item_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_external_item_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6312,7 +6423,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_external_item_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_external_item_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6331,7 +6442,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_dup(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_external_item_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_external_item_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6378,6 +6489,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_parse_externals_description3(PyObject *SWIGUNU
   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 ;
@@ -6387,7 +6500,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_parse_externals_description3(PyObject *SWIGUNU
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_wc_parse_externals_description3",&arg2,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_parse_externals_description3",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_parse_externals_description3", "defining_directory");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_parse_externals_description3", "desc");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -6452,6 +6573,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_parse_externals_description2(PyObject *SWIGUNU
   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 ;
   
@@ -6460,7 +6583,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_parse_externals_description2(PyObject *SWIGUNU
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_wc_parse_externals_description2",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_parse_externals_description2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_parse_externals_description2", "parent_directory");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_parse_externals_description2", "desc");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -6519,6 +6650,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_parse_externals_description(PyObject *SWIGUNUS
   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 ;
   
@@ -6527,7 +6660,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_parse_externals_description(PyObject *SWIGUNUS
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ss|O:svn_wc_parse_externals_description",&arg2,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_parse_externals_description",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_parse_externals_description", "parent_directory");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_parse_externals_description", "desc");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -6581,8 +6722,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_set(PyObject *SWIGUNUSEDPARM(sel
   struct svn_wc_notify_t *arg1 = (struct svn_wc_notify_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6590,6 +6732,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_set(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_notify_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -6610,7 +6756,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6632,7 +6778,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_action_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_action_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_action_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6659,7 +6805,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_action_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_wc_notify_action_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_action_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_action_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6681,7 +6827,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_kind_set(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6708,7 +6854,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_kind_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6728,8 +6874,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_mime_type_set(PyObject *SWIGUNUSEDPAR
   struct svn_wc_notify_t *arg1 = (struct svn_wc_notify_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_mime_type_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_mime_type_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6737,6 +6884,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_mime_type_set(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_notify_t_mime_type_set", "mime_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->mime_type) free((char *)arg1->mime_type);
@@ -6757,7 +6908,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_mime_type_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_mime_type_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_mime_type_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6779,7 +6930,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_lock_set(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_lock_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_lock_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6806,7 +6957,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_lock_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_lock_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_lock_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6829,7 +6980,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_err_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_err_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_err_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6856,7 +7007,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_err_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_err_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_err_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6888,7 +7039,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_content_state_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_content_state_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_content_state_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6915,7 +7066,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_content_state_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   svn_wc_notify_state_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_content_state_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_content_state_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6937,7 +7088,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_state_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_prop_state_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_prop_state_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -6964,7 +7115,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_state_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_wc_notify_state_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_prop_state_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_prop_state_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -6986,7 +7137,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_lock_state_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_lock_state_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_lock_state_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7013,7 +7164,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_lock_state_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_wc_notify_lock_state_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_lock_state_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_lock_state_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7035,7 +7186,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_revision_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7062,7 +7213,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_revision_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7082,8 +7233,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_changelist_name_set(PyObject *SWIGUNU
   struct svn_wc_notify_t *arg1 = (struct svn_wc_notify_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_changelist_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_changelist_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7091,6 +7243,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_changelist_name_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_notify_t_changelist_name_set", "changelist_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->changelist_name) free((char *)arg1->changelist_name);
@@ -7111,7 +7267,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_changelist_name_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_changelist_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_changelist_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7133,7 +7289,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_merge_range_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_merge_range_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_merge_range_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7160,7 +7316,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_merge_range_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_merge_range_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_merge_range_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_merge_range_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7181,8 +7337,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_url_set(PyObject *SWIGUNUSEDPARM(self
   struct svn_wc_notify_t *arg1 = (struct svn_wc_notify_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7190,6 +7347,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_url_set(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_notify_t_url_set", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->url) free((char *)arg1->url);
@@ -7210,7 +7371,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_url_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7230,8 +7391,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_prefix_set(PyObject *SWIGUNUSEDP
   struct svn_wc_notify_t *arg1 = (struct svn_wc_notify_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_path_prefix_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_path_prefix_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7239,6 +7401,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_prefix_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_notify_t_path_prefix_set", "path_prefix");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path_prefix) free((char *)arg1->path_prefix);
@@ -7259,7 +7425,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_prefix_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_path_prefix_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_path_prefix_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7279,8 +7445,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_name_set(PyObject *SWIGUNUSEDPAR
   struct svn_wc_notify_t *arg1 = (struct svn_wc_notify_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_prop_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_prop_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7288,6 +7455,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_name_set(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_notify_t_prop_name_set", "prop_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->prop_name) free((char *)arg1->prop_name);
@@ -7308,7 +7479,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_name_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_prop_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_prop_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7330,7 +7501,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_rev_props_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_rev_props_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_rev_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7357,7 +7528,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_rev_props_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   apr_hash_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_rev_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_rev_props_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7380,7 +7551,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_old_revision_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_old_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_old_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7407,7 +7578,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_old_revision_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_old_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_old_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7429,7 +7600,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_original_start_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_original_start_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_original_start_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7456,7 +7627,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_original_start_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_original_start_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_original_start_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7478,7 +7649,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_original_length_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_original_length_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_original_length_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7505,7 +7676,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_original_length_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_original_length_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_original_length_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7527,7 +7698,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_modified_start_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_modified_start_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_modified_start_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7554,7 +7725,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_modified_start_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_modified_start_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_modified_start_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7576,7 +7747,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_modified_length_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_modified_length_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_modified_length_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7603,7 +7774,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_modified_length_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_modified_length_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_modified_length_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7625,7 +7796,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_matched_line_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_matched_line_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_matched_line_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7652,7 +7823,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_matched_line_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_matched_line_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_matched_line_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7674,7 +7845,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_fuzz_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_fuzz_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_fuzz_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7701,7 +7872,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_fuzz_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_linenum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_fuzz_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_notify_t_hunk_fuzz_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7720,7 +7891,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_notify_t(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   struct svn_wc_notify_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_notify_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_notify_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -7742,7 +7913,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_notify_t(PyObject *SWIGUNUSEDPARM(self)
   struct svn_wc_notify_t *arg1 = (struct svn_wc_notify_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_notify_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_notify_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7766,7 +7937,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_notify_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_notify_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7778,6 +7949,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_notify(PyObject *SWIGUNUSEDPARM(self),
   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_wc_notify_t *result = 0 ;
@@ -7786,7 +7958,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_notify(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_create_notify",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_create_notify",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_create_notify", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_wc_notify_action_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -7830,6 +8006,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_notify_url(PyObject *SWIGUNUSEDPARM(sel
   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_wc_notify_t *result = 0 ;
@@ -7838,7 +8015,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_notify_url(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_create_notify_url",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_create_notify_url",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_create_notify_url", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_wc_notify_action_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -7889,7 +8070,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_notify(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_dup_notify",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_dup_notify",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -7931,8 +8112,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_url_set(PyObject *SWI
   struct svn_wc_conflict_version_t *arg1 = (struct svn_wc_conflict_version_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_version_t_repos_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_repos_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -7940,6 +8122,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_url_set(PyObject *SWI
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_version_t_repos_url_set", "repos_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_url) free((char *)arg1->repos_url);
@@ -7960,7 +8146,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_url_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_repos_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_repos_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -7982,7 +8168,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_peg_rev_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_version_t_peg_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_peg_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8009,7 +8195,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_peg_rev_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_peg_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_peg_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8029,8 +8215,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_path_in_repos_set(PyObject
   struct svn_wc_conflict_version_t *arg1 = (struct svn_wc_conflict_version_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_version_t_path_in_repos_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_path_in_repos_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8038,6 +8225,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_path_in_repos_set(PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_version_t_path_in_repos_set", "path_in_repos");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path_in_repos) free((char *)arg1->path_in_repos);
@@ -8058,7 +8249,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_path_in_repos_get(PyObject
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_path_in_repos_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_path_in_repos_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8080,7 +8271,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_node_kind_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_version_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_node_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8107,7 +8298,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_node_kind_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_node_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_node_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8127,8 +8318,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_uuid_set(PyObject *SW
   struct svn_wc_conflict_version_t *arg1 = (struct svn_wc_conflict_version_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_version_t_repos_uuid_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_repos_uuid_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8136,6 +8328,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_uuid_set(PyObject *SW
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_version_t_repos_uuid_set", "repos_uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_uuid) free((char *)arg1->repos_uuid);
@@ -8156,7 +8352,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_uuid_get(PyObject *SW
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_repos_uuid_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_t_repos_uuid_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8175,7 +8371,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_conflict_version_t(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   struct svn_wc_conflict_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_conflict_version_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_conflict_version_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -8197,7 +8393,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_conflict_version_t(PyObject *SWIGUNUSED
   struct svn_wc_conflict_version_t *arg1 = (struct svn_wc_conflict_version_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_conflict_version_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_conflict_version_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8221,7 +8417,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_conflict_version_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_conflict_version_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8236,6 +8432,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_create2(PyObject *SWIGUNUSEDP
   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 ;
   PyObject * obj5 = 0 ;
@@ -8245,7 +8444,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_create2(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sssOO|O:svn_wc_conflict_version_create2",&arg1,&arg2,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_create2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflict_version_create2", "repos_root_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_version_create2", "repos_uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_conflict_version_create2", "repos_relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
@@ -8297,6 +8508,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_create(PyObject *SWIGUNUSEDPA
   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 ;
@@ -8306,7 +8519,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_create(PyObject *SWIGUNUSEDPA
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_wc_conflict_version_create",&arg1,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_create",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflict_version_create", "repos_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_version_create", "path_in_repos");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -8363,7 +8584,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_dup(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_conflict_version_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_version_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8405,8 +8626,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_path_set(PyObject *SWIG
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8414,6 +8636,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_path_set(PyObject *SWIG
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_description_t_path_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->path) free((char *)arg1->path);
@@ -8434,7 +8660,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_path_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8456,7 +8682,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_node_kind_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_node_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8483,7 +8709,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_node_kind_get(PyObject
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_node_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_node_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8505,7 +8731,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_kind_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8532,7 +8758,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_kind_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_wc_conflict_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8552,8 +8778,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_property_name_set(PyObj
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_property_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_property_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8561,6 +8788,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_property_name_set(PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_description_t_property_name_set", "property_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->property_name) free((char *)arg1->property_name);
@@ -8581,7 +8812,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_property_name_get(PyObj
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_property_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_property_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8603,7 +8834,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_is_binary_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_is_binary_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_is_binary_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8630,7 +8861,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_is_binary_get(PyObject
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_is_binary_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_is_binary_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8650,8 +8881,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_mime_type_set(PyObject
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_mime_type_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_mime_type_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8659,6 +8891,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_mime_type_set(PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_description_t_mime_type_set", "mime_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->mime_type) free((char *)arg1->mime_type);
@@ -8679,7 +8915,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_mime_type_get(PyObject
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_mime_type_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_mime_type_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8701,7 +8937,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_access_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_access_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_access_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8728,7 +8964,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_access_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_wc_adm_access_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_access_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_access_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8751,7 +8987,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_action_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_action_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_action_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8778,7 +9014,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_action_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_wc_conflict_action_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_action_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_action_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8800,7 +9036,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_reason_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_reason_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_reason_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8827,7 +9063,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_reason_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_wc_conflict_reason_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_reason_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_reason_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8847,8 +9083,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_base_file_set(PyObject
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_base_file_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_base_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8856,6 +9093,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_base_file_set(PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_description_t_base_file_set", "base_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->base_file) free((char *)arg1->base_file);
@@ -8876,7 +9117,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_base_file_get(PyObject
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_base_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_base_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8896,8 +9137,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_their_file_set(PyObject
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_their_file_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_their_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8905,6 +9147,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_their_file_set(PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_description_t_their_file_set", "their_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->their_file) free((char *)arg1->their_file);
@@ -8925,7 +9171,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_their_file_get(PyObject
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_their_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_their_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8945,8 +9191,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_my_file_set(PyObject *S
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_my_file_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_my_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -8954,6 +9201,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_my_file_set(PyObject *S
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_description_t_my_file_set", "my_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->my_file) free((char *)arg1->my_file);
@@ -8974,7 +9225,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_my_file_get(PyObject *S
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_my_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_my_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -8994,8 +9245,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_merged_file_set(PyObjec
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_merged_file_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_merged_file_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9003,6 +9255,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_merged_file_set(PyObjec
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflict_description_t_merged_file_set", "merged_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->merged_file) free((char *)arg1->merged_file);
@@ -9023,7 +9279,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_merged_file_get(PyObjec
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_merged_file_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_merged_file_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9045,7 +9301,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_operation_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_operation_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_operation_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9072,7 +9328,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_operation_get(PyObject
   PyObject * obj0 = 0 ;
   svn_wc_operation_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_operation_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_operation_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9094,7 +9350,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_src_left_version_set(Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_src_left_version_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_src_left_version_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9121,7 +9377,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_src_left_version_get(Py
   PyObject * obj0 = 0 ;
   svn_wc_conflict_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_src_left_version_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_src_left_version_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9144,7 +9400,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_src_right_version_set(P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_src_right_version_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_src_right_version_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9171,7 +9427,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_src_right_version_get(P
   PyObject * obj0 = 0 ;
   svn_wc_conflict_version_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_src_right_version_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_t_src_right_version_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9191,7 +9447,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_conflict_description_t(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   struct svn_wc_conflict_description_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_conflict_description_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_conflict_description_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -9213,7 +9469,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_conflict_description_t(PyObject *SWIGUN
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_conflict_description_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_conflict_description_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9237,7 +9493,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_conflict_description_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_conflict_description_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9248,6 +9504,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_text2(PyObject *SW
   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 ;
   
@@ -9255,7 +9512,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_text2(PyObject *SW
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_wc_conflict_description_create_text2",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_create_text2",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflict_description_create_text2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -9293,6 +9554,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_text(PyObject *SWI
   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_wc_conflict_description_t *result = 0 ;
@@ -9301,7 +9563,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_text(PyObject *SWI
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_conflict_description_create_text",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_create_text",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflict_description_create_text", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -9346,7 +9612,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_prop2(PyObject *SW
   apr_pool_t *arg4 = (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 ;
   svn_wc_conflict_description2_t *result = 0 ;
   
@@ -9354,13 +9622,21 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_prop2(PyObject *SW
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOs|O:svn_wc_conflict_description_create_prop2",&arg1,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_create_prop2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflict_description_create_prop2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_node_kind_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
       SWIG_fail;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_conflict_description_create_prop2", "property_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -9400,8 +9676,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_prop(PyObject *SWI
   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_wc_conflict_description_t *result = 0 ;
   
@@ -9409,7 +9687,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_prop(PyObject *SWI
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOs|O:svn_wc_conflict_description_create_prop",&arg1,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_create_prop",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflict_description_create_prop", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -9422,6 +9704,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_prop(PyObject *SWI
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_conflict_description_create_prop", "property_name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -9462,6 +9748,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree2(PyObject *SW
   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 ;
@@ -9473,7 +9760,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree2(PyObject *SW
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_conflict_description_create_tree2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_create_tree2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflict_description_create_tree2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_node_kind_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -9539,6 +9830,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree(PyObject *SWI
   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 ;
@@ -9551,7 +9843,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree(PyObject *SWI
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflict_description_create_tree",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflict_description_create_tree", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -9626,7 +9922,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_dup(PyObject *SWIGUNUSED
       &_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_UnpackTuple(args,(char *)"svn_wc_conflict_description2_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9677,7 +9973,7 @@ 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_UnpackTuple(args,(char *)"svn_wc__conflict_description2_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9722,6 +10018,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_conflict_result(PyObject *SWIGUNUSEDPAR
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_wc_conflict_result_t *result = 0 ;
   
@@ -9729,13 +10026,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_conflict_result(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_create_conflict_result",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_create_conflict_result",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     arg1 = (svn_wc_conflict_choice_t)SWIG_As_long (obj0);
     if (SWIG_arg_fail(svn_argnum_obj0)) {
       SWIG_fail;
     }
   }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_create_conflict_result", "merged_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -9773,7 +10074,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_opened_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_file_opened_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_file_opened_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9800,7 +10101,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_opened_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_file_opened_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_file_opened_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9822,7 +10123,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_changed_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_file_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_file_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9849,7 +10150,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_changed_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(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 *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_file_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_file_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9871,7 +10172,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_added_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_file_added_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_file_added_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9898,7 +10199,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_added_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(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 *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_file_added_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_file_added_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9920,7 +10221,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_deleted_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_file_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_file_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9947,7 +10248,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_deleted_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_file_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_file_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -9969,7 +10270,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_deleted_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -9996,7 +10297,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_deleted_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10018,7 +10319,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_opened_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_opened_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_opened_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10045,7 +10346,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_opened_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_opened_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_opened_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10067,7 +10368,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_added_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_added_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_added_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10094,7 +10395,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_added_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_added_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_added_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10116,7 +10417,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_props_changed_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_props_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_props_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10143,7 +10444,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_props_changed_get(PyObje
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_props_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_props_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10165,7 +10466,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_closed_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_closed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_closed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10192,7 +10493,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_closed_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_closed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_t_dir_closed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10211,7 +10512,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_diff_callbacks4_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_wc_diff_callbacks4_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_diff_callbacks4_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_diff_callbacks4_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -10233,7 +10534,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_diff_callbacks4_t(PyObject *SWIGUNUSEDP
   struct svn_wc_diff_callbacks4_t *arg1 = (struct svn_wc_diff_callbacks4_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_diff_callbacks4_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_diff_callbacks4_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10257,7 +10558,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_diff_callbacks4_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_diff_callbacks4_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -10269,7 +10570,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_changed_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_file_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_file_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10296,7 +10597,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_changed_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_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 *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_file_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_file_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10318,7 +10619,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_added_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_file_added_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_file_added_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10345,7 +10646,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_added_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_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 *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_file_added_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_file_added_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10367,7 +10668,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_deleted_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_file_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_file_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10394,7 +10695,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_deleted_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_file_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_file_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10416,7 +10717,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_added_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_added_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_added_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10443,7 +10744,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_added_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_added_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_added_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10465,7 +10766,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_deleted_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10492,7 +10793,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_deleted_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10514,7 +10815,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_props_changed_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_props_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_props_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10541,7 +10842,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_props_changed_get(PyObje
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_props_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_props_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10563,7 +10864,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_opened_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_opened_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_opened_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10590,7 +10891,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_opened_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_opened_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_opened_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10612,7 +10913,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_closed_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_closed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_closed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10639,7 +10940,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_closed_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_closed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_t_dir_closed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10658,7 +10959,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_diff_callbacks3_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_wc_diff_callbacks3_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_diff_callbacks3_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_diff_callbacks3_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -10680,7 +10981,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_diff_callbacks3_t(PyObject *SWIGUNUSEDP
   struct svn_wc_diff_callbacks3_t *arg1 = (struct svn_wc_diff_callbacks3_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_diff_callbacks3_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_diff_callbacks3_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10704,7 +11005,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_diff_callbacks3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_diff_callbacks3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -10716,7 +11017,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_changed_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_file_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_file_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10743,7 +11044,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_changed_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_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 *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_file_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_file_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10765,7 +11066,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_added_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_file_added_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_file_added_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10792,7 +11093,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_added_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_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 *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_file_added_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_file_added_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10814,7 +11115,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_deleted_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_file_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_file_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10841,7 +11142,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_deleted_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_file_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_file_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10863,7 +11164,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_added_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_dir_added_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_dir_added_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10890,7 +11191,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_added_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_dir_added_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_dir_added_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10912,7 +11213,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_deleted_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_dir_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_dir_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10939,7 +11240,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_deleted_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_dir_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_dir_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -10961,7 +11262,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_props_changed_set(PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_dir_props_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_dir_props_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -10988,7 +11289,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_props_changed_get(PyObje
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_dir_props_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_t_dir_props_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11007,7 +11308,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_diff_callbacks2_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_wc_diff_callbacks2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_diff_callbacks2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_diff_callbacks2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -11029,7 +11330,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_diff_callbacks2_t(PyObject *SWIGUNUSEDP
   struct svn_wc_diff_callbacks2_t *arg1 = (struct svn_wc_diff_callbacks2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_diff_callbacks2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_diff_callbacks2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11053,7 +11354,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_diff_callbacks2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_diff_callbacks2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -11065,7 +11366,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_changed_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_file_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_file_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11092,7 +11393,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_changed_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_file_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_file_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11114,7 +11415,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_added_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_file_added_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_file_added_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11141,7 +11442,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_added_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_file_added_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_file_added_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11163,7 +11464,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_deleted_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_file_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_file_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11190,7 +11491,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_deleted_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_file_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_file_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11212,7 +11513,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_dir_added_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_dir_added_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_dir_added_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11239,7 +11540,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_dir_added_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_dir_added_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_dir_added_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11261,7 +11562,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_dir_deleted_set(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_dir_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_dir_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11288,7 +11589,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_dir_deleted_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_dir_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_dir_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11310,7 +11611,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_props_changed_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_props_changed_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_props_changed_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11337,7 +11638,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_props_changed_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_props_changed_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_t_props_changed_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11356,7 +11657,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_diff_callbacks_t(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   struct svn_wc_diff_callbacks_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_diff_callbacks_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_diff_callbacks_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -11378,7 +11679,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_diff_callbacks_t(PyObject *SWIGUNUSEDPA
   struct svn_wc_diff_callbacks_t *arg1 = (struct svn_wc_diff_callbacks_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_diff_callbacks_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_diff_callbacks_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11402,7 +11703,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_diff_callbacks_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_diff_callbacks_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -11418,6 +11719,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_check_wc2(PyObject *SWIGUNUSEDPARM(self), PyOb
   int temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11426,13 +11728,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_check_wc2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_check_wc2",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_check_wc2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_check_wc2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11487,6 +11793,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_check_wc(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *_global_py_pool = NULL ;
   int temp2 ;
   int res2 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11495,7 +11802,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_check_wc(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_wc_check_wc",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_check_wc",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_check_wc", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -11551,6 +11862,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_has_binary_prop(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -11560,7 +11872,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_has_binary_prop(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_has_binary_prop",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_has_binary_prop",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_has_binary_prop", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -11624,6 +11940,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_text_modified_p2(PyObject *SWIGUNUSEDPARM(self
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -11633,7 +11950,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_text_modified_p2(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_text_modified_p2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_text_modified_p2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -11641,6 +11958,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_text_modified_p2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_text_modified_p2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -11702,6 +12023,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_text_modified_p(PyObject *SWIGUNUSEDPARM(self)
   PyObject *_global_py_pool = NULL ;
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -11712,7 +12034,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_text_modified_p(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_wc_text_modified_p",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_text_modified_p",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_text_modified_p", "filename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -11781,6 +12107,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_props_modified_p2(PyObject *SWIGUNUSEDPARM(sel
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -11789,13 +12116,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_props_modified_p2(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_props_modified_p2",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_props_modified_p2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_props_modified_p2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -11851,6 +12182,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_props_modified_p(PyObject *SWIGUNUSEDPARM(self
   PyObject *_global_py_pool = NULL ;
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -11860,7 +12192,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_props_modified_p(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_props_modified_p",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_props_modified_p",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_props_modified_p", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -11917,8 +12253,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_name_set(PyObject *SWIGUNUSEDPARM(self
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_name_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_name_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11926,6 +12263,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_name_set(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_name_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->name) free((char *)arg1->name);
@@ -11946,7 +12287,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_name_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_name_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_name_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -11968,7 +12309,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_revision_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_revision_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -11995,7 +12336,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_revision_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_revision_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12015,8 +12356,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_url_set(PyObject *SWIGUNUSEDPARM(self)
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12024,6 +12366,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_url_set(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_url_set", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->url) free((char *)arg1->url);
@@ -12044,7 +12390,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_url_get(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12064,8 +12410,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_repos_set(PyObject *SWIGUNUSEDPARM(sel
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_entry_t_repos_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_repos_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12073,6 +12420,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_repos_set(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_entry_t_repos_set", "repos");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos) free((char *)arg1->repos);
@@ -12093,7 +12444,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_repos_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_repos_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_repos_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12113,8 +12464,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_uuid_set(PyObject *SWIGUNUSEDPARM(self
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_entry_t_uuid_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_uuid_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12122,6 +12474,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_uuid_set(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_entry_t_uuid_set", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->uuid) free((char *)arg1->uuid);
@@ -12142,7 +12498,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_uuid_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_uuid_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_uuid_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12164,7 +12520,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_kind_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12191,7 +12547,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_kind_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12213,7 +12569,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_schedule_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_schedule_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_schedule_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12240,7 +12596,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_schedule_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_wc_schedule_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_schedule_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_schedule_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12262,7 +12618,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copied_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_copied_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_copied_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12289,7 +12645,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copied_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_copied_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_copied_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12311,7 +12667,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_deleted_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_deleted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_deleted_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12338,7 +12694,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_deleted_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_deleted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_deleted_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12360,7 +12716,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_absent_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_absent_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_absent_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12387,7 +12743,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_absent_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_absent_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_absent_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12409,7 +12765,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_incomplete_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_incomplete_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_incomplete_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12436,7 +12792,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_incomplete_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_incomplete_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_incomplete_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12456,8 +12812,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_url_set(PyObject *SWIGUNUSEDP
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_entry_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_copyfrom_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12465,6 +12822,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_url_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_entry_t_copyfrom_url_set", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_url) free((char *)arg1->copyfrom_url);
@@ -12485,7 +12846,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_url_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_copyfrom_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_copyfrom_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12507,7 +12868,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_rev_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12534,7 +12895,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_rev_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12554,8 +12915,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_old_set(PyObject *SWIGUNUSEDP
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_conflict_old_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_conflict_old_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12563,6 +12925,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_old_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_conflict_old_set", "conflict_old");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->conflict_old) free((char *)arg1->conflict_old);
@@ -12583,7 +12949,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_old_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_conflict_old_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_conflict_old_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12603,8 +12969,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_new_set(PyObject *SWIGUNUSEDP
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_conflict_new_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_conflict_new_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12612,6 +12979,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_new_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_conflict_new_set", "conflict_new");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->conflict_new) free((char *)arg1->conflict_new);
@@ -12632,7 +13003,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_new_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_conflict_new_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_conflict_new_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12652,8 +13023,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_wrk_set(PyObject *SWIGUNUSEDP
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_conflict_wrk_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_conflict_wrk_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12661,6 +13033,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_wrk_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_conflict_wrk_set", "conflict_wrk");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->conflict_wrk) free((char *)arg1->conflict_wrk);
@@ -12681,7 +13057,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_wrk_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_conflict_wrk_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_conflict_wrk_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12701,8 +13077,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prejfile_set(PyObject *SWIGUNUSEDPARM(
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_prejfile_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_prejfile_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12710,6 +13087,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prejfile_set(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_prejfile_set", "prejfile");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->prejfile) free((char *)arg1->prejfile);
@@ -12730,7 +13111,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prejfile_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_prejfile_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_prejfile_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12752,7 +13133,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_text_time_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_text_time_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_text_time_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12774,7 +13155,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_text_time_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_text_time_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_text_time_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12796,7 +13177,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prop_time_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_prop_time_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_prop_time_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12818,7 +13199,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prop_time_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_prop_time_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_prop_time_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12838,8 +13219,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_checksum_set(PyObject *SWIGUNUSEDPARM(
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_checksum_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_checksum_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12847,6 +13229,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_checksum_set(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_checksum_set", "checksum");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->checksum) free((char *)arg1->checksum);
@@ -12867,7 +13253,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_checksum_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_checksum_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_checksum_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12889,7 +13275,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_rev_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_cmt_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_cmt_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12916,7 +13302,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_rev_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_cmt_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_cmt_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12938,7 +13324,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_date_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_cmt_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_cmt_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12960,7 +13346,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_date_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_cmt_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_cmt_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -12980,8 +13366,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_author_set(PyObject *SWIGUNUSEDPAR
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_cmt_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_cmt_author_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -12989,6 +13376,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_author_set(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_cmt_author_set", "cmt_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->cmt_author) free((char *)arg1->cmt_author);
@@ -13009,7 +13400,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_author_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_cmt_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_cmt_author_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13029,8 +13420,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_token_set(PyObject *SWIGUNUSEDPAR
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_entry_t_lock_token_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_lock_token_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13038,6 +13430,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_token_set(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_entry_t_lock_token_set", "lock_token");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->lock_token) free((char *)arg1->lock_token);
@@ -13058,7 +13454,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_token_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_lock_token_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_lock_token_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13078,8 +13474,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_owner_set(PyObject *SWIGUNUSEDPAR
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_lock_owner_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_lock_owner_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13087,6 +13484,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_owner_set(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_lock_owner_set", "lock_owner");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->lock_owner) free((char *)arg1->lock_owner);
@@ -13107,7 +13508,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_owner_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_lock_owner_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_lock_owner_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13127,8 +13528,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_comment_set(PyObject *SWIGUNUSEDP
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_lock_comment_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_lock_comment_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13136,6 +13538,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_comment_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_lock_comment_set", "lock_comment");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->lock_comment) free((char *)arg1->lock_comment);
@@ -13156,7 +13562,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_comment_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_lock_comment_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_lock_comment_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13178,7 +13584,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_creation_date_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_lock_creation_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_lock_creation_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13200,7 +13606,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_creation_date_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_lock_creation_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_lock_creation_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13222,7 +13628,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_has_props_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_has_props_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_has_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13249,7 +13655,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_has_props_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_has_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_has_props_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13271,7 +13677,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_has_prop_mods_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_has_prop_mods_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_has_prop_mods_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13298,7 +13704,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_has_prop_mods_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_has_prop_mods_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_has_prop_mods_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13318,8 +13724,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cachable_props_set(PyObject *SWIGUNUSE
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_cachable_props_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_cachable_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13327,6 +13734,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cachable_props_set(PyObject *SWIGUNUSE
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_cachable_props_set", "cachable_props");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->cachable_props) free((char *)arg1->cachable_props);
@@ -13347,7 +13758,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cachable_props_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_cachable_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_cachable_props_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13367,8 +13778,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_present_props_set(PyObject *SWIGUNUSED
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_present_props_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_present_props_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13376,6 +13788,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_present_props_set(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_present_props_set", "present_props");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->present_props) free((char *)arg1->present_props);
@@ -13396,7 +13812,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_present_props_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_present_props_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_present_props_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13416,8 +13832,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_changelist_set(PyObject *SWIGUNUSEDPAR
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_changelist_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_changelist_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13425,6 +13842,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_changelist_set(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_changelist_set", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->changelist) free((char *)arg1->changelist);
@@ -13445,7 +13866,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_changelist_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_changelist_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_changelist_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13467,7 +13888,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_working_size_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_working_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_working_size_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13489,7 +13910,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_working_size_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   apr_off_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_working_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_working_size_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13511,7 +13932,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_keep_local_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_keep_local_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_keep_local_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13538,7 +13959,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_keep_local_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_keep_local_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_keep_local_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13560,7 +13981,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_depth_set(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_depth_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_depth_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13587,7 +14008,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_depth_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   svn_depth_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_depth_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_depth_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13607,8 +14028,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_tree_conflict_data_set(PyObject *SWIGU
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_tree_conflict_data_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_tree_conflict_data_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13616,6 +14038,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_tree_conflict_data_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_tree_conflict_data_set", "tree_conflict_data");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->tree_conflict_data) free((char *)arg1->tree_conflict_data);
@@ -13636,7 +14062,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_tree_conflict_data_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_tree_conflict_data_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_tree_conflict_data_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13656,8 +14082,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_path_set(PyObject *SWIGU
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_file_external_path_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_file_external_path_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13665,6 +14092,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_path_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_t_file_external_path_set", "file_external_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->file_external_path) free((char *)arg1->file_external_path);
@@ -13685,7 +14116,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_path_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_file_external_path_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_file_external_path_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13707,7 +14138,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_peg_rev_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_file_external_peg_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_file_external_peg_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13734,7 +14165,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_peg_rev_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_file_external_peg_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_file_external_peg_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13757,7 +14188,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_rev_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_file_external_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_file_external_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -13784,7 +14215,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_rev_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_opt_revision_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_file_external_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_t_file_external_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13804,7 +14235,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_entry_t(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   struct svn_wc_entry_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_entry_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_entry_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -13826,7 +14257,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_entry_t(PyObject *SWIGUNUSEDPARM(self),
   struct svn_wc_entry_t *arg1 = (struct svn_wc_entry_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_entry_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_entry_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -13850,7 +14281,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_entry_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_entry_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -13865,6 +14296,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_wc_entry_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -13875,7 +14307,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_wc_entry",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_entry", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -13952,7 +14388,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entries_read(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_wc_entries_read",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entries_read",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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()) {
@@ -14027,7 +14463,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_dup(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_entry_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14071,7 +14507,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_schedule_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_schedule_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_schedule_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14098,7 +14534,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_schedule_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_wc_schedule_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_schedule_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_schedule_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14118,8 +14554,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_url_set(PyObject *SWIGUNUSEDPA
   struct svn_wc_info_t *arg1 = (struct svn_wc_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_info_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_copyfrom_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14127,6 +14564,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_url_set(PyObject *SWIGUNUSEDPA
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_info_t_copyfrom_url_set", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->copyfrom_url) free((char *)arg1->copyfrom_url);
@@ -14147,7 +14588,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_url_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_copyfrom_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_copyfrom_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14169,7 +14610,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_rev_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_copyfrom_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14196,7 +14637,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_rev_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_copyfrom_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_copyfrom_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14218,7 +14659,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_checksum_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_checksum_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_checksum_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14245,7 +14686,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_checksum_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_checksum_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_checksum_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_checksum_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14266,8 +14707,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_changelist_set(PyObject *SWIGUNUSEDPARM
   struct svn_wc_info_t *arg1 = (struct svn_wc_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_info_t_changelist_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_changelist_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14275,6 +14717,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_changelist_set(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_info_t_changelist_set", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->changelist) free((char *)arg1->changelist);
@@ -14295,7 +14741,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_changelist_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_changelist_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_changelist_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14317,7 +14763,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_depth_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_depth_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_depth_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14344,7 +14790,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_depth_get(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   svn_depth_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_depth_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_depth_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14366,7 +14812,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_recorded_size_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_recorded_size_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_recorded_size_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14388,7 +14834,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_recorded_size_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_recorded_size_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_recorded_size_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14410,7 +14856,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_recorded_time_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_recorded_time_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_recorded_time_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14432,7 +14878,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_recorded_time_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_recorded_time_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_recorded_time_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14454,7 +14900,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_conflicts_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_conflicts_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_conflicts_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14481,7 +14927,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_conflicts_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   apr_array_header_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_conflicts_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_conflicts_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14502,8 +14948,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_wcroot_abspath_set(PyObject *SWIGUNUSED
   struct svn_wc_info_t *arg1 = (struct svn_wc_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_info_t_wcroot_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_wcroot_abspath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14511,6 +14958,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_wcroot_abspath_set(PyObject *SWIGUNUSED
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_info_t_wcroot_abspath_set", "wcroot_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->wcroot_abspath) free((char *)arg1->wcroot_abspath);
@@ -14531,7 +14982,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_wcroot_abspath_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_wcroot_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_wcroot_abspath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14551,8 +15002,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_from_abspath_set(PyObject *SWIGUN
   struct svn_wc_info_t *arg1 = (struct svn_wc_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_info_t_moved_from_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_moved_from_abspath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14560,6 +15012,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_from_abspath_set(PyObject *SWIGUN
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_info_t_moved_from_abspath_set", "moved_from_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->moved_from_abspath) free((char *)arg1->moved_from_abspath);
@@ -14580,7 +15036,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_from_abspath_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_moved_from_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_moved_from_abspath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14600,8 +15056,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_to_abspath_set(PyObject *SWIGUNUS
   struct svn_wc_info_t *arg1 = (struct svn_wc_info_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_info_t_moved_to_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_moved_to_abspath_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -14609,6 +15066,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_to_abspath_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_info_t_moved_to_abspath_set", "moved_to_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->moved_to_abspath) free((char *)arg1->moved_to_abspath);
@@ -14629,7 +15090,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_to_abspath_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_moved_to_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_t_moved_to_abspath_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14648,7 +15109,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_info_t(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   struct svn_wc_info_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_info_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_info_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -14670,7 +15131,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_info_t(PyObject *SWIGUNUSEDPARM(self),
   struct svn_wc_info_t *arg1 = (struct svn_wc_info_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_info_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_info_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -14694,7 +15155,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_info_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -14713,7 +15174,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_dup(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_info_dup",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_info_dup",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -14767,6 +15228,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p3(PyObject *SWIGUNUSEDPARM(self),
   svn_boolean_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -14777,13 +15239,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p3(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_conflicted_p3",&obj0,&arg5,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflicted_p3",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_conflicted_p3", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -14857,6 +15323,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p2(PyObject *SWIGUNUSEDPARM(self),
   int res2 = SWIG_TMPOBJ ;
   svn_boolean_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -14868,7 +15335,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_conflicted_p2",&arg4,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflicted_p2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflicted_p2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -14945,6 +15416,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = SWIG_TMPOBJ ;
   svn_boolean_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -14955,7 +15427,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p(PyObject *SWIGUNUSEDPARM(self), P
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_conflicted_p",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_conflicted_p",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_conflicted_p", "dir_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -15025,6 +15501,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ancestry(PyObject *SWIGUNUSEDPARM(self), P
   char *temp1 ;
   svn_revnum_t temp2 ;
   int res2 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -15035,7 +15512,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ancestry(PyObject *SWIGUNUSEDPARM(self), P
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_get_ancestry",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_ancestry",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_get_ancestry", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -15076,7 +15557,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ancestry(PyObject *SWIGUNUSEDPARM(self), P
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -15107,7 +15588,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_t_found_entry_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_callbacks2_t_found_entry_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks2_t_found_entry_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15134,7 +15615,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_t_found_entry_get(PyObject *S
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_callbacks2_t_found_entry_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks2_t_found_entry_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15156,7 +15637,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_t_handle_error_set(PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_callbacks2_t_handle_error_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks2_t_handle_error_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15183,7 +15664,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_t_handle_error_get(PyObject *
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,svn_error_t *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_callbacks2_t_handle_error_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks2_t_handle_error_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15202,7 +15683,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_entry_callbacks2_t(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   struct svn_wc_entry_callbacks2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_entry_callbacks2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_entry_callbacks2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -15224,7 +15705,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_entry_callbacks2_t(PyObject *SWIGUNUSED
   struct svn_wc_entry_callbacks2_t *arg1 = (struct svn_wc_entry_callbacks2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_entry_callbacks2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_entry_callbacks2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15248,7 +15729,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_entry_callbacks2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_entry_callbacks2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -15260,7 +15741,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks_t_found_entry_set(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_callbacks_t_found_entry_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks_t_found_entry_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -15287,7 +15768,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks_t_found_entry_get(PyObject *SW
   PyObject * obj0 = 0 ;
   svn_error_t *(*result)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *) = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_callbacks_t_found_entry_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks_t_found_entry_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15306,7 +15787,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_entry_callbacks_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_wc_entry_callbacks_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_entry_callbacks_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_entry_callbacks_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -15328,7 +15809,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_entry_callbacks_t(PyObject *SWIGUNUSEDP
   struct svn_wc_entry_callbacks_t *arg1 = (struct svn_wc_entry_callbacks_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_entry_callbacks_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_entry_callbacks_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -15352,7 +15833,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_entry_callbacks_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_entry_callbacks_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -15370,6 +15851,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries3(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *arg9 = (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 ;
@@ -15383,7 +15865,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries3(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_wc_walk_entries3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_walk_entries3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_walk_entries3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -15471,6 +15957,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries2(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *arg8 = (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 ;
@@ -15483,7 +15970,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_walk_entries2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_walk_entries2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_walk_entries2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -15563,6 +16054,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
@@ -15574,7 +16066,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_walk_entries",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_walk_entries",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_walk_entries", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -15647,6 +16143,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_mark_missing_deleted(PyObject *SWIGUNUSEDPARM(
   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 ;
@@ -15655,7 +16152,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_mark_missing_deleted(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_mark_missing_deleted",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_mark_missing_deleted",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_mark_missing_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -15714,6 +16215,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm4(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -15723,7 +16228,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm4(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssssOO|O:svn_wc_ensure_adm4",&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_ensure_adm4",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) 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()) {
@@ -15731,6 +16236,22 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm4(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_ensure_adm4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_ensure_adm4", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_ensure_adm4", "repos_root_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_ensure_adm4", "repos_uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_revnum_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -15792,6 +16313,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm3(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -15801,7 +16326,23 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm3(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"szszOO|O:svn_wc_ensure_adm3",&arg1,&arg2,&arg3,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_ensure_adm3",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_ensure_adm3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_ensure_adm3", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_ensure_adm3", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_wc_ensure_adm3", "repos");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
@@ -15863,6 +16404,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm2(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -15871,7 +16416,23 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"szszO|O:svn_wc_ensure_adm2",&arg1,&arg2,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_ensure_adm2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_ensure_adm2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_ensure_adm2", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_ensure_adm2", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_wc_ensure_adm2", "repos");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
@@ -15926,6 +16487,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -15934,7 +16498,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"szsO|O:svn_wc_ensure_adm",&arg1,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_ensure_adm",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_ensure_adm", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_ensure_adm", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_ensure_adm", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
@@ -15989,6 +16565,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_maybe_set_repos_root(PyObject *SWIGUNUSEDPARM(
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -15996,13 +16574,21 @@ SWIGINTERN PyObject *_wrap_svn_wc_maybe_set_repos_root(PyObject *SWIGUNUSEDPARM(
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Osz|O:svn_wc_maybe_set_repos_root",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_maybe_set_repos_root",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_maybe_set_repos_root", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_maybe_set_repos_root", "repos");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -16049,7 +16635,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_kind_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_kind_set",2,2,&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()) {
@@ -16076,7 +16662,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_kind_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_kind_get",1,1,&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()) {
@@ -16098,7 +16684,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_depth_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_depth_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_depth_set",2,2,&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()) {
@@ -16125,7 +16711,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_depth_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_depth_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_depth_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_depth_get",1,1,&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()) {
@@ -16147,7 +16733,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_filesize_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_filesize_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_filesize_set",2,2,&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()) {
@@ -16169,7 +16755,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_filesize_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_filesize_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_filesize_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_filesize_get",1,1,&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()) {
@@ -16191,7 +16777,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_versioned_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_versioned_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_versioned_set",2,2,&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()) {
@@ -16218,7 +16804,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_versioned_get(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_versioned_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_versioned_get",1,1,&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()) {
@@ -16240,7 +16826,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_conflicted_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_conflicted_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_conflicted_set",2,2,&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()) {
@@ -16267,7 +16853,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_conflicted_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_conflicted_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_conflicted_get",1,1,&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()) {
@@ -16289,7 +16875,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_node_status_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_node_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_node_status_set",2,2,&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()) {
@@ -16316,7 +16902,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_node_status_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_node_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_node_status_get",1,1,&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()) {
@@ -16338,7 +16924,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_text_status_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_text_status_set",2,2,&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()) {
@@ -16365,7 +16951,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_text_status_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_text_status_get",1,1,&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()) {
@@ -16387,7 +16973,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_prop_status_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_prop_status_set",2,2,&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()) {
@@ -16414,7 +17000,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_prop_status_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_prop_status_get",1,1,&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()) {
@@ -16436,7 +17022,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_copied_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_copied_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_copied_set",2,2,&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()) {
@@ -16463,7 +17049,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_copied_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_copied_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_copied_get",1,1,&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()) {
@@ -16485,7 +17071,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_revision_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_revision_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_revision_set",2,2,&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()) {
@@ -16512,7 +17098,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_revision_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_revision_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_revision_get",1,1,&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()) {
@@ -16534,7 +17120,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_rev_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_changed_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_changed_rev_set",2,2,&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()) {
@@ -16561,7 +17147,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_rev_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_changed_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_changed_rev_get",1,1,&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()) {
@@ -16583,7 +17169,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_date_set(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_changed_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_changed_date_set",2,2,&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()) {
@@ -16605,7 +17191,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_date_get(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_changed_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_changed_date_get",1,1,&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()) {
@@ -16625,8 +17211,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_author_set(PyObject *SWIGUNU
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_changed_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_changed_author_set",2,2,&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()) {
@@ -16634,6 +17221,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_author_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3_t_changed_author_set", "changed_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->changed_author) free((char *)arg1->changed_author);
@@ -16654,7 +17245,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_author_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_changed_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_changed_author_get",1,1,&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()) {
@@ -16674,8 +17265,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_root_url_set(PyObject *SWIGUNU
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_repos_root_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_root_url_set",2,2,&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()) {
@@ -16683,6 +17275,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_root_url_set(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3_t_repos_root_url_set", "repos_root_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_root_url) free((char *)arg1->repos_root_url);
@@ -16703,7 +17299,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_root_url_get(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_root_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_root_url_get",1,1,&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()) {
@@ -16723,8 +17319,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_uuid_set(PyObject *SWIGUNUSEDP
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_repos_uuid_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_uuid_set",2,2,&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()) {
@@ -16732,6 +17329,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_uuid_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3_t_repos_uuid_set", "repos_uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_uuid) free((char *)arg1->repos_uuid);
@@ -16752,7 +17353,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_uuid_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_uuid_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_uuid_get",1,1,&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()) {
@@ -16772,8 +17373,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_relpath_set(PyObject *SWIGUNUS
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_repos_relpath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_relpath_set",2,2,&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()) {
@@ -16781,6 +17383,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_relpath_set(PyObject *SWIGUNUS
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3_t_repos_relpath_set", "repos_relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->repos_relpath) free((char *)arg1->repos_relpath);
@@ -16801,7 +17407,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_relpath_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_relpath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_relpath_get",1,1,&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()) {
@@ -16823,7 +17429,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_switched_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_switched_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_switched_set",2,2,&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()) {
@@ -16850,7 +17456,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_switched_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_switched_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_switched_get",1,1,&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()) {
@@ -16872,7 +17478,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_locked_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_locked_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_locked_set",2,2,&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()) {
@@ -16899,7 +17505,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_locked_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_locked_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_locked_get",1,1,&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()) {
@@ -16921,7 +17527,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_lock_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_lock_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_lock_set",2,2,&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()) {
@@ -16948,7 +17554,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_lock_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_lock_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_lock_get",1,1,&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()) {
@@ -16969,8 +17575,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changelist_set(PyObject *SWIGUNUSEDP
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_changelist_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_changelist_set",2,2,&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()) {
@@ -16978,6 +17585,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changelist_set(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3_t_changelist_set", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->changelist) free((char *)arg1->changelist);
@@ -16998,7 +17609,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changelist_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_changelist_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_changelist_get",1,1,&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()) {
@@ -17020,7 +17631,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_kind_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_ood_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_ood_kind_set",2,2,&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()) {
@@ -17047,7 +17658,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_kind_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_ood_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_ood_kind_get",1,1,&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()) {
@@ -17069,7 +17680,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_node_status_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_repos_node_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_node_status_set",2,2,&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()) {
@@ -17096,7 +17707,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_node_status_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_node_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_node_status_get",1,1,&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()) {
@@ -17118,7 +17729,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_text_status_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_repos_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_text_status_set",2,2,&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()) {
@@ -17145,7 +17756,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_text_status_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_text_status_get",1,1,&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()) {
@@ -17167,7 +17778,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_prop_status_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_repos_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_prop_status_set",2,2,&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()) {
@@ -17194,7 +17805,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_prop_status_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_prop_status_get",1,1,&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()) {
@@ -17216,7 +17827,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_lock_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_repos_lock_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_lock_set",2,2,&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()) {
@@ -17243,7 +17854,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_lock_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_lock_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_repos_lock_get",1,1,&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()) {
@@ -17266,7 +17877,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_rev_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_ood_changed_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_ood_changed_rev_set",2,2,&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()) {
@@ -17293,7 +17904,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_rev_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_ood_changed_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_ood_changed_rev_get",1,1,&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()) {
@@ -17315,7 +17926,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_date_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_ood_changed_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_ood_changed_date_set",2,2,&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()) {
@@ -17337,7 +17948,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_date_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_ood_changed_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_ood_changed_date_get",1,1,&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()) {
@@ -17357,8 +17968,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_author_set(PyObject *SWI
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_ood_changed_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_ood_changed_author_set",2,2,&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()) {
@@ -17366,6 +17978,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_author_set(PyObject *SWI
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3_t_ood_changed_author_set", "ood_changed_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->ood_changed_author) free((char *)arg1->ood_changed_author);
@@ -17386,7 +18002,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_author_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_ood_changed_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_ood_changed_author_get",1,1,&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()) {
@@ -17406,8 +18022,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_from_abspath_set(PyObject *SWI
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_moved_from_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_moved_from_abspath_set",2,2,&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()) {
@@ -17415,6 +18032,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_from_abspath_set(PyObject *SWI
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3_t_moved_from_abspath_set", "moved_from_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->moved_from_abspath) free((char *)arg1->moved_from_abspath);
@@ -17435,7 +18056,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_from_abspath_get(PyObject *SWI
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_moved_from_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_moved_from_abspath_get",1,1,&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()) {
@@ -17455,8 +18076,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_to_abspath_set(PyObject *SWIGU
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_moved_to_abspath_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_moved_to_abspath_set",2,2,&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()) {
@@ -17464,6 +18086,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_to_abspath_set(PyObject *SWIGU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3_t_moved_to_abspath_set", "moved_to_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->moved_to_abspath) free((char *)arg1->moved_to_abspath);
@@ -17484,7 +18110,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_to_abspath_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_moved_to_abspath_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_moved_to_abspath_get",1,1,&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()) {
@@ -17506,7 +18132,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_file_external_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_file_external_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_file_external_set",2,2,&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()) {
@@ -17533,7 +18159,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_file_external_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_file_external_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_file_external_get",1,1,&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()) {
@@ -17555,7 +18181,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_actual_kind_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_actual_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_actual_kind_set",2,2,&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()) {
@@ -17582,7 +18208,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_actual_kind_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_actual_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3_t_actual_kind_get",1,1,&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()) {
@@ -17601,7 +18227,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_status3_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_wc_status3_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_status3_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_status3_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -17623,7 +18249,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_status3_t(PyObject *SWIGUNUSEDPARM(self
   struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_status3_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_status3_t",1,1,&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()) {
@@ -17647,7 +18273,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_status3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_status3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -17659,7 +18285,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_entry_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_entry_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_entry_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17686,7 +18312,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_entry_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_wc_entry_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_entry_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_entry_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17709,7 +18335,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_text_status_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_text_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17736,7 +18362,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_text_status_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_text_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17758,7 +18384,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_prop_status_set(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_prop_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17785,7 +18411,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_prop_status_get(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_prop_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17807,7 +18433,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_locked_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_locked_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_locked_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17834,7 +18460,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_locked_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_locked_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_locked_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17856,7 +18482,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_copied_set(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_copied_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_copied_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17883,7 +18509,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_copied_get(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_copied_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_copied_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17905,7 +18531,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_switched_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_switched_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_switched_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17932,7 +18558,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_switched_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_switched_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_switched_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -17954,7 +18580,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_text_status_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_repos_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_repos_text_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -17981,7 +18607,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_text_status_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_repos_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_repos_text_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18003,7 +18629,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_prop_status_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_repos_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_repos_prop_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18030,7 +18656,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_prop_status_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_repos_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_repos_prop_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18052,7 +18678,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_lock_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_repos_lock_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_repos_lock_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18079,7 +18705,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_lock_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   svn_lock_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_repos_lock_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_repos_lock_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18100,8 +18726,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_url_set(PyObject *SWIGUNUSEDPARM(sel
   struct svn_wc_status2_t *arg1 = (struct svn_wc_status2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status2_t_url_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_url_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18109,6 +18736,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_url_set(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status2_t_url_set", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->url) free((char *)arg1->url);
@@ -18129,7 +18760,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_url_get(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_url_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_url_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18151,7 +18782,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_rev_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_ood_last_cmt_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_ood_last_cmt_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18178,7 +18809,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_rev_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_ood_last_cmt_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_ood_last_cmt_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18200,7 +18831,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_date_set(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_ood_last_cmt_date_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_ood_last_cmt_date_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18222,7 +18853,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_date_get(PyObject *SWIG
   PyObject * obj0 = 0 ;
   apr_time_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_ood_last_cmt_date_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_ood_last_cmt_date_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18244,7 +18875,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_kind_set(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_ood_kind_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_ood_kind_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18271,7 +18902,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_kind_get(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   svn_node_kind_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_ood_kind_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_ood_kind_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18291,8 +18922,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_author_set(PyObject *SW
   struct svn_wc_status2_t *arg1 = (struct svn_wc_status2_t *) 0 ;
   char *arg2 = (char *) 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status2_t_ood_last_cmt_author_set",&obj0,&arg2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_ood_last_cmt_author_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18300,6 +18932,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_author_set(PyObject *SW
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status2_t_ood_last_cmt_author_set", "ood_last_cmt_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     apr_size_t len = strlen(arg2) + 1;
     char *copied;
     if (arg1->ood_last_cmt_author) free((char *)arg1->ood_last_cmt_author);
@@ -18320,7 +18956,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_author_get(PyObject *SW
   PyObject * obj0 = 0 ;
   char *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_ood_last_cmt_author_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_ood_last_cmt_author_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18342,7 +18978,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_tree_conflict_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_tree_conflict_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_tree_conflict_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18369,7 +19005,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_tree_conflict_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_wc_conflict_description_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_tree_conflict_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_tree_conflict_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18392,7 +19028,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_file_external_set(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_file_external_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_file_external_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18419,7 +19055,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_file_external_get(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_file_external_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_file_external_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18441,7 +19077,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_pristine_text_status_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_pristine_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_pristine_text_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18468,7 +19104,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_pristine_text_status_get(PyObject *S
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_pristine_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_pristine_text_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18490,7 +19126,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_pristine_prop_status_set(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_pristine_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_pristine_prop_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18517,7 +19153,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_pristine_prop_status_get(PyObject *S
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_pristine_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2_t_pristine_prop_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18536,7 +19172,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_status2_t(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct svn_wc_status2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_status2_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_status2_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -18558,7 +19194,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_status2_t(PyObject *SWIGUNUSEDPARM(self
   struct svn_wc_status2_t *arg1 = (struct svn_wc_status2_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_status2_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_status2_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18582,7 +19218,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_status2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_status2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -18594,7 +19230,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_entry_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_entry_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_entry_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18621,7 +19257,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_entry_get(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   svn_wc_entry_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_entry_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_entry_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18644,7 +19280,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_text_status_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_text_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18671,7 +19307,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_text_status_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_text_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18693,7 +19329,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_prop_status_set(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_prop_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18720,7 +19356,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_prop_status_get(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_prop_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18742,7 +19378,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_locked_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_locked_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_locked_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18769,7 +19405,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_locked_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_locked_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_locked_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18791,7 +19427,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_copied_set(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_copied_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_copied_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18818,7 +19454,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_copied_get(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_copied_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_copied_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18840,7 +19476,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_switched_set(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_switched_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_switched_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18867,7 +19503,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_switched_get(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_switched_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_switched_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18889,7 +19525,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_repos_text_status_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_repos_text_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_repos_text_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18916,7 +19552,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_repos_text_status_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_repos_text_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_repos_text_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18938,7 +19574,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_repos_prop_status_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_repos_prop_status_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_repos_prop_status_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -18965,7 +19601,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_repos_prop_status_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   enum svn_wc_status_kind result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_repos_prop_status_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_t_repos_prop_status_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -18984,7 +19620,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_status_t(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   struct svn_wc_status_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_status_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_status_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -19006,7 +19642,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_status_t(PyObject *SWIGUNUSEDPARM(self)
   struct svn_wc_status_t *arg1 = (struct svn_wc_status_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_status_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_status_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -19030,7 +19666,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_status_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_status_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -19049,7 +19685,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status3(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_dup_status3",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_dup_status3",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19100,7 +19736,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status2(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_dup_status2",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_dup_status2",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19151,7 +19787,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_dup_status",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_dup_status",1,2,&obj0,&obj1)) SWIG_fail;
   {
     arg1 = (svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19199,6 +19835,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *_global_py_pool = NULL ;
   svn_wc_status3_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -19212,13 +19849,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_status3",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status3",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_status3", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -19290,6 +19931,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_wc_status2_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -19299,7 +19941,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2(PyObject *SWIGUNUSEDPARM(self), PyObje
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_status2",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_status2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -19360,6 +20006,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status(PyObject *SWIGUNUSEDPARM(self), PyObjec
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_wc_status_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -19369,7 +20016,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_status(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_status",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_status", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -19438,6 +20089,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_status(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -19453,7 +20105,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_status(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_walk_status",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) 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()) {
@@ -19461,6 +20113,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_status(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_walk_status", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -19578,6 +20234,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor5(PyObject *SWIGUNUSEDPARM(se
   svn_revnum_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -19603,7 +20261,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor5(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   arg3 = &temp3;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_status_editor5",12,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     arg5 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -19611,6 +20269,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor5(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_status_editor5", "anchor_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_get_status_editor5", "target_basename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -19769,6 +20435,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor4(PyObject *SWIGUNUSEDPARM(se
   svn_revnum_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -19788,7 +20455,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor4(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   arg3 = &temp3;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_status_editor4",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     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()) {
@@ -19796,6 +20463,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_status_editor4", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -19934,6 +20605,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor3(PyObject *SWIGUNUSEDPARM(se
   svn_revnum_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -19952,7 +20624,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor3(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   arg3 = &temp3;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_status_editor3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -19960,6 +20632,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_status_editor3", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -20086,6 +20762,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor2(PyObject *SWIGUNUSEDPARM(se
   svn_revnum_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -20104,7 +20781,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor2(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   arg3 = &temp3;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_status_editor2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -20112,6 +20789,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_status_editor2", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -20243,6 +20924,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor(PyObject *SWIGUNUSEDPARM(sel
   svn_revnum_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -20260,7 +20942,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   arg2 = &temp2;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_status_editor",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -20268,6 +20950,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_status_editor", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -20379,6 +21065,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_set_repos_locks(PyObject *SWIGUNUSEDPAR
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -20386,7 +21073,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_set_repos_locks(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_wc_status_set_repos_locks",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_status_set_repos_locks",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     if (obj0 == Py_None) {
       arg1 = NULL;
@@ -20401,6 +21088,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_set_repos_locks(PyObject *SWIGUNUSEDPAR
       SWIG_fail;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_status_set_repos_locks", "repos_root");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -20454,6 +21145,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy3(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -20464,7 +21157,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy3(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssOOO|O:svn_wc_copy3",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_copy3",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) 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()) {
@@ -20472,6 +21165,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy3(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_copy3", "src_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_copy3", "dst_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -20536,7 +21237,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy2(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *arg8 = (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 ;
@@ -20546,7 +21249,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy2(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOO|O:svn_wc_copy2",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_copy2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_copy2", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -20554,6 +21261,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy2(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_copy2", "dst_basename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg5 = obj3;
   }
@@ -20612,7 +21323,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *arg8 = (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 ;
@@ -20622,7 +21335,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOO|O:svn_wc_copy",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_copy",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_copy", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -20630,6 +21347,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_copy", "dst_basename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg5 = obj3;
   }
@@ -20690,6 +21411,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_move(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -20700,7 +21423,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_move(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssOOO|O:svn_wc_move",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_move",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) 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()) {
@@ -20708,6 +21431,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_move(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_move", "src_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_move", "dst_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -20774,6 +21505,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete4(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -20785,7 +21517,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete4(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_delete4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_delete4",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) 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()) {
@@ -20793,6 +21525,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete4(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_delete4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -20863,6 +21599,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete3(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *arg8 = (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 ;
@@ -20874,7 +21611,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete3(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_delete3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_delete3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_delete3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -20945,6 +21686,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete2(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -20955,7 +21697,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete2(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_wc_delete2",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_delete2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_delete2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -21020,6 +21766,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete(PyObject *SWIGUNUSEDPARM(self), PyObjec
   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 ;
@@ -21030,7 +21777,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_wc_delete",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_delete",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_delete", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -21096,6 +21847,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk3(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -21106,7 +21858,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk3(PyObject *SWIGUNUSEDPARM(self),
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_from_disk3",5,6,&obj0,&obj1,&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()) {
@@ -21114,6 +21866,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_add_from_disk3", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -21186,6 +21942,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk2(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -21195,7 +21952,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk2(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_add_from_disk2",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_from_disk2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) 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()) {
@@ -21203,6 +21960,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_add_from_disk2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -21268,6 +22029,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -21276,7 +22038,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_add_from_disk",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_from_disk",3,4,&obj0,&obj1,&obj2,&obj3)) 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()) {
@@ -21284,6 +22046,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_add_from_disk", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg4 = obj2;
   }
@@ -21341,7 +22107,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_add4(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -21352,7 +22120,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add4(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOzOOO|O:svn_wc_add4",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add4",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) 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()) {
@@ -21360,12 +22128,20 @@ SWIGINTERN PyObject *_wrap_svn_wc_add4(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_add4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_wc_add4", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -21432,8 +22208,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add3(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -21444,7 +22222,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add3(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOzOOO|O:svn_wc_add3",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_add3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -21458,6 +22240,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add3(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_wc_add3", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -21523,7 +22309,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_add2(PyObject *SWIGUNUSEDPARM(self), PyObject
   apr_pool_t *arg9 = (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 ;
@@ -21534,7 +22322,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add2(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOzOOO|O:svn_wc_add2",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_add2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -21542,6 +22334,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add2(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_add2", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -21607,7 +22403,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_add(PyObject *SWIGUNUSEDPARM(self), PyObject *
   apr_pool_t *arg9 = (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 ;
@@ -21618,7 +22416,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add(PyObject *SWIGUNUSEDPARM(self), PyObject *
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOzOOO|O:svn_wc_add",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_add", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -21626,6 +22428,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add(PyObject *SWIGUNUSEDPARM(self), PyObject *
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_add", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -21694,10 +22500,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file4(PyObject *SWIGUNUSEDPARM(self)
   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 ;
@@ -21707,7 +22515,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file4(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_repos_file4",9,10,&obj0,&obj1,&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()) {
@@ -21715,6 +22523,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file4(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_add_repos_file4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj2 == Py_None) {
       arg3 = NULL;
     }
@@ -21763,6 +22575,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file4(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_wc_add_repos_file4", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_revnum_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -21828,11 +22644,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file3(PyObject *SWIGUNUSEDPARM(self)
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
@@ -21843,7 +22661,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file3(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_repos_file3",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_add_repos_file3", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -21899,6 +22721,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file3(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_wc_add_repos_file3", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_revnum_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -21964,9 +22790,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file2(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *arg9 = (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 ;
   svn_error_t *result = 0 ;
@@ -21975,7 +22805,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file2(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_repos_file2",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_add_repos_file2", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -21983,6 +22817,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file2(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_add_repos_file2", "new_text_base_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_wc_add_repos_file2", "new_text_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -22009,6 +22851,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file2(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg7 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_wc_add_repos_file2", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_revnum_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -22064,8 +22910,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file(PyObject *SWIGUNUSEDPARM(self),
   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 ;
@@ -22074,7 +22923,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOzOzO|O:svn_wc_add_repos_file",&arg1,&obj1,&arg3,&obj3,&arg5,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_repos_file",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_add_repos_file", "dst_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -22082,6 +22935,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_add_repos_file", "new_text_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -22095,6 +22952,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_wc_add_repos_file", "copyfrom_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_revnum_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -22151,6 +23012,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control2(PyObject *SWIGUN
   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 ;
@@ -22161,7 +23023,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control2(PyObject *SWIGUN
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_remove_from_revision_control2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_remove_from_revision_control2",5,6,&obj0,&obj1,&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()) {
@@ -22169,6 +23031,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control2(PyObject *SWIGUN
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_remove_from_revision_control2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -22235,6 +23101,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control(PyObject *SWIGUNU
   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 ;
@@ -22245,7 +23112,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_remove_from_revision_control",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_remove_from_revision_control",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -22253,6 +23120,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control(PyObject *SWIGUNU
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_remove_from_revision_control", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -22324,8 +23195,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict5(PyObject *SWIGUNUSEDPARM(se
   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 ;
@@ -22337,7 +23210,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict5(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_resolved_conflict5",9,10,&obj0,&obj1,&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()) {
@@ -22345,6 +23218,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict5(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_resolved_conflict5", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -22357,6 +23234,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict5(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_resolved_conflict5", "resolve_prop");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -22431,6 +23312,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict4(PyObject *SWIGUNUSEDPARM(se
   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 ;
@@ -22446,7 +23328,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict4(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_resolved_conflict4",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_resolved_conflict4", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -22545,6 +23431,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict3(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *arg11 = (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 ;
@@ -22559,7 +23446,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict3(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_resolved_conflict3",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_resolved_conflict3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -22651,6 +23542,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict2(PyObject *SWIGUNUSEDPARM(se
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -22664,7 +23556,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict2(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_wc_resolved_conflict2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_resolved_conflict2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_resolved_conflict2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -22748,6 +23644,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *arg8 = (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 ;
@@ -22760,7 +23657,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_resolved_conflict",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_resolved_conflict",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_resolved_conflict", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -22840,7 +23741,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_committed_queue_create(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_wc_committed_queue_create",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_committed_queue_create",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -22887,6 +23788,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed4(PyObject *SWIGUNUSEDPARM(self
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -22900,7 +23802,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed4(PyObject *SWIGUNUSEDPARM(self
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_queue_committed4",9,10,&obj0,&obj1,&obj2,&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()) {
@@ -22914,6 +23816,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed4(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_queue_committed4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -23010,6 +23916,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed3(PyObject *SWIGUNUSEDPARM(self
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -23022,7 +23929,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed3(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_queue_committed3",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) 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()) {
@@ -23036,6 +23943,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed3(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_queue_committed3", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -23125,6 +24036,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed2(PyObject *SWIGUNUSEDPARM(self
   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 ;
@@ -23138,7 +24050,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed2(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_queue_committed2",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) 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()) {
@@ -23146,6 +24058,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_queue_committed2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -23241,6 +24157,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_wc_committed_queue_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -23255,7 +24172,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_wc_queue_committed",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_queue_committed",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_queue_committed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -23297,7 +24218,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed(PyObject *SWIGUNUSEDPARM(self)
     if (obj6 == Py_None) {
       arg8 = NULL;
     } else {
-      arg8 = (unsigned char *) PyString_AsString(obj6);
+      arg8 = (unsigned char *) PyBytes_AsString(obj6);
       if (arg8 == NULL) SWIG_fail;
     }
   }
@@ -23362,6 +24283,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue2(PyObject *SWIGUNUSEDP
   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 ;
@@ -23370,7 +24293,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue2(PyObject *SWIGUNUSEDP
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOzzO|O:svn_wc_process_committed_queue2",&obj0,&obj1,&obj2,&arg4,&arg5,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_process_committed_queue2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) 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()) {
@@ -23390,6 +24313,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue2(PyObject *SWIGUNUSEDP
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_wc_process_committed_queue2", "rev_date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_wc_process_committed_queue2", "rev_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg7 = obj5;
   }
@@ -23445,6 +24376,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -23452,7 +24385,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue(PyObject *SWIGUNUSEDPA
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOOzz|O:svn_wc_process_committed_queue",&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_process_committed_queue",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) 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()) {
@@ -23471,6 +24404,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue(PyObject *SWIGUNUSEDPA
       SWIG_fail;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, TRUE, "svn_wc_process_committed_queue", "rev_date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_wc_process_committed_queue", "rev_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -23525,9 +24466,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed4(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *arg11 = (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 ;
@@ -23539,7 +24483,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed4(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_process_committed4",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_process_committed4", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -23559,6 +24507,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_wc_process_committed4", "rev_date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_wc_process_committed4", "rev_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -23587,7 +24543,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed4(PyObject *SWIGUNUSEDPARM(se
     if (obj9 == Py_None) {
       arg10 = NULL;
     } else {
-      arg10 = (unsigned char *) PyString_AsString(obj9);
+      arg10 = (unsigned char *) PyBytes_AsString(obj9);
       if (arg10 == NULL) SWIG_fail;
     }
   }
@@ -23645,9 +24601,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed3(PyObject *SWIGUNUSEDPARM(se
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
@@ -23658,7 +24617,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed3(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_process_committed3",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_process_committed3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -23678,6 +24641,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_wc_process_committed3", "rev_date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_wc_process_committed3", "rev_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -23700,7 +24671,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed3(PyObject *SWIGUNUSEDPARM(se
     if (obj8 == Py_None) {
       arg9 = NULL;
     } else {
-      arg9 = (unsigned char *) PyString_AsString(obj8);
+      arg9 = (unsigned char *) PyBytes_AsString(obj8);
       if (arg9 == NULL) SWIG_fail;
     }
   }
@@ -23757,9 +24728,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed2(PyObject *SWIGUNUSEDPARM(se
   apr_pool_t *arg9 = (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 ;
@@ -23769,7 +24743,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed2(PyObject *SWIGUNUSEDPARM(se
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_process_committed2",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_process_committed2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -23789,6 +24767,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_wc_process_committed2", "rev_date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_wc_process_committed2", "rev_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -23858,9 +24844,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *arg8 = (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 ;
   svn_error_t *result = 0 ;
@@ -23869,7 +24858,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOzzO|O:svn_wc_process_committed",&arg1,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_process_committed",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_process_committed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -23889,6 +24882,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_wc_process_committed", "rev_date");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, TRUE, "svn_wc_process_committed", "rev_author");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -23959,6 +24960,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions5(PyObject *SWIGUNUSEDPARM(self
   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 ;
@@ -23975,7 +24977,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions5(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_crawl_revisions5",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) 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()) {
@@ -23983,6 +24985,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions5(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_crawl_revisions5", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -24090,6 +25096,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions4(PyObject *SWIGUNUSEDPARM(self
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -24107,7 +25114,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions4(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_crawl_revisions4",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_crawl_revisions4", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -24223,6 +25234,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions3(PyObject *SWIGUNUSEDPARM(self
   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 ;
@@ -24239,7 +25251,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions3(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_crawl_revisions3",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_crawl_revisions3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -24348,6 +25364,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions2(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *arg11 = (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 ;
@@ -24362,7 +25379,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions2(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_crawl_revisions2",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_crawl_revisions2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -24455,6 +25476,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *arg11 = (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 ;
@@ -24470,7 +25492,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_crawl_revisions",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_crawl_revisions", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -24575,6 +25601,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_check_root(PyObject *SWIGUNUSEDPARM(self), PyO
   svn_node_kind_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -24585,13 +25612,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_check_root(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_check_root",&obj0,&arg5,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_check_root",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_check_root", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24660,6 +25691,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_is_wc_root2(PyObject *SWIGUNUSEDPARM(self), Py
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -24668,13 +25700,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_is_wc_root2(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_is_wc_root2",&obj0,&arg3,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_is_wc_root2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_is_wc_root2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24730,6 +25766,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_is_wc_root(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   svn_boolean_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -24739,7 +25776,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_is_wc_root(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_is_wc_root",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_is_wc_root",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_is_wc_root", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -24804,6 +25845,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target2(PyObject *SWIGUNUSEDPARM(se
   char *temp1 ;
   char *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -24818,13 +25860,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target2(PyObject *SWIGUNUSEDPARM(se
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_get_actual_target2",&obj0,&arg4,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_actual_target2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_actual_target2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -24867,7 +25913,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target2(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24880,7 +25926,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target2(PyObject *SWIGUNUSEDPARM(se
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24914,6 +25960,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target(PyObject *SWIGUNUSEDPARM(sel
   PyObject *_global_py_pool = NULL ;
   char *temp2 ;
   char *temp3 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -24923,7 +25970,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target(PyObject *SWIGUNUSEDPARM(sel
   arg4 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_wc_get_actual_target",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_actual_target",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_get_actual_target", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -24958,7 +26009,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target(PyObject *SWIGUNUSEDPARM(sel
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -24971,7 +26022,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target(PyObject *SWIGUNUSEDPARM(sel
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -25025,6 +26076,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
   svn_revnum_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -25032,6 +26085,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
   PyObject * obj11 = 0 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
@@ -25056,7 +26110,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   arg2 = &temp2;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_update_editor4",20,22,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18,&obj19,&obj20,&obj21)) SWIG_fail;
   {
     arg4 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25064,6 +26118,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_update_editor4", "anchor_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_get_update_editor4", "target_basename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -25106,6 +26168,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg14 = svn_swig_py_string_to_cstring(obj10, TRUE, "svn_wc_get_update_editor4", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg15 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj11,
       sizeof(const char *),
       svn_swig_py_unwrap_string,
@@ -25271,6 +26337,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
   svn_delta_editor_t *temp18 ;
   void *temp19 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -25281,6 +26348,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj9 = 0 ;
   PyObject * obj10 = 0 ;
   PyObject * obj11 = 0 ;
+  PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
   PyObject * obj15 = 0 ;
@@ -25293,7 +26361,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   arg18 = &temp18;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_update_editor3",15,16,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
   {
     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()) {
@@ -25301,6 +26369,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_update_editor3", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -25365,6 +26437,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg16 = svn_swig_py_string_to_cstring(obj12, TRUE, "svn_wc_get_update_editor3", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg17 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj13,
       sizeof(const char *),
       svn_swig_py_unwrap_string,
@@ -25459,10 +26535,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor2(PyObject *SWIGUNUSEDPARM(se
   svn_delta_editor_t *temp11 ;
   void *temp12 ;
   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 ;
   svn_error_t *result = 0 ;
@@ -25474,7 +26552,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor2(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   arg11 = &temp11;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_update_editor2",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     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()) {
@@ -25482,6 +26560,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_update_editor2", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -25502,6 +26584,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor2(PyObject *SWIGUNUSEDPARM(se
     arg9 = obj5;
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_wc_get_update_editor2", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -25587,10 +26673,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor(PyObject *SWIGUNUSEDPARM(sel
   svn_delta_editor_t *temp11 ;
   void *temp12 ;
   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 ;
   svn_error_t *result = 0 ;
@@ -25602,7 +26690,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   arg11 = &temp11;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_update_editor",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     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()) {
@@ -25610,6 +26698,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_update_editor", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -25630,6 +26722,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor(PyObject *SWIGUNUSEDPARM(sel
     arg9 = obj5;
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj6, TRUE, "svn_wc_get_update_editor", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -25727,11 +26823,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
   svn_revnum_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
   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 ;
   PyObject * obj12 = 0 ;
@@ -25756,7 +26856,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   arg2 = &temp2;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_switch_editor4",19,21,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail;
   {
     arg4 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -25764,6 +26864,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_switch_editor4", "anchor_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_get_switch_editor4", "target_basename");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_get_switch_editor4", "switch_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -25794,6 +26906,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg13 = svn_swig_py_string_to_cstring(obj9, TRUE, "svn_wc_get_switch_editor4", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg14 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj10,
       sizeof(const char *),
       svn_swig_py_unwrap_string,
@@ -25958,6 +27074,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
   svn_delta_editor_t *temp17 ;
   void *temp18 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -25966,6 +27084,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
   PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
@@ -25978,7 +27097,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   arg17 = &temp17;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_switch_editor3",14,15,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14)) SWIG_fail;
   {
     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()) {
@@ -25986,6 +27105,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_switch_editor3", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_get_switch_editor3", "switch_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -26034,6 +27161,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg15 = svn_swig_py_string_to_cstring(obj11, TRUE, "svn_wc_get_switch_editor3", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg16 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj12,
       sizeof(const char *),
       svn_swig_py_unwrap_string,
@@ -26129,10 +27260,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor2(PyObject *SWIGUNUSEDPARM(se
   svn_delta_editor_t *temp12 ;
   void *temp13 ;
   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 ;
   svn_error_t *result = 0 ;
@@ -26144,7 +27278,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor2(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   arg12 = &temp12;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_switch_editor2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -26152,6 +27286,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_switch_editor2", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_get_switch_editor2", "switch_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -26172,6 +27314,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor2(PyObject *SWIGUNUSEDPARM(se
     arg10 = obj6;
   }
   {
+    arg11 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_wc_get_switch_editor2", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -26258,10 +27404,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor(PyObject *SWIGUNUSEDPARM(sel
   svn_delta_editor_t *temp12 ;
   void *temp13 ;
   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 ;
   svn_error_t *result = 0 ;
@@ -26273,7 +27422,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   arg12 = &temp12;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_switch_editor",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -26281,6 +27430,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_switch_editor", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_get_switch_editor", "switch_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -26301,6 +27458,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor(PyObject *SWIGUNUSEDPARM(sel
     arg10 = obj6;
   }
   {
+    arg11 = svn_swig_py_string_to_cstring(obj7, TRUE, "svn_wc_get_switch_editor", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -26374,6 +27535,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_list2(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -26387,13 +27549,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_list2(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_prop_list2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_prop_list2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_prop_list2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -26459,6 +27625,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_list(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -26468,7 +27635,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_list(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_prop_list",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_prop_list",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_prop_list", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -26528,6 +27699,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_props(PyObject *SWIGUNUSEDPARM(se
   PyObject *_global_py_pool = NULL ;
   apr_hash_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -26541,13 +27713,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_props(PyObject *SWIGUNUSEDPARM(se
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_get_pristine_props",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_pristine_props",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_pristine_props", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -26616,6 +27792,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_get2(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   svn_string_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -26629,13 +27807,21 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_get2(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Oss|OO:svn_wc_prop_get2",&obj0,&arg3,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_prop_get2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_prop_get2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_prop_get2", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -26676,9 +27862,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_get2(PyObject *SWIGUNUSEDPARM(self), PyOb
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -26712,6 +27897,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_get(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_string_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -26721,7 +27908,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_get(PyObject *SWIGUNUSEDPARM(self), PyObj
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_wc_prop_get",&arg2,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_prop_get",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_prop_get", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_prop_get", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -26760,9 +27955,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_get(PyObject *SWIGUNUSEDPARM(self), PyObj
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -26798,6 +27992,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set4(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *_global_py_pool = NULL ;
   svn_string_t value4 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -26811,7 +28007,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set4(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_prop_set4",9,10,&obj0,&obj1,&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()) {
@@ -26819,15 +28015,27 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set4(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_prop_set4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_prop_set4", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -26909,7 +28117,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set3(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_string_t value2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -26920,21 +28130,33 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set3(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOOO|O:svn_wc_prop_set3",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_prop_set3",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_prop_set3", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_prop_set3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -27000,7 +28222,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set2(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_string_t value2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27010,21 +28234,33 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set2(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOO|O:svn_wc_prop_set2",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_prop_set2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_prop_set2", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_prop_set2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -27085,7 +28321,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_string_t value2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -27094,21 +28332,33 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOsO|O:svn_wc_prop_set",&arg1,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_prop_set",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_prop_set", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg2 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value2.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value2.data = PyString_AS_STRING(obj1);
-      value2.len = PyString_GET_SIZE(obj1);
+      value2.len = pyStrLen;
       arg2 = &value2;
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_prop_set", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -27156,9 +28406,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_wc_is_normal_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_wc_is_normal_prop",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_is_normal_prop",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_is_normal_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -27177,9 +28432,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_wc_is_wc_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_wc_is_wc_prop",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_is_wc_prop",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_is_wc_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -27198,9 +28458,14 @@ fail:
 SWIGINTERN PyObject *_wrap_svn_wc_is_entry_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"s:svn_wc_is_entry_prop",&arg1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_is_entry_prop",1,1,&obj0)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_is_entry_prop", "name");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     svn_swig_py_release_py_lock();
     
@@ -27231,7 +28496,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_canonicalize_svn_prop(PyObject *SWIGUNUSEDPARM
   PyObject *_global_py_pool = NULL ;
   svn_string_t *temp1 ;
   svn_string_t value3 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27244,21 +28511,33 @@ SWIGINTERN PyObject *_wrap_svn_wc_canonicalize_svn_prop(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOsOOOO|O:svn_wc_canonicalize_svn_prop",&arg2,&obj1,&arg4,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_canonicalize_svn_prop",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_canonicalize_svn_prop", "propname");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     if (obj1 == Py_None)
     arg3 = NULL;
     else {
-      if (!PyString_Check(obj1)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj1)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
+        SWIG_fail;
+      }
+      if (PyBytes_AsStringAndSize(obj1, (char **)&(value3.data),
+          &pyStrLen) == -1) {
         SWIG_fail;
       }
-      value3.data = PyString_AS_STRING(obj1);
-      value3.len = PyString_GET_SIZE(obj1);
+      value3.len = pyStrLen;
       arg3 = &value3;
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_canonicalize_svn_prop", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_node_kind_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -27318,9 +28597,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_canonicalize_svn_prop(PyObject *SWIGUNUSEDPARM
     if (*arg1 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg1)->data, (*arg1)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -27364,6 +28642,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor6(PyObject *SWIGUNUSEDPARM(self
   svn_delta_editor_t *temp1 ;
   void *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -27389,7 +28669,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor6(PyObject *SWIGUNUSEDPARM(self
   arg19 = _global_pool;
   arg1 = &temp1;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_diff_editor6",14,16,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
   {
     arg3 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -27397,6 +28677,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor6(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_diff_editor6", "anchor_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_get_diff_editor6", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -27548,6 +28836,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor5(PyObject *SWIGUNUSEDPARM(self
   svn_delta_editor_t *temp12 ;
   void *temp13 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -27565,7 +28854,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor5(PyObject *SWIGUNUSEDPARM(self
   arg14 = _global_pool;
   arg12 = &temp12;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_diff_editor5",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     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()) {
@@ -27573,6 +28862,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor5(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_diff_editor5", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -27692,6 +28985,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor4(PyObject *SWIGUNUSEDPARM(self
   svn_delta_editor_t *temp12 ;
   void *temp13 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -27708,7 +29002,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor4(PyObject *SWIGUNUSEDPARM(self
   arg14 = _global_pool;
   arg12 = &temp12;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_diff_editor4",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -27716,6 +29010,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor4(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_diff_editor4", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
       _global_pool);
     arg4 = obj2;
@@ -27825,6 +29123,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor3(PyObject *SWIGUNUSEDPARM(self
   svn_delta_editor_t *temp11 ;
   void *temp12 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -27840,7 +29139,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor3(PyObject *SWIGUNUSEDPARM(self
   arg13 = _global_pool;
   arg11 = &temp11;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_diff_editor3",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     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()) {
@@ -27848,6 +29147,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor3(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_diff_editor3", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
       _global_pool);
     arg4 = obj2;
@@ -27951,6 +29254,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor2(PyObject *SWIGUNUSEDPARM(self
   svn_delta_editor_t *temp11 ;
   void *temp12 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -27967,7 +29271,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor2(PyObject *SWIGUNUSEDPARM(self
   arg13 = _global_pool;
   arg11 = &temp11;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_diff_editor2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -27975,6 +29279,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_diff_editor2", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -28086,6 +29394,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor(PyObject *SWIGUNUSEDPARM(self)
   svn_delta_editor_t *temp10 ;
   void *temp11 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -28101,7 +29410,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor(PyObject *SWIGUNUSEDPARM(self)
   arg12 = _global_pool;
   arg10 = &temp10;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_diff_editor",8,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     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()) {
@@ -28109,6 +29418,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_diff_editor", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -28212,6 +29525,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff6(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -28227,7 +29541,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff6(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff6",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) 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()) {
@@ -28235,6 +29549,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff6(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_diff6", "target_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -28334,6 +29652,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff5(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -28346,7 +29665,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff5(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_wc_diff5",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff5",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     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()) {
@@ -28354,6 +29673,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff5(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_diff5", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -28437,6 +29760,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff4(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -28448,7 +29772,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff4(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_diff4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff4",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     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()) {
@@ -28456,6 +29780,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff4(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_diff4", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
       _global_pool);
     arg4 = obj2;
@@ -28529,6 +29857,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff3(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -28539,7 +29868,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff3(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_diff3",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -28547,6 +29876,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff3(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_diff3", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
       _global_pool);
     arg4 = obj2;
@@ -28614,6 +29947,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff2(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -28625,7 +29959,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff2(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_diff2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     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()) {
@@ -28633,6 +29967,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff2(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_diff2", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -28708,6 +30046,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff(PyObject *SWIGUNUSEDPARM(self), PyObject
   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 ;
@@ -28718,7 +30057,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff(PyObject *SWIGUNUSEDPARM(self), PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_diff",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -28726,6 +30065,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_diff", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -28797,6 +30140,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_prop_diffs2(PyObject *SWIGUNUSEDPARM(self)
   apr_array_header_t *temp1 ;
   apr_hash_t *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -28811,13 +30155,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_prop_diffs2(PyObject *SWIGUNUSEDPARM(self)
   arg6 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_get_prop_diffs2",&obj0,&arg4,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_prop_diffs2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_prop_diffs2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -28888,6 +30236,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_prop_diffs(PyObject *SWIGUNUSEDPARM(self),
   PyObject *_global_py_pool = NULL ;
   apr_array_header_t *temp1 ;
   apr_hash_t *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -28898,7 +30247,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_prop_diffs(PyObject *SWIGUNUSEDPARM(self),
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_get_prop_diffs",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_prop_diffs",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_get_prop_diffs", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -28979,9 +30332,16 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge5(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int res1 = SWIG_TMPOBJ ;
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   PyObject * obj14 = 0 ;
@@ -28996,7 +30356,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge5(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg21 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge5",18,19,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18)) SWIG_fail;
   {
     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()) {
@@ -29010,6 +30370,30 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge5(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_merge5", "left_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_merge5", "right_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_merge5", "target_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_merge5", "left_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_merge5", "right_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj7, FALSE, "svn_wc_merge5", "target_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29028,6 +30412,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge5(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
+    arg13 = svn_swig_py_string_to_cstring(obj11, TRUE, "svn_wc_merge5", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29136,9 +30524,16 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge4(PyObject *SWIGUNUSEDPARM(self), PyObjec
   enum svn_wc_merge_outcome_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
@@ -29152,7 +30547,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge4(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg19 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge4",16,17,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16)) SWIG_fail;
   {
     arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -29160,6 +30555,30 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge4(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_merge4", "left_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_merge4", "right_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_merge4", "target_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_merge4", "left_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_merge4", "right_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_merge4", "target_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29178,6 +30597,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge4(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
+    arg12 = svn_swig_py_string_to_cstring(obj10, TRUE, "svn_wc_merge4", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29275,8 +30698,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge3(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *_global_py_pool = NULL ;
   enum svn_wc_merge_outcome_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  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 ;
@@ -29289,7 +30719,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge3(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg15 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge3",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_merge3", "left");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_merge3", "right");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_merge3", "merge_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -29297,12 +30739,28 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge3(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_merge3", "left_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_merge3", "right_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_merge3", "target_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (svn_boolean_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_wc_merge3", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29393,8 +30851,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge2(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *_global_py_pool = NULL ;
   enum svn_wc_merge_outcome_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
+  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 ;
   svn_error_t *result = 0 ;
@@ -29404,7 +30869,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge2(PyObject *SWIGUNUSEDPARM(self), PyObjec
   SWIG_fail;
   arg12 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge2",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_merge2", "left");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_merge2", "right");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_merge2", "merge_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -29412,12 +30889,28 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge2(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_merge2", "left_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_merge2", "right_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_merge2", "target_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (svn_boolean_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_wc_merge2", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29485,8 +30978,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *_global_py_pool = NULL ;
   enum svn_wc_merge_outcome_t temp9 ;
   int res9 = SWIG_TMPOBJ ;
+  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 ;
   svn_error_t *result = 0 ;
   
@@ -29495,7 +30995,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
   SWIG_fail;
   arg11 = _global_pool;
   arg9 = &temp9;
-  if (!PyArg_ParseTuple(args,(char *)"sssOsssOz|O:svn_wc_merge",&arg1,&arg2,&arg3,&obj3,&arg5,&arg6,&arg7,&obj7,&arg10,&obj9)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_merge", "left");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_merge", "right");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_merge", "merge_target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -29503,11 +31015,27 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_merge", "left_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_merge", "right_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_merge", "target_label");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_boolean_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
     }
   }
+  {
+    arg10 = svn_swig_py_string_to_cstring(obj8, TRUE, "svn_wc_merge", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj9) {
     /* Verify that the user supplied a valid pool */
     if (obj9 != Py_None && obj9 != _global_py_pool) {
@@ -29572,6 +31100,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props3(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -29587,7 +31116,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props3(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge_props3",11,12,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
     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()) {
@@ -29601,6 +31130,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props3(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_merge_props3", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29711,6 +31244,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props2(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
@@ -29725,7 +31259,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge_props2",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -29733,6 +31267,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_merge_props2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29837,6 +31375,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -29849,7 +31388,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_wc_merge_props",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge_props",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     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()) {
@@ -29857,6 +31396,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_merge_props", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -29944,6 +31487,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_prop_diffs(PyObject *SWIGUNUSEDPARM(self
   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 ;
@@ -29955,7 +31499,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_prop_diffs(PyObject *SWIGUNUSEDPARM(self
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_merge_prop_diffs",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_merge_prop_diffs",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     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()) {
@@ -29963,6 +31507,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_prop_diffs(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_merge_prop_diffs", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -30036,6 +31584,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_contents2(PyObject *SWIGUNUSEDPAR
   PyObject *_global_py_pool = NULL ;
   svn_stream_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -30049,13 +31598,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_contents2(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_get_pristine_contents2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_pristine_contents2",2,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     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;
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_pristine_contents2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -30124,6 +31677,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_contents(PyObject *SWIGUNUSEDPARM
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_stream_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -30137,7 +31691,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_contents(PyObject *SWIGUNUSEDPARM
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_wc_get_pristine_contents",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_pristine_contents",1,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_get_pristine_contents", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -30205,6 +31763,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_copy_path(PyObject *SWIGUNUSEDPAR
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
@@ -30213,7 +31772,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_copy_path(PyObject *SWIGUNUSEDPAR
   SWIG_fail;
   arg3 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_wc_get_pristine_copy_path",&arg1,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_pristine_copy_path",1,2,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_get_pristine_copy_path", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj1) {
     /* Verify that the user supplied a valid pool */
     if (obj1 != Py_None && obj1 != _global_py_pool) {
@@ -30248,7 +31811,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_copy_path(PyObject *SWIGUNUSEDPAR
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -30282,6 +31845,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup4(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
@@ -30295,7 +31859,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup4(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_cleanup4",8,9,&obj0,&obj1,&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()) {
@@ -30303,6 +31867,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup4(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_cleanup4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -30383,6 +31951,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup3(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -30391,7 +31960,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup3(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_cleanup3",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_cleanup3",3,4,&obj0,&obj1,&obj2,&obj3)) 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()) {
@@ -30399,6 +31968,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup3(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_cleanup3", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg4 = obj2;
   }
@@ -30450,6 +32023,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup2(PyObject *SWIGUNUSEDPARM(self), PyObj
   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 ;
   svn_error_t *result = 0 ;
@@ -30458,7 +32033,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup2(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"szO|O:svn_wc_cleanup2",&arg1,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_cleanup2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_cleanup2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_cleanup2", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg4 = obj2;
@@ -30512,7 +32095,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -30521,7 +32106,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOzO|O:svn_wc_cleanup",&arg1,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_cleanup",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_cleanup", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -30529,6 +32118,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_cleanup", "diff3_cmd");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg5 = obj3;
   }
@@ -30585,6 +32178,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_upgrade(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -30596,7 +32190,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_upgrade(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_upgrade",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_upgrade",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) 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()) {
@@ -30604,6 +32198,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_upgrade(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_upgrade", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_wc_upgrade_get_repos_info_t * tmp =
     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()) {
@@ -30678,6 +32276,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate4(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -30687,7 +32288,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate4(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsssOO|O:svn_wc_relocate4",&obj0,&arg2,&arg3,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_relocate4",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) 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()) {
@@ -30695,6 +32296,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate4(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_relocate4", "wcroot_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_relocate4", "from");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_relocate4", "to");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_wc_relocation_validator3_t * tmp =
     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()) {
@@ -30761,7 +32374,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate3(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *arg8 = (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 ;
@@ -30772,7 +32388,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate3(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOssOOO|O:svn_wc_relocate3",&arg1,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_relocate3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_relocate3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -30780,6 +32400,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_relocate3", "from");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_relocate3", "to");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -30852,7 +32480,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate2(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *arg8 = (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 ;
@@ -30863,7 +32494,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate2(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOssOOO|O:svn_wc_relocate2",&arg1,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_relocate2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_relocate2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -30871,6 +32506,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_relocate2", "from");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_relocate2", "to");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -30943,7 +32586,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *arg8 = (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 ;
@@ -30954,7 +32600,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOssOOO|O:svn_wc_relocate",&arg1,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_relocate",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_relocate", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -30962,6 +32612,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_relocate", "from");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_relocate", "to");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -31040,6 +32698,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert6(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -31055,7 +32714,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert6(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg13 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOO|O:svn_wc_revert6",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revert6",10,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) 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()) {
@@ -31063,6 +32722,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert6(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_revert6", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -31162,6 +32825,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert5(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -31176,7 +32840,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert5(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revert5",9,10,&obj0,&obj1,&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()) {
@@ -31184,6 +32848,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert5(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_revert5", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -31275,6 +32943,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert4(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -31287,7 +32956,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert4(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_wc_revert4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revert4",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) 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()) {
@@ -31295,6 +32964,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert4(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_revert4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -31373,6 +33046,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert3(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -31386,7 +33060,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert3(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_wc_revert3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revert3",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_revert3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -31471,6 +33149,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert2(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *arg9 = (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 ;
@@ -31483,7 +33162,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert2(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_revert2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revert2",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_revert2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -31562,6 +33245,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert(PyObject *SWIGUNUSEDPARM(self), PyObjec
   apr_pool_t *arg9 = (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 ;
@@ -31574,7 +33258,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert(PyObject *SWIGUNUSEDPARM(self), PyObjec
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_revert",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revert",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_revert", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -31649,6 +33337,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_restore(PyObject *SWIGUNUSEDPARM(self), PyObje
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -31657,7 +33346,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_restore(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_restore",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_restore",3,4,&obj0,&obj1,&obj2,&obj3)) 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()) {
@@ -31665,6 +33354,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_restore(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_restore", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -31720,6 +33413,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_tmp_file2(PyObject *SWIGUNUSEDPARM(self
   PyObject *_global_py_pool = NULL ;
   apr_file_t *temp1 ;
   char *temp2 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -31730,7 +33424,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_tmp_file2(PyObject *SWIGUNUSEDPARM(self
   arg5 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_create_tmp_file2",&arg3,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_create_tmp_file2",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_create_tmp_file2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_io_file_del_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -31777,7 +33475,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_tmp_file2(PyObject *SWIGUNUSEDPARM(self
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -31804,6 +33502,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_tmp_file(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   apr_file_t *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   svn_error_t *result = 0 ;
@@ -31813,7 +33512,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_tmp_file(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_create_tmp_file",&arg2,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_create_tmp_file",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_create_tmp_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg3 = (svn_boolean_t)SWIG_As_long (obj1);
     if (SWIG_arg_fail(svn_argnum_obj1)) {
@@ -31876,6 +33579,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_file2(PyObject *SWIGUNUSEDPARM(self
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -31886,7 +33591,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_file2(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_wc_translated_file2",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_translated_file2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_translated_file2", "src");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_translated_file2", "versioned_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -31933,7 +33646,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_file2(PyObject *SWIGUNUSEDPARM(self
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -31961,6 +33674,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_file(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -31971,7 +33685,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_file(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_wc_translated_file",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_translated_file",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_translated_file", "vfile");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -32018,7 +33736,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_file(PyObject *SWIGUNUSEDPARM(self)
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
@@ -32047,6 +33765,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_stream(PyObject *SWIGUNUSEDPARM(sel
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_stream_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -32057,7 +33777,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_stream(PyObject *SWIGUNUSEDPARM(sel
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_wc_translated_stream",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_translated_stream",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_translated_stream", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_translated_stream", "versioned_file");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -32131,6 +33859,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas3(PyObject *SWIGUNUSEDPARM
   svn_checksum_t *temp1 ;
   svn_checksum_t *temp2 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -32148,7 +33877,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas3(PyObject *SWIGUNUSEDPARM
   arg9 = _global_pool;
   arg1 = &temp1;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|OO:svn_wc_transmit_text_deltas3",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_transmit_text_deltas3",5,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg3 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -32156,6 +33885,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas3(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_transmit_text_deltas3", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -32211,22 +33944,16 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas3(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_wc_transmit_text_deltas3 arg 1 (svn_checksum_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_wc_transmit_text_deltas3 is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
-    /* FIXME: Missing argout typemap: svn_wc_transmit_text_deltas3 arg 2 (svn_checksum_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_wc_transmit_text_deltas3 is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_checksum_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -32260,6 +33987,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas2(PyObject *SWIGUNUSEDPARM
   PyObject *_global_py_pool = NULL ;
   char *temp1 ;
   unsigned char temp2[APR_MD5_DIGESTSIZE] ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -32273,7 +34001,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas2(PyObject *SWIGUNUSEDPARM
   arg8 = _global_pool;
   arg1 = &temp1;
   arg2 = temp2;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_transmit_text_deltas2",&arg3,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_transmit_text_deltas2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_transmit_text_deltas2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -32334,14 +34066,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas2(PyObject *SWIGUNUSEDPARM
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg1);
+      s = PyBytes_FromString(*arg1);
       if (s == NULL)
       SWIG_fail;
     }
     resultobj = SWIG_Python_AppendOutput(resultobj, s);
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize((char *)arg2, APR_MD5_DIGESTSIZE));
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyBytes_FromStringAndSize((const char *)arg2, APR_MD5_DIGESTSIZE));
   }
   {
     Py_XDECREF(_global_py_pool);
@@ -32367,6 +34099,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas(PyObject *SWIGUNUSEDPARM(
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp6 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -32379,7 +34112,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg7 = _global_pool;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_transmit_text_deltas",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_transmit_text_deltas",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_transmit_text_deltas", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -32440,7 +34177,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas(PyObject *SWIGUNUSEDPARM(
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg6);
+      s = PyBytes_FromString(*arg6);
       if (s == NULL)
       SWIG_fail;
     }
@@ -32468,6 +34205,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_prop_deltas2(PyObject *SWIGUNUSEDPARM
   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 ;
@@ -32477,7 +34215,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_prop_deltas2(PyObject *SWIGUNUSEDPARM
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_transmit_prop_deltas2",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_transmit_prop_deltas2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) 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()) {
@@ -32485,6 +34223,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_prop_deltas2(PyObject *SWIGUNUSEDPARM
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_transmit_prop_deltas2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -32549,6 +34291,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_prop_deltas(PyObject *SWIGUNUSEDPARM(
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   char *temp6 ;
+  PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
@@ -32561,7 +34304,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_prop_deltas(PyObject *SWIGUNUSEDPARM(
   SWIG_fail;
   arg7 = _global_pool;
   arg6 = &temp6;
-  if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_transmit_prop_deltas",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_transmit_prop_deltas",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_transmit_prop_deltas", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -32622,7 +34369,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_prop_deltas(PyObject *SWIGUNUSEDPARM(
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg6);
+      s = PyBytes_FromString(*arg6);
       if (s == NULL)
       SWIG_fail;
     }
@@ -32657,7 +34404,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_default_ignores(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg3 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_get_default_ignores",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_default_ignores",1,2,&obj0,&obj1)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -32725,6 +34472,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ignores2(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *_global_py_pool = NULL ;
   apr_array_header_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -32739,7 +34487,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ignores2(PyObject *SWIGUNUSEDPARM(self), P
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|OO:svn_wc_get_ignores2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_ignores2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -32747,6 +34495,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ignores2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_ignores2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (_global_pool == NULL)
     {
       if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
@@ -32834,7 +34586,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ignores(PyObject *SWIGUNUSEDPARM(self), Py
   SWIG_fail;
   arg4 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_wc_get_ignores",&obj0,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_ignores",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
   {
     if (_global_pool == NULL)
     {
@@ -32903,6 +34655,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_match_ignore_list(PyObject *SWIGUNUSEDPARM(sel
   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_boolean_t result;
@@ -32911,7 +34664,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_match_ignore_list(PyObject *SWIGUNUSEDPARM(sel
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_match_ignore_list",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_match_ignore_list",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_match_ignore_list", "str");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj1,
       sizeof(const char *),
@@ -32959,6 +34716,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_lock2(PyObject *SWIGUNUSEDPARM(self), PyOb
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -32967,7 +34725,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_lock2(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_add_lock2",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_lock2",3,4,&obj0,&obj1,&obj2,&obj3)) 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()) {
@@ -32975,6 +34733,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_lock2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_add_lock2", "abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_lock_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -33027,6 +34789,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   apr_pool_t *arg4 = (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 ;
@@ -33036,7 +34799,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_wc_add_lock",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_add_lock",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_add_lock", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
@@ -33096,6 +34863,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_lock2(PyObject *SWIGUNUSEDPARM(self), P
   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 ;
   
@@ -33103,13 +34871,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_lock2(PyObject *SWIGUNUSEDPARM(self), P
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_remove_lock2",&obj0,&arg2,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_remove_lock2",2,3,&obj0,&obj1,&obj2)) 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;
     }
   }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_remove_lock2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
     if (obj2 != Py_None && obj2 != _global_py_pool) {
@@ -33156,6 +34928,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_lock(PyObject *SWIGUNUSEDPARM(self), Py
   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 ;
@@ -33164,7 +34937,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_lock(PyObject *SWIGUNUSEDPARM(self), Py
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_remove_lock",&arg1,&obj1,&obj2)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_remove_lock",2,3,&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_remove_lock", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -33217,7 +34994,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_min_rev_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_min_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_min_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -33244,7 +35021,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_min_rev_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_min_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_min_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -33266,7 +35043,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_max_rev_set(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_max_rev_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_max_rev_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -33293,7 +35070,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_max_rev_get(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   svn_revnum_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_max_rev_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_max_rev_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -33315,7 +35092,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_switched_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_switched_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_switched_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -33342,7 +35119,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_switched_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_switched_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_switched_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -33364,7 +35141,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_modified_set(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_modified_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_modified_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -33391,7 +35168,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_modified_get(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_modified_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_modified_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -33413,7 +35190,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_sparse_checkout_set(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_sparse_checkout_set",&obj0,&obj1)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_sparse_checkout_set",2,2,&obj0,&obj1)) SWIG_fail;
   {
     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()) {
@@ -33440,7 +35217,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_sparse_checkout_get(PyObject
   PyObject * obj0 = 0 ;
   svn_boolean_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_sparse_checkout_get",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status_t_sparse_checkout_get",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -33459,7 +35236,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_revision_status_t(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   struct svn_wc_revision_status_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_revision_status_t")) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"new_svn_wc_revision_status_t",0,0)) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
@@ -33481,7 +35258,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_revision_status_t(PyObject *SWIGUNUSEDP
   struct svn_wc_revision_status_t *arg1 = (struct svn_wc_revision_status_t *) 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_revision_status_t",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"delete_svn_wc_revision_status_t",1,1,&obj0)) SWIG_fail;
   {
     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()) {
@@ -33505,7 +35282,7 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_revision_status_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_revision_status_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33525,6 +35302,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status2(PyObject *SWIGUNUSEDPARM(self
   PyObject *_global_py_pool = NULL ;
   svn_wc_revision_status_t *temp1 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -33540,7 +35319,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status2(PyObject *SWIGUNUSEDPARM(self
   SWIG_fail;
   arg9 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OszOO|OO:svn_wc_revision_status2",&obj0,&arg3,&arg4,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status2",5,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -33548,6 +35327,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_revision_status2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_revision_status2", "trail_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -33628,6 +35415,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status(PyObject *SWIGUNUSEDPARM(self)
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   svn_wc_revision_status_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -33638,7 +35427,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status(PyObject *SWIGUNUSEDPARM(self)
   SWIG_fail;
   arg7 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"szOO|O:svn_wc_revision_status",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_revision_status",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_revision_status", "wc_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj1, TRUE, "svn_wc_revision_status", "trail_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
@@ -33709,6 +35506,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_changelist2(PyObject *SWIGUNUSEDPARM(self)
   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 ;
@@ -33720,7 +35519,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_changelist2(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg10 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OssOOOO|O:svn_wc_set_changelist2",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_set_changelist2",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) 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()) {
@@ -33728,6 +35527,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_changelist2(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_set_changelist2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_set_changelist2", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_depth_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -33798,6 +35605,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_changelist(PyObject *SWIGUNUSEDPARM(self),
   apr_pool_t *arg8 = (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 ;
@@ -33808,7 +35617,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_changelist(PyObject *SWIGUNUSEDPARM(self),
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_wc_set_changelist",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_set_changelist",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_string_to_cstring(obj0, FALSE, "svn_wc_set_changelist", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_set_changelist", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   {
     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()) {
@@ -33876,6 +35693,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_changelists(PyObject *SWIGUNUSEDPARM(self)
   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 ;
@@ -33888,7 +35706,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_changelists(PyObject *SWIGUNUSEDPARM(self)
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg9 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_wc_get_changelists",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_get_changelists",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) 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()) {
@@ -33896,6 +35714,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_changelists(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_get_changelists", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -33979,6 +35801,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree2(PyObject *SWIGUNUSEDPARM(self), PyO
   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 ;
@@ -33989,7 +35812,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree2(PyObject *SWIGUNUSEDPARM(self), PyO
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_crop_tree2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_crop_tree2",5,6,&obj0,&obj1,&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()) {
@@ -33997,6 +35820,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_crop_tree2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -34062,6 +35889,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree(PyObject *SWIGUNUSEDPARM(self), PyOb
   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 ;
@@ -34072,7 +35900,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree(PyObject *SWIGUNUSEDPARM(self), PyOb
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg8 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_crop_tree",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_crop_tree",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -34080,6 +35908,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_crop_tree", "target");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_depth_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -34144,6 +35976,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_exclude(PyObject *SWIGUNUSEDPARM(self), PyObje
   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 ;
@@ -34153,7 +35986,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_exclude(PyObject *SWIGUNUSEDPARM(self), PyObje
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_exclude",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_exclude",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) 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()) {
@@ -34161,6 +35994,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_exclude(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_exclude", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
     arg4 = obj2;
   }
@@ -34220,6 +36057,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_read_kind2(PyObject *SWIGUNUSEDPARM(self), PyO
   svn_node_kind_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -34230,7 +36068,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_read_kind2(PyObject *SWIGUNUSEDPARM(self), PyO
   SWIG_fail;
   arg6 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_read_kind2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_read_kind2",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34238,6 +36076,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_read_kind2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_read_kind2", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -34306,6 +36148,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_read_kind(PyObject *SWIGUNUSEDPARM(self), PyOb
   svn_node_kind_t temp1 ;
   int res1 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
@@ -34315,7 +36158,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_read_kind(PyObject *SWIGUNUSEDPARM(self), PyOb
   SWIG_fail;
   arg5 = _global_pool;
   arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_read_kind",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_read_kind",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
@@ -34323,6 +36166,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_read_kind(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_read_kind", "abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_boolean_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -34375,28 +36222,28 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_context_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_context_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_adm_access_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_adm_access_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_traversal_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_traversal_info_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_committed_queue_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_committed_queue_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -34417,6 +36264,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_opened(PyObject *S
   svn_boolean_t temp3 ;
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -34428,7 +36276,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_opened(PyObject *S
   arg7 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_diff_callbacks4_invoke_file_opened",&obj0,&arg4,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_file_opened",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -34436,6 +36284,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_opened(PyObject *S
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_diff_callbacks4_invoke_file_opened", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -34524,8 +36376,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_changed(PyObject *
   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 ;
   PyObject * obj12 = 0 ;
@@ -34537,7 +36394,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_changed(PyObject *
   SWIG_fail;
   arg15 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_file_changed",13,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     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()) {
@@ -34557,6 +36414,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_changed(PyObject *
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks4_invoke_file_changed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks4_invoke_file_changed", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks4_invoke_file_changed", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_revnum_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -34569,6 +36438,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_changed(PyObject *
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_wc_diff_callbacks4_invoke_file_changed", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_wc_diff_callbacks4_invoke_file_changed", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -34659,8 +36536,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_added(PyObject *SW
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
@@ -34673,7 +36556,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_added(PyObject *SW
   SWIG_fail;
   arg17 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_file_added",15,16,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
   {
     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()) {
@@ -34693,6 +36576,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_added(PyObject *SW
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks4_invoke_file_added", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks4_invoke_file_added", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks4_invoke_file_added", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_revnum_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -34705,6 +36600,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_added(PyObject *SW
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_wc_diff_callbacks4_invoke_file_added", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_wc_diff_callbacks4_invoke_file_added", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg12 = svn_swig_py_string_to_cstring(obj10, TRUE, "svn_wc_diff_callbacks4_invoke_file_added", "copyfrom_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg13 = (svn_revnum_t)SWIG_As_long (obj11);
     if (SWIG_arg_fail(svn_argnum_obj11)) {
       SWIG_fail;
@@ -34794,6 +36701,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_deleted(PyObject *
   int res3 = SWIG_TMPOBJ ;
   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 ;
@@ -34804,7 +36716,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_deleted(PyObject *
   SWIG_fail;
   arg11 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_file_deleted",9,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -34818,6 +36730,26 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_deleted(PyObject *
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_diff_callbacks4_invoke_file_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks4_invoke_file_deleted", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks4_invoke_file_deleted", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks4_invoke_file_deleted", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_diff_callbacks4_invoke_file_deleted", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_apr_hash_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -34890,6 +36822,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_deleted(PyObject *S
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -34899,7 +36832,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_deleted(PyObject *S
   SWIG_fail;
   arg6 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_wc_diff_callbacks4_invoke_dir_deleted",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_dir_deleted",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -34913,6 +36846,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_deleted(PyObject *S
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_diff_callbacks4_invoke_dir_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None) {
       arg5 = NULL;
     } else if (SWIG_ConvertPtr(obj3, (void **) &arg5, 0, 0) == -1) {
@@ -34984,6 +36921,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_opened(PyObject *SW
   svn_boolean_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
@@ -34996,7 +36934,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_opened(PyObject *SW
   arg2 = &temp2;
   arg3 = &temp3;
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_diff_callbacks4_invoke_dir_opened",&obj0,&arg5,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_dir_opened",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -35004,6 +36942,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_opened(PyObject *SW
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_diff_callbacks4_invoke_dir_opened", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_revnum_t)SWIG_As_long (obj2);
     if (SWIG_arg_fail(svn_argnum_obj2)) {
       SWIG_fail;
@@ -35097,7 +37039,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_added(PyObject *SWI
   int res5 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
@@ -35110,7 +37054,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_added(PyObject *SWI
   arg3 = &temp3;
   arg4 = &temp4;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_dir_added",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     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()) {
@@ -35124,12 +37068,20 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_added(PyObject *SWI
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_diff_callbacks4_invoke_dir_added", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
     }
   }
   {
+    arg8 = svn_swig_py_string_to_cstring(obj4, TRUE, "svn_wc_diff_callbacks4_invoke_dir_added", "copyfrom_path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (svn_revnum_t)SWIG_As_long (obj5);
     if (SWIG_arg_fail(svn_argnum_obj5)) {
       SWIG_fail;
@@ -35217,6 +37169,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_props_changed(PyObj
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -35229,7 +37182,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_props_changed(PyObj
   SWIG_fail;
   arg9 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_dir_props_changed",7,8,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     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()) {
@@ -35243,6 +37196,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_props_changed(PyObj
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_diff_callbacks4_invoke_dir_props_changed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -35330,6 +37287,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_closed(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
@@ -35340,7 +37298,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_closed(PyObject *SW
   SWIG_fail;
   arg8 = _global_pool;
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks4_invoke_dir_closed",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     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()) {
@@ -35360,6 +37318,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_closed(PyObject *SW
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks4_invoke_dir_closed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -35441,15 +37403,20 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_changed(PyObject *
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   svn_error_t *result = 0 ;
   
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_invoke_file_changed",14,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     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()) {
@@ -35475,6 +37442,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_changed(PyObject *
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks3_invoke_file_changed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks3_invoke_file_changed", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_diff_callbacks3_invoke_file_changed", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (svn_revnum_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -35487,6 +37466,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_changed(PyObject *
     }
   }
   {
+    arg11 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_wc_diff_callbacks3_invoke_file_changed", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg12 = svn_swig_py_string_to_cstring(obj10, FALSE, "svn_wc_diff_callbacks3_invoke_file_changed", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -35560,15 +37547,20 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_added(PyObject *SW
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   svn_error_t *result = 0 ;
   
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_invoke_file_added",14,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     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()) {
@@ -35594,6 +37586,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_added(PyObject *SW
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks3_invoke_file_added", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks3_invoke_file_added", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_diff_callbacks3_invoke_file_added", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (svn_revnum_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -35606,6 +37610,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_added(PyObject *SW
     }
   }
   {
+    arg11 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_wc_diff_callbacks3_invoke_file_added", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg12 = svn_swig_py_string_to_cstring(obj10, FALSE, "svn_wc_diff_callbacks3_invoke_file_added", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -35674,12 +37686,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_deleted(PyObject *
   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 ;
   svn_error_t *result = 0 ;
   
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_invoke_file_deleted",10,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -35699,6 +37716,26 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_deleted(PyObject *
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks3_invoke_file_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks3_invoke_file_deleted", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks3_invoke_file_deleted", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_diff_callbacks3_invoke_file_deleted", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg9 = svn_swig_py_string_to_cstring(obj7, FALSE, "svn_wc_diff_callbacks3_invoke_file_deleted", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg10 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_hash_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -35757,12 +37794,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_added(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OOOsOO:svn_wc_diff_callbacks3_invoke_dir_added",&obj0,&obj1,&obj2,&arg5,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_invoke_dir_added",6,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -35782,6 +37820,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_added(PyObject *SWI
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks3_invoke_dir_added", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg6 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -35839,11 +37881,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_deleted(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
   arg4 = &temp4;
-  if (!PyArg_ParseTuple(args,(char *)"OOOsO:svn_wc_diff_callbacks3_invoke_dir_deleted",&obj0,&obj1,&obj2,&arg5,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_invoke_dir_deleted",5,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -35863,6 +37906,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_deleted(PyObject *S
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks3_invoke_dir_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None) {
       arg6 = NULL;
     } else if (SWIG_ConvertPtr(obj4, (void **) &arg6, 0, 0) == -1) {
@@ -35916,13 +37963,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_props_changed(PyObj
   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 ;
   
   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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_invoke_dir_props_changed",7,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     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()) {
@@ -35942,6 +37990,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_props_changed(PyObj
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks3_invoke_dir_props_changed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -36004,12 +38056,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_opened(PyObject *SW
   int res3 = SWIG_TMPOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOO:svn_wc_diff_callbacks3_invoke_dir_opened",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_invoke_dir_opened",5,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -36023,6 +38076,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_opened(PyObject *SW
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_diff_callbacks3_invoke_dir_opened", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -36082,11 +38139,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_closed(PyObject *SW
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
   arg5 = &temp5;
-  if (!PyArg_ParseTuple(args,(char *)"OOOOsO:svn_wc_diff_callbacks3_invoke_dir_closed",&obj0,&obj1,&obj2,&obj3,&arg6,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks3_invoke_dir_closed",6,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -36112,6 +38170,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_closed(PyObject *SW
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks3_invoke_dir_closed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj5 == Py_None) {
       arg7 = NULL;
     } else if (SWIG_ConvertPtr(obj5, (void **) &arg7, 0, 0) == -1) {
@@ -36170,14 +38232,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_changed(PyObject *
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   svn_error_t *result = 0 ;
   
-  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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_invoke_file_changed",14,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     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()) {
@@ -36203,6 +38270,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_changed(PyObject *
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks2_invoke_file_changed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks2_invoke_file_changed", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_diff_callbacks2_invoke_file_changed", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_revnum_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -36215,6 +38294,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_changed(PyObject *
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_wc_diff_callbacks2_invoke_file_changed", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj10, FALSE, "svn_wc_diff_callbacks2_invoke_file_changed", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -36279,14 +38366,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_added(PyObject *SW
   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 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
   svn_error_t *result = 0 ;
   
-  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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_invoke_file_added",14,14,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
     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()) {
@@ -36312,6 +38404,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_added(PyObject *SW
     }
   }
   {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks2_invoke_file_added", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks2_invoke_file_added", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_diff_callbacks2_invoke_file_added", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg8 = (svn_revnum_t)SWIG_As_long (obj7);
     if (SWIG_arg_fail(svn_argnum_obj7)) {
       SWIG_fail;
@@ -36324,6 +38428,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_added(PyObject *SW
     }
   }
   {
+    arg10 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_wc_diff_callbacks2_invoke_file_added", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg11 = svn_swig_py_string_to_cstring(obj10, FALSE, "svn_wc_diff_callbacks2_invoke_file_added", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -36383,11 +38495,16 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_deleted(PyObject *
   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 ;
   svn_error_t *result = 0 ;
   
-  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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_invoke_file_deleted",10,10,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
     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()) {
@@ -36407,6 +38524,26 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_deleted(PyObject *
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks2_invoke_file_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks2_invoke_file_deleted", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks2_invoke_file_deleted", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_diff_callbacks2_invoke_file_deleted", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, FALSE, "svn_wc_diff_callbacks2_invoke_file_deleted", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg9 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_hash_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -36456,11 +38593,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_added(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOsOO:svn_wc_diff_callbacks2_invoke_dir_added",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_invoke_dir_added",6,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -36480,6 +38618,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_added(PyObject *SWI
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks2_invoke_dir_added", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -36528,10 +38670,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_deleted(PyObject *S
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOsO:svn_wc_diff_callbacks2_invoke_dir_deleted",&obj0,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_invoke_dir_deleted",5,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -36551,6 +38694,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_deleted(PyObject *S
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks2_invoke_dir_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None) {
       arg5 = NULL;
     } else if (SWIG_ConvertPtr(obj4, (void **) &arg5, 0, 0) == -1) {
@@ -36595,12 +38742,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_props_changed(PyObj
   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 (!PyArg_ParseTuple(args,(char *)"OOOsOOO:svn_wc_diff_callbacks2_invoke_dir_props_changed",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks2_invoke_dir_props_changed",7,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     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()) {
@@ -36620,6 +38768,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_props_changed(PyObj
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks2_invoke_dir_props_changed", "path");
+    if (PyErr_Occurred()) 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;
@@ -36680,12 +38832,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_changed(PyObject *S
   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 ;
   svn_error_t *result = 0 ;
   
-  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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_invoke_file_changed",11,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     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()) {
@@ -36705,6 +38862,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_changed(PyObject *S
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks_invoke_file_changed", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks_invoke_file_changed", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks_invoke_file_changed", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_revnum_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -36717,6 +38886,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_changed(PyObject *S
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_wc_diff_callbacks_invoke_file_changed", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg10 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_wc_diff_callbacks_invoke_file_changed", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj10 == Py_None) {
       arg11 = NULL;
     } else if (SWIG_ConvertPtr(obj10, (void **) &arg11, 0, 0) == -1) {
@@ -36765,12 +38942,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_added(PyObject *SWI
   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 ;
   svn_error_t *result = 0 ;
   
-  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;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_invoke_file_added",11,11,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
     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()) {
@@ -36790,6 +38972,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_added(PyObject *SWI
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks_invoke_file_added", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks_invoke_file_added", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks_invoke_file_added", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_revnum_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -36802,6 +38996,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_added(PyObject *SWI
     }
   }
   {
+    arg9 = svn_swig_py_string_to_cstring(obj8, FALSE, "svn_wc_diff_callbacks_invoke_file_added", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg10 = svn_swig_py_string_to_cstring(obj9, FALSE, "svn_wc_diff_callbacks_invoke_file_added", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj10 == Py_None) {
       arg11 = NULL;
     } else if (SWIG_ConvertPtr(obj10, (void **) &arg11, 0, 0) == -1) {
@@ -36848,10 +39050,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_deleted(PyObject *S
   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 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOsssssO:svn_wc_diff_callbacks_invoke_file_deleted",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_invoke_file_deleted",9,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     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()) {
@@ -36871,6 +39078,26 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_deleted(PyObject *S
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks_invoke_file_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_diff_callbacks_invoke_file_deleted", "tmpfile1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_diff_callbacks_invoke_file_deleted", "tmpfile2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg7 = svn_swig_py_string_to_cstring(obj6, FALSE, "svn_wc_diff_callbacks_invoke_file_deleted", "mimetype1");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg8 = svn_swig_py_string_to_cstring(obj7, FALSE, "svn_wc_diff_callbacks_invoke_file_deleted", "mimetype2");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj8 == Py_None) {
       arg9 = NULL;
     } else if (SWIG_ConvertPtr(obj8, (void **) &arg9, 0, 0) == -1) {
@@ -36914,11 +39141,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_dir_added(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOsOO:svn_wc_diff_callbacks_invoke_dir_added",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_invoke_dir_added",6,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     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()) {
@@ -36938,6 +39166,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_dir_added(PyObject *SWIG
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks_invoke_dir_added", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_revnum_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -36986,10 +39218,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_dir_deleted(PyObject *SW
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOsO:svn_wc_diff_callbacks_invoke_dir_deleted",&obj0,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_invoke_dir_deleted",5,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -37009,6 +39242,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_dir_deleted(PyObject *SW
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks_invoke_dir_deleted", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj4 == Py_None) {
       arg5 = NULL;
     } else if (SWIG_ConvertPtr(obj4, (void **) &arg5, 0, 0) == -1) {
@@ -37053,12 +39290,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_props_changed(PyObject *
   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 (!PyArg_ParseTuple(args,(char *)"OOOsOOO:svn_wc_diff_callbacks_invoke_props_changed",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_diff_callbacks_invoke_props_changed",7,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     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()) {
@@ -37078,6 +39316,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_props_changed(PyObject *
     }
   }
   {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_diff_callbacks_invoke_props_changed", "path");
+    if (PyErr_Occurred()) 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;
@@ -37132,6 +39374,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_invoke_found_entry(PyObject *
   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 ;
@@ -37141,7 +39384,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_invoke_found_entry(PyObject *
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_entry_callbacks2_invoke_found_entry",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks2_invoke_found_entry",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -37149,6 +39392,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_invoke_found_entry(PyObject *
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_callbacks2_invoke_found_entry", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -37211,6 +39458,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_invoke_handle_error(PyObject
   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 ;
@@ -37220,7 +39468,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_invoke_handle_error(PyObject
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_entry_callbacks2_invoke_handle_error",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks2_invoke_handle_error",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -37228,6 +39476,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_invoke_handle_error(PyObject
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_callbacks2_invoke_handle_error", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg3 = (svn_error_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_error_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -37290,6 +39542,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks_invoke_found_entry(PyObject *S
   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 ;
@@ -37299,7 +39552,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks_invoke_found_entry(PyObject *S
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_entry_callbacks_invoke_found_entry",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_entry_callbacks_invoke_found_entry",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     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()) {
@@ -37307,6 +39560,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks_invoke_found_entry(PyObject *S
     }
   }
   {
+    arg2 = svn_swig_py_string_to_cstring(obj1, FALSE, "svn_wc_entry_callbacks_invoke_found_entry", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -37374,6 +39631,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_external_update(PyObject *SWIGUNUSEDPAR
   svn_string_t value5 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -37384,7 +39642,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_external_update(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg7 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_wc_invoke_external_update",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_external_update",6,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_wc_external_update_t * tmp =
     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);
@@ -37402,15 +39660,23 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_external_update(PyObject *SWIGUNUSEDPAR
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_external_update", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     if (obj3 == Py_None)
     arg4 = NULL;
     else {
-      if (!PyString_Check(obj3)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value4.data = PyString_AS_STRING(obj3);
-      value4.len = PyString_GET_SIZE(obj3);
+      if (PyBytes_AsStringAndSize(obj3, (char **)&(value4.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value4.len = pyStrLen;
       arg4 = &value4;
     }
   }
@@ -37418,12 +39684,16 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_external_update(PyObject *SWIGUNUSEDPAR
     if (obj4 == Py_None)
     arg5 = NULL;
     else {
-      if (!PyString_Check(obj4)) {
-        PyErr_SetString(PyExc_TypeError, "not a string");
+      Py_ssize_t pyStrLen;
+      if (!PyBytes_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a bytes object");
         SWIG_fail;
       }
-      value5.data = PyString_AS_STRING(obj4);
-      value5.len = PyString_GET_SIZE(obj4);
+      if (PyBytes_AsStringAndSize(obj4, (char **)&(value5.data),
+          &pyStrLen) == -1) {
+        SWIG_fail;
+      }
+      value5.len = pyStrLen;
       arg5 = &value5;
     }
   }
@@ -37489,7 +39759,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_notify_func2(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_wc_invoke_notify_func2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_notify_func2",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_notify_func2_t * tmp =
     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);
@@ -37554,13 +39824,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_notify_func(PyObject *SWIGUNUSEDPARM(se
   svn_revnum_t arg9 ;
   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 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOsOOO:svn_wc_invoke_notify_func",&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_notify_func",9,9,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     svn_wc_notify_func_t * tmp =
     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);
@@ -37578,6 +39850,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_notify_func(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_notify_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_wc_notify_action_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -37590,6 +39866,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_notify_func(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg6 = svn_swig_py_string_to_cstring(obj5, FALSE, "svn_wc_invoke_notify_func", "mime_type");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg7 = (svn_wc_notify_state_t)SWIG_As_long (obj6);
     if (SWIG_arg_fail(svn_argnum_obj6)) {
       SWIG_fail;
@@ -37649,7 +39929,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_conflict_resolver_func2(PyObject *SWIGU
   SWIG_fail;
   arg6 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_wc_invoke_conflict_resolver_func2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_conflict_resolver_func2",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_wc_conflict_resolver_func2_t * tmp =
     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);
@@ -37755,7 +40035,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_conflict_resolver_func(PyObject *SWIGUN
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_wc_invoke_conflict_resolver_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_conflict_resolver_func",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_conflict_resolver_func_t * tmp =
     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);
@@ -37837,6 +40117,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func4(PyObject *SWIGUNUSEDPARM(s
   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 ;
@@ -37845,7 +40126,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func4(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_wc_invoke_status_func4",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_status_func4",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_wc_status_func4_t * tmp =
     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);
@@ -37863,6 +40144,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func4(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_status_func4", "local_abspath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -37918,6 +40203,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func3(PyObject *SWIGUNUSEDPARM(s
   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 ;
@@ -37926,7 +40212,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func3(PyObject *SWIGUNUSEDPARM(s
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_wc_invoke_status_func3",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_status_func3",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_wc_status_func3_t * tmp =
     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);
@@ -37944,6 +40230,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func3(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_status_func3", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -37996,9 +40286,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func2(PyObject *SWIGUNUSEDPARM(s
   svn_wc_status2_t *arg4 = (svn_wc_status2_t *) 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_wc_invoke_status_func2",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_status_func2",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_status_func2_t * tmp =
     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);
@@ -38016,6 +40307,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func2(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_status_func2", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -38044,9 +40339,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func(PyObject *SWIGUNUSEDPARM(se
   svn_wc_status_t *arg4 = (svn_wc_status_t *) 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_wc_invoke_status_func",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_status_func",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_status_func_t * tmp =
     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);
@@ -38064,6 +40360,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_status_func", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     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;
@@ -38101,6 +40401,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_get_file(PyObject *SWIGUNUSEDPARM(self)
   apr_hash_t *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
@@ -38112,7 +40413,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_get_file(PyObject *SWIGUNUSEDPARM(self)
   arg8 = _global_pool;
   arg6 = &temp6;
   arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_wc_invoke_get_file",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_get_file",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_wc_get_file_t * tmp =
     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);
@@ -38130,6 +40431,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_get_file(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_get_file", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg4 = (svn_revnum_t)SWIG_As_long (obj3);
     if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
@@ -38208,6 +40513,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_dirents_func(PyObject *SWIGUNUSEDPARM(s
   apr_hash_t *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   svn_error_t *result = 0 ;
@@ -38221,7 +40528,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_dirents_func(PyObject *SWIGUNUSEDPARM(s
   SWIG_fail;
   arg7 = _global_pool;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOss|OO:svn_wc_invoke_dirents_func",&obj0,&obj1,&arg4,&arg5,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_dirents_func",4,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_wc_dirents_func_t * tmp =
     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);
@@ -38238,6 +40545,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_dirents_func(PyObject *SWIGUNUSEDPARM(s
       PyErr_Clear();
     }
   }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_dirents_func", "repos_root_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_invoke_dirents_func", "repos_relpath");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -38321,7 +40636,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_canonicalize_svn_prop_get_file(PyObject
   SWIG_fail;
   arg5 = _global_pool;
   arg2 = &temp2;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_wc_invoke_canonicalize_svn_prop_get_file",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_canonicalize_svn_prop_get_file",3,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_canonicalize_svn_prop_get_file_t * tmp =
     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);
@@ -38381,9 +40696,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_canonicalize_svn_prop_get_file(PyObject
     if (*arg2 == NULL) {
       Py_INCREF(Py_None);
       s = Py_None;
-    }
-    else {
-      s = PyString_FromStringAndSize((*arg2)->data, (*arg2)->len);
+    } else {
+      s = PyBytes_FromStringAndSize((*arg2)->data, (*arg2)->len);
       if (s == NULL)
       SWIG_fail;
     }
@@ -38416,6 +40730,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_upgrade_get_repos_info(PyObject *SWIGUN
   char *temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -38430,7 +40745,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_upgrade_get_repos_info(PyObject *SWIGUN
   arg7 = _global_pool;
   arg2 = &temp2;
   arg3 = &temp3;
-  if (!PyArg_ParseTuple(args,(char *)"OOs|OO:svn_wc_invoke_upgrade_get_repos_info",&obj0,&obj1,&arg5,&obj3,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_upgrade_get_repos_info",3,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_wc_upgrade_get_repos_info_t * tmp =
     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);
@@ -38447,6 +40762,10 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_upgrade_get_repos_info(PyObject *SWIGUN
       PyErr_Clear();
     }
   }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_wc_invoke_upgrade_get_repos_info", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
     if (obj3 != Py_None && obj3 != _global_py_pool) {
@@ -38489,7 +40808,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_upgrade_get_repos_info(PyObject *SWIGUN
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg2);
+      s = PyBytes_FromString(*arg2);
       if (s == NULL)
       SWIG_fail;
     }
@@ -38502,7 +40821,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_upgrade_get_repos_info(PyObject *SWIGUN
       s = Py_None;
     }
     else {
-      s = PyString_FromString(*arg3);
+      s = PyBytes_FromString(*arg3);
       if (s == NULL)
       SWIG_fail;
     }
@@ -38538,6 +40857,9 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator3(PyObject *SWIGUNU
   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 ;
   
@@ -38545,7 +40867,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator3(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOzss|O:svn_wc_invoke_relocation_validator3",&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_relocation_validator3",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_wc_relocation_validator3_t * tmp =
     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);
@@ -38562,6 +40884,18 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator3(PyObject *SWIGUNU
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_invoke_relocation_validator3", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_invoke_relocation_validator3", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg5 = svn_swig_py_string_to_cstring(obj4, FALSE, "svn_wc_invoke_relocation_validator3", "root_url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
     if (obj5 != Py_None && obj5 != _global_py_pool) {
@@ -38613,6 +40947,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator2(PyObject *SWIGUNU
   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 ;
@@ -38621,7 +40957,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator2(PyObject *SWIGUNU
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg6 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOzsO|O:svn_wc_invoke_relocation_validator2",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_relocation_validator2",5,6,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_wc_relocation_validator2_t * tmp =
     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);
@@ -38639,6 +40975,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator2(PyObject *SWIGUNU
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_invoke_relocation_validator2", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_invoke_relocation_validator2", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     arg5 = (svn_boolean_t)SWIG_As_long (obj4);
     if (SWIG_arg_fail(svn_argnum_obj4)) {
       SWIG_fail;
@@ -38691,9 +41035,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator(PyObject *SWIGUNUS
   char *arg4 = (char *) 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOzs:svn_wc_invoke_relocation_validator",&obj0,&obj1,&arg3,&arg4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_invoke_relocation_validator",4,4,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_relocation_validator_t * tmp =
     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);
@@ -38711,6 +41057,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator(PyObject *SWIGUNUS
     }
   }
   {
+    arg3 = svn_swig_py_string_to_cstring(obj2, TRUE, "svn_wc_invoke_relocation_validator", "uuid");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_wc_invoke_relocation_validator", "url");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
     svn_swig_py_release_py_lock();
     
     result = (svn_error_t *)svn_wc_invoke_relocation_validator(arg1,arg2,(char const *)arg3,(char const *)arg4);
@@ -38746,6 +41100,8 @@ SWIGINTERN PyObject *_wrap_svn_changelist_invoke_receiver(PyObject *SWIGUNUSEDPA
   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 ;
   
@@ -38753,7 +41109,7 @@ SWIGINTERN PyObject *_wrap_svn_changelist_invoke_receiver(PyObject *SWIGUNUSEDPA
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOss|O:svn_changelist_invoke_receiver",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_changelist_invoke_receiver",4,5,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_changelist_receiver_t * tmp =
     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);
@@ -38770,6 +41126,14 @@ SWIGINTERN PyObject *_wrap_svn_changelist_invoke_receiver(PyObject *SWIGUNUSEDPA
       PyErr_Clear();
     }
   }
+  {
+    arg3 = svn_swig_py_string_to_cstring(obj2, FALSE, "svn_changelist_invoke_receiver", "path");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    arg4 = svn_swig_py_string_to_cstring(obj3, FALSE, "svn_changelist_invoke_receiver", "changelist");
+    if (PyErr_Occurred()) SWIG_fail;
+  }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
     if (obj4 != Py_None && obj4 != _global_py_pool) {
@@ -38811,119 +41175,119 @@ fail:
 
 SWIGINTERN PyObject *svn_wc_external_update_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_notify_func2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_notify_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_conflict_resolver_func2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_conflict_resolver_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_status_func4_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_status_func3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_status_func2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_status_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_get_file_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_dirents_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_canonicalize_svn_prop_get_file_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_upgrade_get_repos_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_relocation_validator3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_relocation_validator2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(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, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_wc_relocation_validator_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *svn_changelist_receiver_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -38940,7 +41304,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_swig_init_asp_dot_net_hack(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg1 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"|O:svn_wc_swig_init_asp_dot_net_hack",&obj0)) SWIG_fail;
+  if(!PyArg_UnpackTuple(args,(char *)"svn_wc_swig_init_asp_dot_net_hack",0,1,&obj0)) SWIG_fail;
   if (obj0) {
     /* Verify that the user supplied a valid pool */
     if (obj0 != Py_None && obj0 != _global_py_pool) {
@@ -39833,6 +42197,8 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_client_conflict_option_t = {"_p_svn_client_conflict_option_t", "svn_client_conflict_option_t *", 0, 0, (void*)0, 0};
 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_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
@@ -40024,6 +42390,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
+  &_swigt__p_svn_client__shelf_version_t,
+  &_swigt__p_svn_client_conflict_option_t,
   &_swigt__p_svn_commit_info_t,
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
@@ -40215,6 +42583,8 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_client_conflict_option_t[] = {  {&_swigt__p_svn_client_conflict_option_t, 0, 0, 0},{0, 0, 0, 0}};
 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_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -40406,6 +42776,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
+  _swigc__p_svn_client__shelf_version_t,
+  _swigc__p_svn_client_conflict_option_t,
   _swigc__p_svn_commit_info_t,
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
diff --git a/subversion/bindings/swig/python/tests/auth.py b/subversion/bindings/swig/python/tests/auth.py
index 8c85273..eec8ce1 100644
--- a/subversion/bindings/swig/python/tests/auth.py
+++ b/subversion/bindings/swig/python/tests/auth.py
@@ -27,87 +27,87 @@ class SubversionAuthTestCase(unittest.TestCase):
 
   def test_open(self):
     baton = core.svn_auth_open([])
-    self.assert_(baton is not None)
+    self.assertTrue(baton is not None)
 
   def test_set_parameter(self):
     baton = core.svn_auth_open([])
-    core.svn_auth_set_parameter(baton, "name", "somedata")
-    core.svn_auth_set_parameter(baton, "name", None)
-    core.svn_auth_set_parameter(baton, "name", 2)
-    core.svn_auth_set_parameter(baton, "name",
+    core.svn_auth_set_parameter(baton, b"name", b"somedata")
+    core.svn_auth_set_parameter(baton, b"name", None)
+    core.svn_auth_set_parameter(baton, b"name", 2)
+    core.svn_auth_set_parameter(baton, b"name",
                                 core.svn_auth_ssl_server_cert_info_t())
 
   def test_invalid_cred_kind(self):
     baton = core.svn_auth_open([])
     self.assertRaises(core.SubversionException,
             lambda: core.svn_auth_first_credentials(
-                "unknown", "somerealm", baton))
+                b"unknown", b"somerealm", baton))
 
   def test_credentials_get_username(self):
     def myfunc(realm, maysave, pool):
-      self.assertEquals("somerealm", realm)
+      self.assertEqual(b"somerealm", realm)
       username_cred = core.svn_auth_cred_username_t()
-      username_cred.username = "bar"
+      username_cred.username = b"bar"
       username_cred.may_save = False
       return username_cred
     baton = core.svn_auth_open([core.svn_auth_get_username_prompt_provider(myfunc, 1)])
     creds = core.svn_auth_first_credentials(
-                core.SVN_AUTH_CRED_USERNAME, "somerealm", baton)
-    self.assert_(creds is not None)
+                core.SVN_AUTH_CRED_USERNAME, b"somerealm", baton)
+    self.assertTrue(creds is not None)
 
   def test_credentials_get_simple(self):
     def myfunc(realm, username, may_save, pool):
-      self.assertEquals("somerealm", realm)
+      self.assertEqual(b"somerealm", realm)
       simple_cred = core.svn_auth_cred_simple_t()
-      simple_cred.username = "mijnnaam"
-      simple_cred.password = "geheim"
+      simple_cred.username = b"mijnnaam"
+      simple_cred.password = b"geheim"
       simple_cred.may_save = False
       return simple_cred
     baton = core.svn_auth_open([core.svn_auth_get_simple_prompt_provider(myfunc, 1)])
     creds = core.svn_auth_first_credentials(
-                core.SVN_AUTH_CRED_SIMPLE, "somerealm", baton)
-    self.assert_(creds is not None)
+                core.SVN_AUTH_CRED_SIMPLE, b"somerealm", baton)
+    self.assertTrue(creds is not None)
 
   def test_credentials_get_ssl_client_cert(self):
     def myfunc(realm, may_save, pool):
-      self.assertEquals("somerealm", realm)
+      self.assertEqual(b"somerealm", realm)
       ssl_cred = core.svn_auth_cred_ssl_client_cert_t()
-      ssl_cred.cert_file = "my-certs-file"
+      ssl_cred.cert_file = b"my-certs-file"
       ssl_cred.may_save = False
       return ssl_cred
     baton = core.svn_auth_open([core.svn_auth_get_ssl_client_cert_prompt_provider(myfunc, 1)])
     creds = core.svn_auth_first_credentials(
-                core.SVN_AUTH_CRED_SSL_CLIENT_CERT, "somerealm", baton)
-    self.assert_(creds is not None)
+                core.SVN_AUTH_CRED_SSL_CLIENT_CERT, b"somerealm", baton)
+    self.assertTrue(creds is not None)
 
   def test_credentials_get_ssl_client_cert_pw(self):
     def myfunc(realm, may_save, pool):
-      self.assertEquals("somerealm", realm)
+      self.assertEqual(b"somerealm", realm)
       ssl_cred_pw = core.svn_auth_cred_ssl_client_cert_pw_t()
-      ssl_cred_pw.password = "supergeheim"
+      ssl_cred_pw.password = b"supergeheim"
       ssl_cred_pw.may_save = False
       return ssl_cred_pw
     baton = core.svn_auth_open([core.svn_auth_get_ssl_client_cert_pw_prompt_provider(myfunc, 1)])
     creds = core.svn_auth_first_credentials(
-                core.SVN_AUTH_CRED_SSL_CLIENT_CERT_PW, "somerealm", baton)
-    self.assert_(creds is not None)
+                core.SVN_AUTH_CRED_SSL_CLIENT_CERT_PW, b"somerealm", baton)
+    self.assertTrue(creds is not None)
 
   def test_credentials_get_ssl_server_trust(self):
     def myfunc(realm, failures, cert_info, may_save, pool):
-      self.assertEquals("somerealm", realm)
+      self.assertEqual(b"somerealm", realm)
       ssl_trust = core.svn_auth_cred_ssl_server_trust_t()
       ssl_trust.accepted_failures = 0
       ssl_trust.may_save = False
       return ssl_trust
     baton = core.svn_auth_open([core.svn_auth_get_ssl_server_trust_prompt_provider(myfunc)])
     core.svn_auth_set_parameter(baton, core.SVN_AUTH_PARAM_SSL_SERVER_FAILURES,
-                                "2")
+                                b"2")
     cert_info = core.svn_auth_ssl_server_cert_info_t()
     core.svn_auth_set_parameter(baton, core.SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO,
                 cert_info)
     creds = core.svn_auth_first_credentials(
-                core.SVN_AUTH_CRED_SSL_SERVER_TRUST, "somerealm", baton)
-    self.assert_(creds is not None)
+                core.SVN_AUTH_CRED_SSL_SERVER_TRUST, b"somerealm", baton)
+    self.assertTrue(creds is not None)
 
 def suite():
     return unittest.defaultTestLoader.loadTestsFromTestCase(
diff --git a/subversion/bindings/swig/python/tests/checksum.py b/subversion/bindings/swig/python/tests/checksum.py
index 83da28c..a8f3ca4 100644
--- a/subversion/bindings/swig/python/tests/checksum.py
+++ b/subversion/bindings/swig/python/tests/checksum.py
@@ -29,7 +29,7 @@ class ChecksumTestCases(unittest.TestCase):
         val = svn.core.svn_checksum_create(kind)
         check_val = svn.core.svn_checksum_to_cstring_display(val)
 
-        self.assertTrue(isinstance(check_val, str),
+        self.assertTrue(isinstance(check_val, bytes),
                               "Type of digest not string")
         self.assertEqual(len(check_val), 2*expected_length,
                          "Length of digest does not match kind")
diff --git a/subversion/bindings/swig/python/tests/client.py b/subversion/bindings/swig/python/tests/client.py
index 07fb773..422dc4f 100644
--- a/subversion/bindings/swig/python/tests/client.py
+++ b/subversion/bindings/swig/python/tests/client.py
@@ -32,10 +32,21 @@ except ImportError:
 class SubversionClientTestCase(unittest.TestCase):
   """Test cases for the basic SWIG Subversion client layer"""
 
+  def assert_all_instances_of(self, iterable, instancetype):
+    """Asserts that all object from iterable are an instance of instancetype."""
+
+    self.assertTrue(not [x for x in iterable if not isinstance(x, instancetype)])
+
   def log_message_func(self, items, pool):
     """ Simple log message provider for unit tests. """
     self.log_message_func_calls += 1
-    return "Test log message"
+    return b"Test log message"
+
+  def make_log_message_func(self, message):
+    def generic_log_message_func(items, pool):
+      self.log_message_func_calls += 1
+      return message
+    return generic_log_message_func
 
   def log_receiver(self, changed_paths, revision, author, date, message, pool):
     """ Function to receive log messages retrieved by client.log3(). """
@@ -50,10 +61,10 @@ class SubversionClientTestCase(unittest.TestCase):
   def setUp(self):
     """Set up authentication and client context"""
     self.client_ctx = client.svn_client_create_context()
-    self.assertEquals(self.client_ctx.log_msg_baton2, None)
-    self.assertEquals(self.client_ctx.log_msg_func2, None)
-    self.assertEquals(self.client_ctx.log_msg_baton3, None)
-    self.assertEquals(self.client_ctx.log_msg_func3, None)
+    self.assertEqual(self.client_ctx.log_msg_baton2, None)
+    self.assertEqual(self.client_ctx.log_msg_func2, None)
+    self.assertEqual(self.client_ctx.log_msg_baton3, None)
+    self.assertEqual(self.client_ctx.log_msg_func3, None)
     self.client_ctx.log_msg_func3 = client.svn_swig_py_get_commit_log_func
     self.client_ctx.log_msg_baton3 = self.log_message_func
     self.log_message_func_calls = 0
@@ -84,22 +95,22 @@ class SubversionClientTestCase(unittest.TestCase):
     weakref_baton = weakref.ref(baton)
     self.client_ctx.log_msg_baton2 = baton
     baton = None
-    self.assertEquals(self.client_ctx.log_msg_baton2(), 1)
-    self.assertEquals(weakref_baton()(), 1)
+    self.assertEqual(self.client_ctx.log_msg_baton2(), 1)
+    self.assertEqual(weakref_baton()(), 1)
     self.client_ctx.log_msg_baton2 = None
-    self.assertEquals(self.client_ctx.log_msg_baton2, None)
-    self.assertEquals(weakref_baton(), None)
+    self.assertEqual(self.client_ctx.log_msg_baton2, None)
+    self.assertEqual(weakref_baton(), None)
 
     # External objects should retain their current parent pool
-    self.assertNotEquals(self.client_ctx._parent_pool,
+    self.assertNotEqual(self.client_ctx._parent_pool,
                          self.client_ctx.auth_baton._parent_pool)
 
     # notify_func2 and notify_baton2 were generated by
     # svn_client_create_context, so they should have
     # the same pool as the context
-    self.assertEquals(self.client_ctx._parent_pool,
+    self.assertEqual(self.client_ctx._parent_pool,
                       self.client_ctx.notify_func2._parent_pool)
-    self.assertEquals(self.client_ctx._parent_pool,
+    self.assertEqual(self.client_ctx._parent_pool,
                       self.client_ctx.notify_baton2._parent_pool)
 
   def testMethodCalls(self):
@@ -129,8 +140,8 @@ class SubversionClientTestCase(unittest.TestCase):
 
     # We keep track of these objects in separate variables here
     # because you can't get a PyObject back out of a PY_AS_VOID field
-    test_object1 = lambda *args: "message 1"
-    test_object2 = lambda *args: "message 2"
+    test_object1 = lambda *args: b"message 1"
+    test_object2 = lambda *args: b"message 2"
 
     # Verify that the refcount of a Python object is incremented when
     # you insert it into a PY_AS_VOID field.
@@ -186,7 +197,7 @@ class SubversionClientTestCase(unittest.TestCase):
 
   def test_mkdir_url(self):
     """Test svn_client_mkdir2 on a file:// URL"""
-    directory = urljoin(self.repos_uri+"/", "dir1")
+    directory = urljoin(self.repos_uri+b"/", b"dir1")
 
     commit_info = client.mkdir2((directory,), self.client_ctx)
     self.assertEqual(commit_info.revision, 13)
@@ -194,28 +205,53 @@ class SubversionClientTestCase(unittest.TestCase):
 
   def test_mkdir_url_with_revprops(self):
     """Test svn_client_mkdir3 on a file:// URL, with added revprops"""
-    directory = urljoin(self.repos_uri+"/", "some/deep/subdir")
+    directory = urljoin(self.repos_uri+b"/", b"some/deep/subdir")
+
+    commit_info = client.mkdir3((directory,), 1, {b'customprop':b'value'},
+                                self.client_ctx)
+    self.assertEqual(commit_info.revision, 13)
+    self.assertEqual(self.log_message_func_calls, 1)
+
+  def test_get_commit_log3_callback_accept_unicode(self):
+    """Test svn_client_get_commit_log3_t callback wrapper accept unicode as return value"""
+    directory = urljoin(self.repos_uri+b"/", b"dir1")
+    # override callback function which returns commit log as unicode
+    unicode_log_message_func = self.make_log_message_func(u"Test log message")
+    self.client_ctx.log_msg_baton3 = unicode_log_message_func
 
-    commit_info = client.mkdir3((directory,), 1, {'customprop':'value'},
+    commit_info = client.mkdir3((directory,), 1, {b'customprop':b'value'},
                                 self.client_ctx)
     self.assertEqual(commit_info.revision, 13)
     self.assertEqual(self.log_message_func_calls, 1)
 
+  def test_get_commit_log3_callback_unicode_error(self):
+    """Test svn_client_get_commit_log3_t callback wrapper handles UnicodeEncodeError correctly"""
+    directory = urljoin(self.repos_uri+b"/", b"dir1")
+    # override callback function which returns commit log as unicode
+    # which contains surrogate escaped character
+    bogus_log_message_func = self.make_log_message_func(u"Test \udc6cog"
+                                                        u" message")
+    self.client_ctx.log_msg_baton3 = bogus_log_message_func
+
+    with self.assertRaises(UnicodeEncodeError):
+      commit_info = client.mkdir3((directory,), 1, {b'customprop':b'value'},
+                                  self.client_ctx)
+
   def test_log3_url(self):
     """Test svn_client_log3 on a file:// URL"""
-    directory = urljoin(self.repos_uri+"/", "trunk/dir1")
+    directory = urljoin(self.repos_uri+b"/", b"trunk/dir1")
 
     start = core.svn_opt_revision_t()
     end = core.svn_opt_revision_t()
-    core.svn_opt_parse_revision(start, end, "4:0")
+    core.svn_opt_parse_revision(start, end, b"4:0")
     client.log3((directory,), start, start, end, 1, True, False,
         self.log_receiver, self.client_ctx)
-    self.assertEqual(self.change_author, "john")
-    self.assertEqual(self.log_message, "More directories.")
+    self.assertEqual(self.change_author, b"john")
+    self.assertEqual(self.log_message, b"More directories.")
     self.assertEqual(len(self.changed_paths), 3)
-    for dir in ('/trunk/dir1', '/trunk/dir2', '/trunk/dir3'):
-      self.assert_(dir in self.changed_paths)
-      self.assertEqual(self.changed_paths[dir].action, 'A')
+    for dir in (b'/trunk/dir1', b'/trunk/dir2', b'/trunk/dir3'):
+      self.assertTrue(dir in self.changed_paths)
+      self.assertEqual(self.changed_paths[dir].action, b'A')
 
   def test_log5(self):
     """Test svn_client_log5."""
@@ -236,17 +272,50 @@ class SubversionClientTestCase(unittest.TestCase):
     client.log5((self.repos_uri,), end, (rev_range,), 0, False, True, False, (),
         self.log_entry_receiver, self.client_ctx)
 
-    self.assertEqual(self.received_revisions, range(0, 5))
+    self.assertEqual(self.received_revisions, list(range(0, 5)))
+
+  def test_log5_revprops(self):
+    """Test svn_client_log5 revprops (for typemap(in) apr_array_t *STRINGLIST)"""
+    directory = urljoin(self.repos_uri+b"/", b"trunk/dir1")
+    start = core.svn_opt_revision_t()
+    end = core.svn_opt_revision_t()
+    core.svn_opt_parse_revision(start, end, b"4:0")
+    rev_range = core.svn_opt_revision_range_t()
+    rev_range.start = start
+    rev_range.end = end
+    entry_pool = core.Pool()
+
+    def log_entry_receiver_whole(log_entry, pool):
+      """An implementation of svn_log_entry_receiver_t, holds whole log entries."""
+      self.received_log_entries.append(core.svn_log_entry_dup(log_entry,
+                                                              entry_pool))
+
+    self.received_log_entries = []
+
+    # (Python 3: pass tuple of bytes and str mixture as revprops argment)
+    client.log5((directory,), start, (rev_range,), 1, True, False, False,
+                ('svn:author', b'svn:log'),
+                log_entry_receiver_whole, self.client_ctx)
+    self.assertEqual(len(self.received_log_entries), 1)
+    revprops = self.received_log_entries[0].revprops
+    self.assertEqual(revprops[b'svn:log'], b"More directories.")
+    self.assertEqual(revprops[b'svn:author'], b"john")
+    with self.assertRaises(KeyError):
+      commit_date = revprops['svn:date']
+    with self.assertRaises(UnicodeEncodeError):
+      client.log5((directory,), start, (rev_range,), 1, True, False, False,
+                  (u'svn:\udc61uthor', b'svn:log'),
+                  log_entry_receiver_whole, self.client_ctx)
 
   def test_uuid_from_url(self):
     """Test svn_client_uuid_from_url on a file:// URL"""
-    self.assert_(isinstance(
+    self.assertTrue(isinstance(
                  client.uuid_from_url(self.repos_uri, self.client_ctx),
-                 basestring))
+                 bytes))
 
   def test_url_from_path(self):
     """Test svn_client_url_from_path for a file:// URL"""
-    self.assertEquals(client.url_from_path(self.repos_uri), self.repos_uri)
+    self.assertEqual(client.url_from_path(self.repos_uri), self.repos_uri)
 
     rev = core.svn_opt_revision_t()
     rev.kind = core.svn_opt_revision_head
@@ -256,7 +325,7 @@ class SubversionClientTestCase(unittest.TestCase):
     client.checkout2(self.repos_uri, path, rev, rev, True, True,
                      self.client_ctx)
 
-    self.assertEquals(client.url_from_path(path), self.repos_uri)
+    self.assertEqual(client.url_from_path(path), self.repos_uri)
 
   def test_uuid_from_path(self):
     """Test svn_client_uuid_from_path."""
@@ -270,11 +339,11 @@ class SubversionClientTestCase(unittest.TestCase):
 
     wc_adm = wc.adm_open3(None, path, False, 0, None)
 
-    self.assertEquals(client.uuid_from_path(path, wc_adm, self.client_ctx),
+    self.assertEqual(client.uuid_from_path(path, wc_adm, self.client_ctx),
                       client.uuid_from_url(self.repos_uri, self.client_ctx))
 
-    self.assert_(isinstance(client.uuid_from_path(path, wc_adm,
-                            self.client_ctx), basestring))
+    self.assertTrue(isinstance(client.uuid_from_path(path, wc_adm,
+                            self.client_ctx), bytes))
 
   def test_open_ra_session(self):
       """Test svn_client_open_ra_session()."""
@@ -297,8 +366,8 @@ class SubversionClientTestCase(unittest.TestCase):
     try:
       # Test 1: Run info -r BASE. We expect the size value to be filled in.
       rev.kind = core.svn_opt_revision_base
-      readme_path = '%s/trunk/README.txt' % wc_path
-      readme_url = '%s/trunk/README.txt' % self.repos_uri
+      readme_path = b'%s/trunk/README.txt' % wc_path
+      readme_url = b'%s/trunk/README.txt' % self.repos_uri
       client.info(readme_path, rev, rev, self.info_receiver,
                   False, self.client_ctx)
 
@@ -344,8 +413,8 @@ class SubversionClientTestCase(unittest.TestCase):
                      True, False, self.client_ctx)
 
     # Let's try to backport a change from the v1x branch
-    trunk_path = core.svn_dirent_join(wc_path, 'trunk')
-    v1x_path = core.svn_dirent_join(wc_path, 'branches/v1x')
+    trunk_path = core.svn_dirent_join(wc_path, b'trunk')
+    v1x_path = core.svn_dirent_join(wc_path, b'branches/v1x')
 
     start = core.svn_opt_revision_t()
     start.kind = core.svn_opt_revision_number
@@ -365,25 +434,24 @@ class SubversionClientTestCase(unittest.TestCase):
 
     # Did it take effect?
     readme_path_native = core.svn_dirent_local_style(
-      core.svn_dirent_join(trunk_path, 'README.txt')
+      core.svn_dirent_join(trunk_path, b'README.txt')
     )
 
-    readme = open(readme_path_native, 'r')
+    readme = open(readme_path_native, 'rb')
     readme_text = readme.read()
     readme.close()
 
-    self.assertEqual(readme_text, 'This is a test.\n')
+    self.assertEqual(readme_text,
+                     b'This is a test.' + os.linesep.encode('UTF-8'))
 
   def test_platform_providers(self):
     providers = core.svn_auth_get_platform_specific_client_providers(None, None)
     # Not much more we can test in this minimal environment.
-    self.assert_(isinstance(providers, list))
-    self.assert_(not filter(lambda x:
-                             not isinstance(x, core.svn_auth_provider_object_t),
-                            providers))
+    self.assertTrue(isinstance(providers, list))
+    self.assert_all_instances_of(providers, core.svn_auth_provider_object_t)
 
   def testGnomeKeyring(self):
-    if not hasattr(core, 'svn_auth_set_gnome_keyring_unlock_prompt_func'):
+    if getattr(core, 'svn_auth_set_gnome_keyring_unlock_prompt_func', None) is None:
       # gnome-keying not compiled in, do nothing
       return
 
@@ -393,49 +461,49 @@ class SubversionClientTestCase(unittest.TestCase):
     # just test if this doesn't error out, there's not even a return
     # value to test.
     def prompt_func(realm_string, pool):
-      return "Foo"
+      return b"Foo"
 
     core.svn_auth_set_gnome_keyring_unlock_prompt_func(self.client_ctx.auth_baton, prompt_func)
 
   def proplist_receiver_trunk(self, path, props, iprops, pool):
-    self.assertEquals(props['svn:global-ignores'], '*.q\n')
+    self.assertEqual(props[b'svn:global-ignores'], b'*.q\n')
     self.proplist_receiver_trunk_calls += 1
 
   def proplist_receiver_dir1(self, path, props, iprops, pool):
-    self.assertEquals(iprops[self.proplist_receiver_dir1_key],
-                      {'svn:global-ignores':'*.q\n'})
+    self.assertEqual(iprops[self.proplist_receiver_dir1_key],
+                      {b'svn:global-ignores':b'*.q\n'})
     self.proplist_receiver_dir1_calls += 1
 
   def test_inherited_props(self):
     """Test inherited props"""
 
-    trunk_url = self.repos_uri + '/trunk'
-    client.propset_remote('svn:global-ignores', '*.q', trunk_url,
+    trunk_url = self.repos_uri + b'/trunk'
+    client.propset_remote(b'svn:global-ignores', b'*.q', trunk_url,
                           False, 12, {}, None, self.client_ctx)
 
     head = core.svn_opt_revision_t()
     head.kind = core.svn_opt_revision_head
-    props, iprops, rev = client.propget5('svn:global-ignores', trunk_url,
+    props, iprops, rev = client.propget5(b'svn:global-ignores', trunk_url,
                                          head, head, core.svn_depth_infinity,
                                          None, self.client_ctx)
-    self.assertEquals(props[trunk_url], '*.q\n')
+    self.assertEqual(props[trunk_url], b'*.q\n')
 
-    dir1_url = trunk_url + '/dir1'
-    props, iprops, rev = client.propget5('svn:global-ignores', dir1_url,
+    dir1_url = trunk_url + b'/dir1'
+    props, iprops, rev = client.propget5(b'svn:global-ignores', dir1_url,
                                          head, head, core.svn_depth_infinity,
                                          None, self.client_ctx)
-    self.assertEquals(iprops[trunk_url], {'svn:global-ignores':'*.q\n'})
+    self.assertEqual(iprops[trunk_url], {b'svn:global-ignores':b'*.q\n'})
 
     self.proplist_receiver_trunk_calls = 0
     client.proplist4(trunk_url, head, head, core.svn_depth_empty, None, True,
                      self.proplist_receiver_trunk, self.client_ctx)
-    self.assertEquals(self.proplist_receiver_trunk_calls, 1)
+    self.assertEqual(self.proplist_receiver_trunk_calls, 1)
 
     self.proplist_receiver_dir1_calls = 0
     self.proplist_receiver_dir1_key = trunk_url
     client.proplist4(dir1_url, head, head, core.svn_depth_empty, None, True,
                      self.proplist_receiver_dir1, self.client_ctx)
-    self.assertEquals(self.proplist_receiver_dir1_calls, 1)
+    self.assertEqual(self.proplist_receiver_dir1_calls, 1)
 
   def test_update4(self):
     """Test update and the notify function callbacks"""
@@ -456,6 +524,9 @@ class SubversionClientTestCase(unittest.TestCase):
     def notify_func(path, action, kind, mime_type, content_state, prop_state, rev):
         self.notified_paths.append(path)
 
+    PATH_SEPARATOR = os.path.sep
+    if not isinstance(PATH_SEPARATOR, bytes):
+        PATH_SEPARATOR = PATH_SEPARATOR.encode('UTF-8')
     self.client_ctx.notify_func = client.svn_swig_py_notify_func
     self.client_ctx.notify_baton = notify_func
     rev.value.number = 1
@@ -464,19 +535,19 @@ class SubversionClientTestCase(unittest.TestCase):
                    False, False, self.client_ctx)
     expected_paths = [
         path,
-        os.path.join(path, 'branches'),
-        os.path.join(path, 'tags'),
-        os.path.join(path, 'trunk'),
+        os.path.join(path, b'branches'),
+        os.path.join(path, b'tags'),
+        os.path.join(path, b'trunk'),
         path,
         path
     ]
     # All normal subversion apis process paths in Subversion's canonical format,
     # which isn't the platform specific format
-    expected_paths = [x.replace(os.path.sep, '/') for x in expected_paths]
+    expected_paths = [x.replace(PATH_SEPARATOR, b'/') for x in expected_paths]
     self.notified_paths.sort()
     expected_paths.sort()
 
-    self.assertEquals(self.notified_paths, expected_paths)
+    self.assertEqual(self.notified_paths, expected_paths)
 
     def notify_func2(notify, pool):
         self.notified_paths.append(notify.path)
@@ -487,17 +558,98 @@ class SubversionClientTestCase(unittest.TestCase):
     self.notified_paths = []
     expected_paths = [
         path,
-        os.path.join(path, 'trunk', 'README.txt'),
-        os.path.join(path, 'trunk'),
+        os.path.join(path, b'trunk', b'README.txt'),
+        os.path.join(path, b'trunk'),
         path,
         path
     ]
-    expected_paths = [x.replace(os.path.sep, '/') for x in expected_paths]
+    expected_paths = [x.replace(PATH_SEPARATOR, b'/') for x in expected_paths]
     client.update4((path,), rev, core.svn_depth_unknown, True, False, False,
                    False, False, self.client_ctx)
     self.notified_paths.sort()
     expected_paths.sort()
-    self.assertEquals(self.notified_paths, expected_paths)
+    self.assertEqual(self.notified_paths, expected_paths)
+
+  def test_conflict(self):
+    """Test conflict api."""
+
+    rev = core.svn_opt_revision_t()
+    rev.kind = core.svn_opt_revision_number
+    rev.value.number = 0
+
+    path = self.temper.alloc_empty_dir('-conflict')
+
+    client.checkout2(self.repos_uri, path, rev, rev, True, True,
+            self.client_ctx)
+
+    trunk_path = core.svn_dirent_join(path, b'trunk')
+
+    # Create a conflicting path
+    os.mkdir(core.svn_dirent_local_style(trunk_path))
+
+    rev.value.number = 2
+
+    client.update4((path,), rev, core.svn_depth_unknown, True, False, False,
+                   False, False, self.client_ctx)
+
+    pool = core.Pool()
+    conflict = client.conflict_get(trunk_path, self.client_ctx, pool)
+
+    self.assertTrue(isinstance(conflict, client.svn_client_conflict_t))
+
+    conflict_opts = client.conflict_tree_get_resolution_options(conflict, self.client_ctx)
+
+    self.assertTrue(isinstance(conflict_opts, list))
+    self.assert_all_instances_of(conflict_opts, client.svn_client_conflict_option_t)
+
+    pool.clear()
+
+  @unittest.skip("experimental API, not currently exposed")
+  def test_shelf(self):
+    """Test shelf api."""
+
+    rev = core.svn_opt_revision_t()
+    rev.kind = core.svn_opt_revision_number
+    rev.value.number = 2
+
+    path = self.temper.alloc_empty_dir('-shelf')
+
+
+    client.checkout2(self.repos_uri, path, rev, rev, True, True,
+            self.client_ctx)
+
+    pool = core.Pool()
+    shelf = client._shelf_open_or_create(b"test1", path, self.client_ctx, pool)
+
+    self.assertTrue(isinstance(shelf, client.svn_client__shelf_t))
+
+    new_subpath = core.svn_relpath_join(b'trunk', b'new-shelf-test.txt')
+    new_path = core.svn_dirent_join(path, new_subpath)
+
+    with open(core.svn_dirent_local_style(new_path), "wb") as fp:
+      fp.write("A new text file\n".encode('utf8'))
+
+    client.add5(new_path, core.svn_depth_unknown, False, False, False, True, self.client_ctx, pool)
+
+    statused_paths = []
+    def shelf_status(path, status, pool):
+      statused_paths.append(path)
+
+    shelf_version = client._shelf_save_new_version3(shelf, (new_path, ), core.svn_depth_unknown,
+                                                    None, shelf_status, None, pool)
+
+    self.assertTrue(isinstance(shelf_version, client.svn_client__shelf_version_t))
+
+    all_versions = client._shelf_get_all_versions(shelf, pool, pool)
+
+    self.assertEqual(1, len(all_versions))
+    self.assertTrue(isinstance(all_versions[0], client.svn_client__shelf_version_t))
+    self.assertEqual(shelf_version.version_number, all_versions[0].version_number)
+    self.assertIn(new_subpath, statused_paths)
+
+    client._shelf_close(shelf, pool)
+
+    pool.clear()
 
 
 def suite():
diff --git a/subversion/bindings/swig/python/tests/core.py b/subversion/bindings/swig/python/tests/core.py
index 83874fc..cc71ac2 100644
--- a/subversion/bindings/swig/python/tests/core.py
+++ b/subversion/bindings/swig/python/tests/core.py
@@ -19,10 +19,16 @@
 #
 #
 import unittest
+import os
+import tempfile
+import sys
+
+IS_PY3 = sys.version_info[0] >= 3
 
 import svn.core, svn.client
 import utils
 
+
 class SubversionCoreTestCase(unittest.TestCase):
   """Test cases for the basic SWIG Subversion core"""
 
@@ -39,13 +45,13 @@ class SubversionCoreTestCase(unittest.TestCase):
                      'error message')
 
   def test_mime_type_is_binary(self):
-    self.assertEqual(0, svn.core.svn_mime_type_is_binary("text/plain"))
-    self.assertEqual(1, svn.core.svn_mime_type_is_binary("image/png"))
+    self.assertEqual(0, svn.core.svn_mime_type_is_binary(b"text/plain"))
+    self.assertEqual(1, svn.core.svn_mime_type_is_binary(b"image/png"))
 
   def test_mime_type_validate(self):
     self.assertRaises(svn.core.SubversionException,
-            svn.core.svn_mime_type_validate, "this\nis\ninvalid\n")
-    svn.core.svn_mime_type_validate("unknown/but-valid; charset=utf8")
+            svn.core.svn_mime_type_validate, b"this\nis\ninvalid\n")
+    svn.core.svn_mime_type_validate(b"unknown/but-valid; charset=utf8")
 
   def test_exception_interoperability(self):
     """Test if SubversionException is correctly converted into svn_error_t
@@ -108,44 +114,44 @@ class SubversionCoreTestCase(unittest.TestCase):
   def test_config_enumerate2(self):
     cfg = svn.core.svn_config_create(False)
     entries = {
-      'one': 'one-value',
-      'two': 'two-value',
-      'three': 'three-value'
+      b'one': b'one-value',
+      b'two': b'two-value',
+      b'three': b'three-value'
     }
 
-    for (name, value) in entries.iteritems():
-      svn.core.svn_config_set(cfg, "section", name, value)
+    for (name, value) in entries.items():
+      svn.core.svn_config_set(cfg, b"section", name, value)
 
     received_entries = {}
     def enumerator(name, value, pool):
       received_entries[name] = value
       return len(received_entries) < 2
 
-    svn.core.svn_config_enumerate2(cfg, "section", enumerator)
+    svn.core.svn_config_enumerate2(cfg, b"section", enumerator)
 
     self.assertEqual(len(received_entries), 2)
-    for (name, value) in received_entries.iteritems():
-      self.assert_(name in entries)
+    for (name, value) in received_entries.items():
+      self.assertTrue(name in entries)
       self.assertEqual(value, entries[name])
 
   def test_config_enumerate2_exception(self):
     cfg = svn.core.svn_config_create(False)
-    svn.core.svn_config_set(cfg, "section", "one", "one-value")
-    svn.core.svn_config_set(cfg, "section", "two", "two-value")
+    svn.core.svn_config_set(cfg, b"section", b"one", b"one-value")
+    svn.core.svn_config_set(cfg, b"section", b"two", b"two-value")
 
     def enumerator(name, value, pool):
       raise Exception
 
     # the exception will be swallowed, but enumeration must be stopped
     self.assertEqual(
-      svn.core.svn_config_enumerate2(cfg, "section", enumerator), 1)
+      svn.core.svn_config_enumerate2(cfg, b"section", enumerator), 1)
 
   def test_config_enumerate_sections2(self):
     cfg = svn.core.svn_config_create(False)
-    sections = ['section-one', 'section-two', 'section-three']
+    sections = [b'section-one', b'section-two', b'section-three']
 
     for section in sections:
-      svn.core.svn_config_set(cfg, section, "name", "value")
+      svn.core.svn_config_set(cfg, section, b"name", b"value")
 
     received_sections = []
     def enumerator(section, pool):
@@ -156,12 +162,12 @@ class SubversionCoreTestCase(unittest.TestCase):
 
     self.assertEqual(len(received_sections), 2)
     for section in received_sections:
-      self.assert_(section in sections)
+      self.assertTrue(section in sections)
 
   def test_config_enumerate_sections2_exception(self):
     cfg = svn.core.svn_config_create(False)
-    svn.core.svn_config_set(cfg, "section-one", "name", "value")
-    svn.core.svn_config_set(cfg, "section-two", "name", "value")
+    svn.core.svn_config_set(cfg, b"section-one", b"name", b"value")
+    svn.core.svn_config_set(cfg, b"section-two", b"name", b"value")
 
     def enumerator(section, pool):
       raise Exception
@@ -170,6 +176,163 @@ class SubversionCoreTestCase(unittest.TestCase):
     self.assertEqual(
       svn.core.svn_config_enumerate_sections2(cfg, enumerator), 1)
 
+  def test_stream_from_stringbuf(self):
+    stream = svn.core.svn_stream_from_stringbuf(b'')
+    svn.core.svn_stream_close(stream)
+    with self.assertRaises(TypeError):
+        stream = svn.core.svn_stream_from_stringbuf(b''.decode())
+        svn.core.svn_stream_close(stream)
+
+  def test_stream_read_full(self):
+    in_str = (b'Python\x00'
+              b'\xa4\xd1\xa4\xa4\xa4\xbd\xa4\xf3\r\n'
+              b'Subversion\x00'
+              b'\xa4\xb5\xa4\xd6\xa4\xd0\xa1\xbc\xa4\xb8\xa4\xe7\xa4\xf3\n'
+              b'swig\x00'
+              b'\xa4\xb9\xa4\xa6\xa4\xa3\xa4\xb0\r'
+              b'end')
+    stream = svn.core.svn_stream_from_stringbuf(in_str)
+    self.assertEqual(svn.core.svn_stream_read_full(stream, 4096), in_str)
+    svn.core.svn_stream_seek(stream, None)
+    self.assertEqual(svn.core.svn_stream_read_full(stream, 10), in_str[0:10])
+    svn.core.svn_stream_seek(stream, None)
+    svn.core.svn_stream_skip(stream, 20)
+    self.assertEqual(svn.core.svn_stream_read_full(stream, 4096), in_str[20:])
+    self.assertEqual(svn.core.svn_stream_read_full(stream, 4096), b'')
+    svn.core.svn_stream_close(stream)
+
+  def test_stream_read2(self):
+    # as we can't create non block stream by using swig-py API directly,
+    # we only test svn_stream_read2() behaves just same as
+    # svn_stream_read_full()
+    in_str = (b'Python\x00'
+              b'\xa4\xd1\xa4\xa4\xa4\xbd\xa4\xf3\r\n'
+              b'Subversion\x00'
+              b'\xa4\xb5\xa4\xd6\xa4\xd0\xa1\xbc\xa4\xb8\xa4\xe7\xa4\xf3\n'
+              b'swig\x00'
+              b'\xa4\xb9\xa4\xa6\xa4\xa3\xa4\xb0\r'
+              b'end')
+    stream = svn.core.svn_stream_from_stringbuf(in_str)
+    self.assertEqual(svn.core.svn_stream_read2(stream, 4096), in_str)
+    svn.core.svn_stream_seek(stream, None)
+    self.assertEqual(svn.core.svn_stream_read2(stream, 10), in_str[0:10])
+    svn.core.svn_stream_seek(stream, None)
+    svn.core.svn_stream_skip(stream, 20)
+    self.assertEqual(svn.core.svn_stream_read2(stream, 4096), in_str[20:])
+    self.assertEqual(svn.core.svn_stream_read2(stream, 4096), b'')
+    svn.core.svn_stream_close(stream)
+
+  def test_stream_write_exception(self):
+    stream = svn.core.svn_stream_empty()
+    with self.assertRaises(TypeError):
+      svn.core.svn_stream_write(stream, 16)
+    # Check UnicodeEncodeError
+    # o1_str = b'Python\x00\xa4\xd1\xa4\xa4\xa4\xbd\xa4\xf3\r\n'
+    # ostr_unicode = o1_str.decode('ascii', 'surrogateescape')
+    ostr_unicode = (u'Python\x00'
+                    u'\udca4\udcd1\udca4\udca4\udca4\udcbd\udca4\udcf3\r\n')
+    with self.assertRaises(UnicodeEncodeError):
+      svn.core.svn_stream_write(stream, ostr_unicode)
+    svn.core.svn_stream_close(stream)
+
+  # As default codec of Python 2 is 'ascii', conversion from unicode to bytes
+  # will be success only if all characters of target strings are in the range
+  # of \u0000 ~ \u007f.
+  @unittest.skipUnless(IS_PY3, "test for Python 3 only")
+  def test_stream_write_str(self):
+    o1_str = u'Python\x00\u3071\u3044\u305d\83093\r\n'
+    o2_str = u'subVersioN\x00\u3055\u3076\u3070\u30fc\u3058\u3087\u3093'
+    o3_str = u'swig\x00\u3059\u3046\u3043\u3050\rend'
+    out_str = o1_str + o2_str + o3_str
+    rewrite_str = u'Subversion'
+    fd, fname = tempfile.mkstemp()
+    os.close(fd)
+    try:
+      stream = svn.core.svn_stream_from_aprfile2(fname, False)
+      self.assertEqual(svn.core.svn_stream_write(stream, out_str),
+                       len(out_str.encode('UTF-8')))
+      svn.core.svn_stream_seek(stream, None)
+      self.assertEqual(svn.core.svn_stream_read_full(stream, 4096),
+                                                     out_str.encode('UTF-8'))
+      svn.core.svn_stream_seek(stream, None)
+      svn.core.svn_stream_skip(stream, len(o1_str.encode('UTF-8')))
+      self.assertEqual(svn.core.svn_stream_write(stream, rewrite_str),
+                       len(rewrite_str.encode('UTF-8')))
+      svn.core.svn_stream_seek(stream, None)
+      self.assertEqual(
+            svn.core.svn_stream_read_full(stream, 4096),
+            (o1_str + rewrite_str
+             + o2_str[len(rewrite_str.encode('UTF-8')):]
+             + o3_str                                   ).encode('UTF-8'))
+      svn.core.svn_stream_close(stream)
+    finally:
+      try:
+        os.remove(fname)
+      except OSError:
+        pass
+
+  def test_stream_write_bytes(self):
+    o1_str = b'Python\x00\xa4\xd1\xa4\xa4\xa4\xbd\xa4\xf3\r\n'
+    o2_str = (b'subVersioN\x00'
+              b'\xa4\xb5\xa4\xd6\xa4\xd0\xa1\xbc\xa4\xb8\xa4\xe7\xa4\xf3\n')
+    o3_str =  b'swig\x00\xa4\xb9\xa4\xa6\xa4\xa3\xa4\xb0\rend'
+    out_str = o1_str + o2_str + o3_str
+    rewrite_str = b'Subversion'
+    fd, fname = tempfile.mkstemp()
+    fname_bytes = fname if isinstance(fname, bytes) else fname.encode('UTF-8')
+    os.close(fd)
+    try:
+      stream = svn.core.svn_stream_from_aprfile2(fname_bytes, False)
+      self.assertEqual(svn.core.svn_stream_write(stream, out_str),
+                       len(out_str))
+      svn.core.svn_stream_seek(stream, None)
+      self.assertEqual(svn.core.svn_stream_read_full(stream, 4096), out_str)
+      svn.core.svn_stream_seek(stream, None)
+      svn.core.svn_stream_skip(stream, len(o1_str))
+      self.assertEqual(svn.core.svn_stream_write(stream, rewrite_str),
+                       len(rewrite_str))
+      svn.core.svn_stream_seek(stream, None)
+      self.assertEqual(
+                svn.core.svn_stream_read_full(stream, 4096),
+                o1_str + rewrite_str + o2_str[len(rewrite_str):] + o3_str)
+      svn.core.svn_stream_close(stream)
+    finally:
+      try:
+        os.remove(fname)
+      except OSError:
+        pass
+
+  def test_stream_readline(self):
+    o1_str = b'Python\t\xa4\xd1\xa4\xa4\xa4\xbd\xa4\xf3\r\n'
+    o2_str = (b'Subversion\t'
+              b'\xa4\xb5\xa4\xd6\xa4\xd0\xa1\xbc\xa4\xb8\xa4\xe7\xa4\xf3\n')
+    o3_str =  b'swig\t\xa4\xb9\xa4\xa6\xa4\xa3\xa4\xb0\rend'
+    in_str = o1_str + o2_str + o3_str
+    stream = svn.core.svn_stream_from_stringbuf(in_str)
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\n'),
+                     [o1_str[:-1], 0])
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\n'),
+                     [o2_str[:-1], 0])
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\n'),
+                     [o3_str, 1])
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\n'),
+                     [b'', 1])
+    svn.core.svn_stream_seek(stream, None)
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\r\n'),
+                     [o1_str[:-2], 0])
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\r\n'),
+                     [o2_str + o3_str, 1])
+    svn.core.svn_stream_write(stream, b'\r\n')
+    svn.core.svn_stream_seek(stream, None)
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\r\n'),
+                     [o1_str[:-2], 0])
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\r\n'),
+                     [o2_str + o3_str, 0])
+    self.assertEqual(svn.core.svn_stream_readline(stream, b'\r\n'),
+                     [b'', 1])
+    svn.core.svn_stream_close(stream)
+
+
 def suite():
     return unittest.defaultTestLoader.loadTestsFromTestCase(
       SubversionCoreTestCase)
diff --git a/subversion/bindings/swig/python/tests/delta.py b/subversion/bindings/swig/python/tests/delta.py
index 7f6ba67..f668c32 100644
--- a/subversion/bindings/swig/python/tests/delta.py
+++ b/subversion/bindings/swig/python/tests/delta.py
@@ -24,20 +24,15 @@ import tempfile
 import svn.delta
 import svn.core
 from sys import version_info # For Python version check
-if version_info[0] >= 3:
-  # Python >=3.0
-  from io import StringIO
-else:
-  # Python <3.0
-  from cStringIO import StringIO
+from io import BytesIO
 
 # Test case for svn.delta
 class DeltaTestCase(unittest.TestCase):
 
   def testTxWindowHandler(self):
     """Test tx_invoke_window_handler"""
-    src_stream = StringIO("hello world")
-    target_stream = StringIO("bye world")
+    src_stream = BytesIO("hello world".encode('UTF-8'))
+    target_stream = BytesIO("bye world".encode('UTF-8'))
 
     # Invoke the window_handler using a helper function
     window_handler, baton = \
@@ -52,14 +47,15 @@ class DeltaTestCase(unittest.TestCase):
   def testTxWindowHandler_stream_IF(self):
     """Test tx_invoke_window_handler, with svn.core.svn_stream_t object"""
     pool = svn.core.Pool()
-    in_str = "hello world"
+    in_str = b"hello world"
     src_stream = svn.core.svn_stream_from_stringbuf(in_str)
-    content_str = "bye world"
+    content_str = b"bye world"
     content_stream = svn.core.svn_stream_from_stringbuf(content_str)
     fd, fname = tempfile.mkstemp()
+    fname_bytes = fname if isinstance(fname, bytes) else fname.encode('UTF-8')
     os.close(fd)
     try:
-      target_stream = svn.core.svn_stream_from_aprfile2(fname, False)
+      target_stream = svn.core.svn_stream_from_aprfile2(fname_bytes, False)
       window_handler, baton = \
           svn.delta.tx_apply(src_stream, target_stream, None)
       svn.delta.tx_send_stream(content_stream, window_handler, baton, pool)
@@ -77,17 +73,18 @@ class DeltaTestCase(unittest.TestCase):
   def testTxWindowHandler_Stream_IF(self):
     """Test tx_invoke_window_handler, with svn.core.Stream object"""
     pool = svn.core.Pool()
-    in_str = "hello world"
+    in_str = b"hello world"
     src_stream = svn.core.Stream(
                     svn.core.svn_stream_from_stringbuf(in_str))
-    content_str = "bye world"
+    content_str = b"bye world"
     content_stream = svn.core.Stream(
                     svn.core.svn_stream_from_stringbuf(content_str))
     fd, fname = tempfile.mkstemp()
+    fname_bytes = fname if isinstance(fname, bytes) else fname.encode('UTF-8')
     os.close(fd)
     try:
       target_stream = svn.core.Stream(
-                    svn.core.svn_stream_from_aprfile2(fname, False))
+                    svn.core.svn_stream_from_aprfile2(fname_bytes, False))
       window_handler, baton = \
           svn.delta.tx_apply(src_stream, target_stream, None)
       svn.delta.tx_send_stream(content_stream, window_handler, baton, None)
@@ -104,15 +101,15 @@ class DeltaTestCase(unittest.TestCase):
 
   def testTxdeltaWindowT(self):
     """Test the svn_txdelta_window_t wrapper."""
-    a = StringIO("abc\ndef\n")
-    b = StringIO("def\nghi\n")
+    a = BytesIO("abc\ndef\n".encode('UTF-8'))
+    b = BytesIO("def\nghi\n".encode('UTF-8'))
 
     delta_stream = svn.delta.svn_txdelta(a, b)
     window = svn.delta.svn_txdelta_next_window(delta_stream)
 
-    self.assert_(window.sview_offset + window.sview_len <= len(a.getvalue()))
-    self.assert_(window.tview_len <= len(b.getvalue()))
-    self.assert_(len(window.new_data) > 0)
+    self.assertTrue(window.sview_offset + window.sview_len <= len(a.getvalue()))
+    self.assertTrue(window.tview_len <= len(b.getvalue()))
+    self.assertTrue(len(window.new_data) > 0)
     self.assertEqual(window.num_ops, len(window.ops))
     self.assertEqual(window.src_ops, len([op for op in window.ops
       if op.action_code == svn.delta.svn_txdelta_source]))
diff --git a/subversion/bindings/swig/python/tests/fs.py b/subversion/bindings/swig/python/tests/fs.py
index b1e2538..40e1b0c 100644
--- a/subversion/bindings/swig/python/tests/fs.py
+++ b/subversion/bindings/swig/python/tests/fs.py
@@ -37,7 +37,7 @@ class SubversionFSTestCase(unittest.TestCase):
 
   def log_message_func(self, items, pool):
     """ Simple log message provider for unit tests. """
-    return "Test unicode log message"
+    return b"Test unicode log message"
 
   def setUp(self):
     """Load a Subversion repository"""
@@ -68,8 +68,12 @@ class SubversionFSTestCase(unittest.TestCase):
 
     clientctx.auth_baton = core.svn_auth_open(providers)
 
-    commitinfo = client.import2(self.tmpfile,
-                                urljoin(self.repos_uri +"/", "trunk/UniTest.txt"),
+    if isinstance(self.tmpfile, bytes):
+        tmpfile_bytes = self.tmpfile
+    else:
+        tmpfile_bytes = self.tmpfile.encode('UTF-8')
+    commitinfo = client.import2(tmpfile_bytes,
+                                urljoin(self.repos_uri + b"/",b"trunk/UniTest.txt"),
                                 True, True,
                                 clientctx)
 
@@ -87,11 +91,12 @@ class SubversionFSTestCase(unittest.TestCase):
     """Test diffing of a repository path using the internal diff."""
 
     # Test standard internal diff
-    fdiff = fs.FileDiff(fs.revision_root(self.fs, self.commitedrev), "/trunk/UniTest.txt",
+    fdiff = fs.FileDiff(fs.revision_root(self.fs, self.commitedrev), b"/trunk/UniTest.txt",
                         None, None, diffoptions=None)
 
     diffp = fdiff.get_pipe()
     diffoutput = diffp.read().decode('utf8')
+    diffp.close()
 
     self.assertTrue(diffoutput.find(u'-' + self.unistr) > 0)
 
@@ -108,10 +113,11 @@ class SubversionFSTestCase(unittest.TestCase):
       else:
         raise err
 
-    fdiff = fs.FileDiff(fs.revision_root(self.fs, self.commitedrev), "/trunk/UniTest.txt",
+    fdiff = fs.FileDiff(fs.revision_root(self.fs, self.commitedrev), b"/trunk/UniTest.txt",
                         None, None, diffoptions=[])
     diffp = fdiff.get_pipe()
     diffoutput = diffp.read().decode('utf8')
+    diffp.close()
 
     self.assertTrue(diffoutput.find(u'< ' + self.unistr) > 0)
 
diff --git a/subversion/bindings/swig/python/tests/mergeinfo.py b/subversion/bindings/swig/python/tests/mergeinfo.py
index e956035..873fc52 100644
--- a/subversion/bindings/swig/python/tests/mergeinfo.py
+++ b/subversion/bindings/swig/python/tests/mergeinfo.py
@@ -34,7 +34,7 @@ def get_svn_merge_range_t_objects():
      garbage collector, used for detecting memory leaks."""
   return [
     o for o in gc.get_objects()
-      if hasattr(o, '__class__') and
+      if getattr(o, '__class__', None) is not None and
         o.__class__.__name__ == 'svn_merge_range_t'
   ]
 
@@ -42,11 +42,11 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
   """Test cases for mergeinfo"""
 
   # Some textual mergeinfo.
-  TEXT_MERGEINFO1 = "/trunk:3-9,27,42*"
-  TEXT_MERGEINFO2 = "/trunk:27-29,41-43*"
+  TEXT_MERGEINFO1 = b"/trunk:3-9,27,42*"
+  TEXT_MERGEINFO2 = b"/trunk:27-29,41-43*"
 
   # Meta data used in conjunction with this mergeinfo.
-  MERGEINFO_SRC = "/trunk"
+  MERGEINFO_SRC = b"/trunk"
   MERGEINFO_NBR_REV_RANGES = 3
 
   def setUp(self):
@@ -93,9 +93,9 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
     reversed_rl = core.svn_rangelist_reverse(rangelist)
     expected_ranges = ((42, 41), (27, 26), (9, 2))
     for i in range(0, len(reversed_rl)):
-      self.assertEquals(reversed_rl[i].start, expected_ranges[i][0],
+      self.assertEqual(reversed_rl[i].start, expected_ranges[i][0],
                         "Unexpected range start: %d" % reversed_rl[i].start)
-      self.assertEquals(reversed_rl[i].end, expected_ranges[i][1],
+      self.assertEqual(reversed_rl[i].end, expected_ranges[i][1],
                         "Unexpected range end: %d" % reversed_rl[i].end)
 
   def test_mergeinfo_sort(self):
@@ -113,15 +113,15 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
                                 self.MERGEINFO_NBR_REV_RANGES)
 
   def test_mergeinfo_get(self):
-    mergeinfo = repos.fs_get_mergeinfo(self.repos, ['/trunk'], self.rev,
+    mergeinfo = repos.fs_get_mergeinfo(self.repos, [b'/trunk'], self.rev,
                                        core.svn_mergeinfo_inherited,
                                        False, None, None)
     expected_mergeinfo = \
-      { '/trunk' :
-          { '/branches/a' : [RevRange(2, 11)],
-            '/branches/b' : [RevRange(9, 13)],
-            '/branches/c' : [RevRange(2, 16)],
-            '/trunk'      : [RevRange(1, 9)],  },
+      { b'/trunk' :
+          { b'/branches/a' : [RevRange(2, 11)],
+            b'/branches/b' : [RevRange(9, 13)],
+            b'/branches/c' : [RevRange(2, 16)],
+            b'/trunk'      : [RevRange(1, 9)],  },
       }
     self.compare_mergeinfo_catalogs(mergeinfo, expected_mergeinfo)
 
@@ -131,7 +131,7 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
     # When reference counting is working properly, each svn_merge_range_t in
     # the returned mergeinfo will have a ref count of 1...
     mergeinfo = core.svn_mergeinfo_parse(self.TEXT_MERGEINFO1)
-    for (path, rangelist) in mergeinfo.items():
+    for (path, rangelist) in core._as_list(mergeinfo.items()):
       # ....and now 2 (incref during iteration of rangelist)
 
       for (i, r) in enumerate(rangelist):
@@ -144,7 +144,7 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
         # Note: if path and index are not '/trunk' and 0 respectively, then
         # only some of the range objects are leaking, which is, as far as
         # leaks go, even more impressive.
-        self.assertEquals(refcount, expected, (
+        self.assertEqual(refcount, expected, (
           "Memory leak!  Expected a ref count of %d for svn_merge_range_t "
           "object, but got %d instead (path: %s, index: %d).  Probable "
           "cause: incorrect Py_INCREF/Py_DECREF usage in libsvn_swig_py/"
@@ -165,7 +165,7 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
     del mergeinfo
     gc.collect()
     lingering = get_svn_merge_range_t_objects()
-    self.assertEquals(lingering, list(), (
+    self.assertEqual(lingering, list(), (
       "Memory leak!  Found lingering svn_merge_range_t objects left over from "
       "our call to svn_mergeinfo_parse(), even though we explicitly deleted "
       "the returned mergeinfo object.  Probable cause: incorrect Py_INCREF/"
@@ -177,16 +177,16 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
     self.inspect_rangelist_tuple(rangelist, nbr_rev_ranges)
 
   def inspect_rangelist_tuple(self, rangelist, nbr_rev_ranges):
-    self.assert_(rangelist is not None,
+    self.assertTrue(rangelist is not None,
                  "Rangelist for '%s' not parsed" % self.MERGEINFO_SRC)
-    self.assertEquals(len(rangelist), nbr_rev_ranges,
+    self.assertEqual(len(rangelist), nbr_rev_ranges,
                       "Wrong number of revision ranges parsed")
-    self.assertEquals(rangelist[0].inheritable, True,
+    self.assertEqual(rangelist[0].inheritable, True,
                       "Unexpected revision range 'non-inheritable' flag: %s" %
                       rangelist[0].inheritable)
-    self.assertEquals(rangelist[1].start, 26,
+    self.assertEqual(rangelist[1].start, 26,
                       "Unexpected revision range end: %d" % rangelist[1].start)
-    self.assertEquals(rangelist[2].inheritable, False,
+    self.assertEqual(rangelist[2].inheritable, False,
                       "Missing revision range 'non-inheritable' flag")
 
   def compare_mergeinfo_catalogs(self, catalog1, catalog2):
@@ -194,7 +194,7 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
     keys2 = sorted(catalog2.keys())
     self.assertEqual(keys1, keys2)
 
-    for k in catalog1.keys():
+    for k in catalog1:
         self.compare_mergeinfos(catalog1[k], catalog2[k])
 
   def compare_mergeinfos(self, mergeinfo1, mergeinfo2):
@@ -202,7 +202,7 @@ class SubversionMergeinfoTestCase(unittest.TestCase):
     keys2 = sorted(mergeinfo2.keys())
     self.assertEqual(keys1, keys2)
 
-    for k in mergeinfo1.keys():
+    for k in mergeinfo1:
         self.compare_rangelists(mergeinfo1[k], mergeinfo2[k])
 
   def compare_rangelists(self, rangelist1, rangelist2):
diff --git a/subversion/bindings/swig/python/tests/ra.py b/subversion/bindings/swig/python/tests/ra.py
index 47917ca..3d00b2c 100644
--- a/subversion/bindings/swig/python/tests/ra.py
+++ b/subversion/bindings/swig/python/tests/ra.py
@@ -22,12 +22,7 @@ import unittest, setup_path
 
 from svn import core, repos, fs, delta, ra
 from sys import version_info # For Python version check
-if version_info[0] >= 3:
-  # Python >=3.0
-  from io import StringIO
-else:
-  # Python <3.0
-  from StringIO import StringIO
+from io import BytesIO
 
 import utils
 
@@ -58,16 +53,16 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
   def test_get_file(self):
     # Test getting the properties of a file
     fs_revnum = fs.youngest_rev(self.fs)
-    rev, properties = ra.get_file(self.ra_ctx, "trunk/README2.txt",
+    rev, properties = ra.get_file(self.ra_ctx, b"trunk/README2.txt",
                                   core.SVN_INVALID_REVNUM, None)
     self.assertEqual(rev, fs_revnum)
-    self.assertEqual(properties["svn:mime-type"], "text/plain")
+    self.assertEqual(properties[b"svn:mime-type"], b"text/plain")
 
     # Test getting the contents of a file
-    filestream = StringIO()
-    rev, properties = ra.get_file(self.ra_ctx, "trunk/README2.txt",
+    filestream = BytesIO()
+    rev, properties = ra.get_file(self.ra_ctx, b"trunk/README2.txt",
                                   fs_revnum, filestream)
-    self.assertEqual("A test.\n", filestream.getvalue())
+    self.assertEqual(b"A test.\n", filestream.getvalue())
 
   def test_get_repos_root(self):
     root = ra.get_repos_root(self.ra_ctx)
@@ -84,53 +79,53 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
     self.assertEqual(ra_revnum, fs_revnum)
 
   def test_get_dir2(self):
-    (dirents, _, props) = ra.get_dir2(self.ra_ctx, '', 1, core.SVN_DIRENT_KIND)
-    self.assert_('trunk' in dirents)
-    self.assert_('branches' in dirents)
-    self.assert_('tags' in dirents)
-    self.assertEqual(dirents['trunk'].kind, core.svn_node_dir)
-    self.assertEqual(dirents['branches'].kind, core.svn_node_dir)
-    self.assertEqual(dirents['tags'].kind, core.svn_node_dir)
-    self.assert_(core.SVN_PROP_ENTRY_UUID in props)
-    self.assert_(core.SVN_PROP_ENTRY_LAST_AUTHOR in props)
-
-    (dirents, _, _) = ra.get_dir2(self.ra_ctx, 'trunk', 1, core.SVN_DIRENT_KIND)
+    (dirents, _, props) = ra.get_dir2(self.ra_ctx, b'', 1, core.SVN_DIRENT_KIND)
+    self.assertTrue(b'trunk' in dirents)
+    self.assertTrue(b'branches' in dirents)
+    self.assertTrue(b'tags' in dirents)
+    self.assertEqual(dirents[b'trunk'].kind, core.svn_node_dir)
+    self.assertEqual(dirents[b'branches'].kind, core.svn_node_dir)
+    self.assertEqual(dirents[b'tags'].kind, core.svn_node_dir)
+    self.assertTrue(core.SVN_PROP_ENTRY_UUID in props)
+    self.assertTrue(core.SVN_PROP_ENTRY_LAST_AUTHOR in props)
+
+    (dirents, _, _) = ra.get_dir2(self.ra_ctx, b'trunk', 1, core.SVN_DIRENT_KIND)
 
     self.assertEqual(dirents, {})
 
-    (dirents, _, _) = ra.get_dir2(self.ra_ctx, 'trunk', 10,
+    (dirents, _, _) = ra.get_dir2(self.ra_ctx, b'trunk', 10,
                                   core.SVN_DIRENT_KIND)
 
-    self.assert_('README2.txt' in dirents)
-    self.assertEqual(dirents['README2.txt'].kind, core.svn_node_file)
+    self.assertTrue(b'README2.txt' in dirents)
+    self.assertEqual(dirents[b'README2.txt'].kind, core.svn_node_file)
 
   def test_commit3(self):
     commit_info = []
     def my_callback(info, pool):
       commit_info.append(info)
 
-    revprops = {"svn:log": "foobar", "testprop": ""}
+    revprops = {b"svn:log": b"foobar", b"testprop": b""}
     editor, edit_baton = ra.get_commit_editor3(self.ra_ctx, revprops, my_callback, None, False)
     root = editor.open_root(edit_baton, 4)
     self.assertNotEqual(root, None)
-    child = editor.add_directory("bla3", root, None, 0)
+    child = editor.add_directory(b"bla3", root, None, 0)
     self.assertNotEqual(child, None)
     editor.close_edit(edit_baton)
 
     info = commit_info[0]
     self.assertEqual(info.revision, fs.youngest_rev(self.fs))
-    revprops['svn:author'] = info.author
-    revprops['svn:date'] = info.date
+    revprops[b'svn:author'] = info.author
+    revprops[b'svn:date'] = info.date
     self.assertEqual(ra.rev_proplist(self.ra_ctx, info.revision), revprops)
 
   def test_commit2(self):
     def my_callback(info, pool):
         self.assertEqual(info.revision, fs.youngest_rev(self.fs))
 
-    editor, edit_baton = ra.get_commit_editor2(self.ra_ctx, "foobar", my_callback, None, False)
+    editor, edit_baton = ra.get_commit_editor2(self.ra_ctx, b"foobar", my_callback, None, False)
     root = editor.open_root(edit_baton, 4)
     self.assertNotEqual(root, None)
-    child = editor.add_directory("bla", root, None, 0)
+    child = editor.add_directory(b"bla", root, None, 0)
     self.assertNotEqual(child, None)
     editor.close_edit(edit_baton)
 
@@ -138,18 +133,18 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
     def my_callback(revision, date, author):
         self.assertEqual(revision, fs.youngest_rev(self.fs))
 
-    editor, edit_baton = ra.get_commit_editor(self.ra_ctx, "foobar", my_callback, None, False)
+    editor, edit_baton = ra.get_commit_editor(self.ra_ctx, b"foobar", my_callback, None, False)
     root = editor.open_root(edit_baton, 4)
-    child = editor.add_directory("blah", root, None, 0)
+    child = editor.add_directory(b"blah", root, None, 0)
     editor.close_edit(edit_baton)
 
   def test_delta_driver_commit(self):
     # Setup paths we'll commit in this test.
-    to_delete = ['trunk/README.txt', 'trunk/dir1/dir2']
-    to_mkdir = ['test_delta_driver_commit.d', 'test_delta_driver_commit2.d']
-    to_add = ['test_delta_driver_commit', 'test_delta_driver_commit2']
-    to_dir_prop = ['trunk/dir1/dir3', 'test_delta_driver_commit2.d']
-    to_file_prop = ['trunk/README2.txt', 'test_delta_driver_commit2']
+    to_delete = [b'trunk/README.txt', b'trunk/dir1/dir2']
+    to_mkdir = [b'test_delta_driver_commit.d', b'test_delta_driver_commit2.d']
+    to_add = [b'test_delta_driver_commit', b'test_delta_driver_commit2']
+    to_dir_prop = [b'trunk/dir1/dir3', b'test_delta_driver_commit2.d']
+    to_file_prop = [b'trunk/README2.txt', b'test_delta_driver_commit2']
     all_paths = {}
     for i in to_delete + to_mkdir + to_add + to_dir_prop + to_file_prop:
       all_paths[i] = True
@@ -159,12 +154,12 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
     commit_info = []
     def commit_cb(info, pool):
       commit_info.append(info)
-    revprops = {"svn:log": "foobar", "testprop": ""}
+    revprops = {b"svn:log": b"foobar", b"testprop": b""}
     (editor, edit_baton) = ra.get_commit_editor3(self.ra_ctx, revprops,
                                                  commit_cb, None, False)
     try:
       def driver_cb(parent, path, pool):
-        self.assert_(path in all_paths)
+        self.assertTrue(path in all_paths)
         dir_baton = file_baton = None
         if path in to_delete:
           # Leave dir_baton alone, as it must be None for delete.
@@ -182,16 +177,16 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
           if dir_baton is None:
             dir_baton = editor.open_directory(path, parent, revision, pool)
           editor.change_dir_prop(dir_baton,
-                                 'test_delta_driver_commit', 'foo', pool)
+                                 b'test_delta_driver_commit', b'foo', pool)
         elif path in to_file_prop:
           if file_baton is None:
             file_baton = editor.open_file(path, parent, revision, pool)
           editor.change_file_prop(file_baton,
-                                  'test_delta_driver_commit', 'foo', pool)
+                                  b'test_delta_driver_commit', b'foo', pool)
         if file_baton is not None:
           editor.close_file(file_baton, None, pool)
         return dir_baton
-      delta.path_driver(editor, edit_baton, -1, list(all_paths.keys()), driver_cb)
+      delta.path_driver(editor, edit_baton, -1, core._as_list(all_paths.keys()), driver_cb)
       editor.close_edit(edit_baton)
     except:
       try:
@@ -204,8 +199,8 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
     info = commit_info[0]
 
     if info.author is not None:
-      revprops['svn:author'] = info.author
-    revprops['svn:date'] = info.date
+      revprops[b'svn:author'] = info.author
+    revprops[b'svn:date'] = info.date
     self.assertEqual(ra.rev_proplist(self.ra_ctx, info.revision), revprops)
 
     receiver_called = [False]
@@ -214,22 +209,22 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
       self.assertEqual(revision, info.revision)
       self.assertEqual(author, info.author)
       self.assertEqual(date, info.date)
-      self.assertEqual(message, revprops['svn:log'])
-      for (path, change) in changed_paths.items():
-        path = path.lstrip('/')
-        self.assert_(path in all_paths)
+      self.assertEqual(message, revprops[b'svn:log'])
+      for (path, change) in core._as_list(changed_paths.items()):
+        path = path.lstrip(b'/')
+        self.assertTrue(path in all_paths)
         if path in to_delete:
-          self.assertEqual(change.action, 'D')
+          self.assertEqual(change.action, b'D')
         elif path in to_mkdir or path in to_add:
-          self.assertEqual(change.action, 'A')
+          self.assertEqual(change.action, b'A')
         elif path in to_dir_prop or path in to_file_prop:
-          self.assertEqual(change.action, 'M')
-    ra.get_log(self.ra_ctx, [''], info.revision, info.revision,
+          self.assertEqual(change.action, b'M')
+    ra.get_log(self.ra_ctx, [b''], info.revision, info.revision,
                0,                       # limit
                True,                    # discover_changed_paths
                True,                    # strict_node_history
                receiver)
-    self.assert_(receiver_called[0])
+    self.assertTrue(receiver_called[0])
 
   def test_do_diff2(self):
 
@@ -251,26 +246,26 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
 
     sess_url = ra.get_session_url(self.ra_ctx)
     try:
-        ra.reparent(self.ra_ctx, self.repos_uri+"/trunk")
+        ra.reparent(self.ra_ctx, self.repos_uri+b"/trunk")
         reporter, reporter_baton = ra.do_diff2(self.ra_ctx, fs_revnum,
-                                               "README.txt", 0, 0, 1,
+                                               b"README.txt", 0, 0, 1,
                                                self.repos_uri
-                                                 +"/trunk/README.txt",
+                                                 +b"/trunk/README.txt",
                                                e_ptr, e_baton)
-        reporter.set_path(reporter_baton, "", 0, True, None)
+        reporter.set_path(reporter_baton, b"", 0, True, None)
         reporter.finish_report(reporter_baton)
     finally:
         ra.reparent(self.ra_ctx, sess_url)
 
-    self.assertEqual("A test.\n", editor.textdeltas[0].new_data)
+    self.assertEqual(b"A test.\n", editor.textdeltas[0].new_data)
     self.assertEqual(1, len(editor.textdeltas))
 
   def test_get_locations(self):
-    locations = ra.get_locations(self.ra_ctx, "trunk/README.txt", 2, list(range(1, 5)))
+    locations = ra.get_locations(self.ra_ctx, b"trunk/README.txt", 2, list(range(1, 5)))
     self.assertEqual(locations, {
-        2: '/trunk/README.txt',
-        3: '/trunk/README.txt',
-        4: '/trunk/README.txt'})
+        2: b'/trunk/README.txt',
+        3: b'/trunk/README.txt',
+        4: b'/trunk/README.txt'})
 
   def test_has_capability(self):
       self.assertEqual(True, ra.has_capability(self.ra_ctx,
@@ -278,24 +273,24 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
 
   def test_get_file_revs(self):
     def rev_handler(path, rev, rev_props, prop_diffs, pool):
-        self.assert_(rev == 2 or rev == 3)
-        self.assertEqual(path, "/trunk/README.txt")
+        self.assertTrue(rev == 2 or rev == 3)
+        self.assertEqual(path, b"/trunk/README.txt")
         if rev == 2:
             self.assertEqual(rev_props, {
-              'svn:log': 'Added README.',
-              'svn:author': 'john',
-              'svn:date': '2005-04-01T13:12:18.216267Z'
+              b'svn:log': b'Added README.',
+              b'svn:author': b'john',
+              b'svn:date': b'2005-04-01T13:12:18.216267Z'
             })
             self.assertEqual(prop_diffs, {})
         elif rev == 3:
             self.assertEqual(rev_props, {
-              'svn:log': 'Fixed README.\n',
-              'svn:author': 'kate',
-              'svn:date': '2005-04-01T13:24:58.234643Z'
+              b'svn:log': b'Fixed README.\n',
+              b'svn:author': b'kate',
+              b'svn:date': b'2005-04-01T13:24:58.234643Z'
             })
-            self.assertEqual(prop_diffs, {'svn:mime-type': 'text/plain', 'svn:eol-style': 'native'})
+            self.assertEqual(prop_diffs, {b'svn:mime-type': b'text/plain', b'svn:eol-style': b'native'})
 
-    ra.get_file_revs(self.ra_ctx, "trunk/README.txt", 0, 10, rev_handler)
+    ra.get_file_revs(self.ra_ctx, b"trunk/README.txt", 0, 10, rev_handler)
 
   def test_lock(self):
 
@@ -304,12 +299,12 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
     self.errors = 0
     def callback(path, do_lock, lock, ra_err, pool):
       self.calls += 1
-      self.assertEqual(path, "trunk/README2.txt")
+      self.assertEqual(path, b"trunk/README2.txt")
       if lock:
-        self.assertEqual(lock.owner, "jrandom")
+        self.assertEqual(lock.owner, b"jrandom")
         self.locks += 1
       if ra_err:
-        self.assert_(ra_err.apr_err == core.SVN_ERR_FS_PATH_ALREADY_LOCKED
+        self.assertTrue(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
 
@@ -317,31 +312,31 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
     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")
+                                b"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)
+    ra.lock(self.ra_ctx, {b"trunk/README2.txt":rev}, b"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)
+    ra.lock(self.ra_ctx, {b"trunk/README2.txt":rev}, b"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)
+    the_lock = fs.get_lock(self.fs, b"/trunk/README2.txt")
+    ra.unlock(self.ra_ctx, {b"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)
+    ra.unlock(self.ra_ctx, {b"trunk/README2.txt":the_lock.token}, False, callback)
     self.assertEqual(self.calls, 1)
     self.assertEqual(self.locks, 0)
     self.assertEqual(self.errors, 1)
@@ -351,16 +346,16 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
     self.test_commit3()
     rev = fs.youngest_rev(self.fs)
     revprops = ra.rev_proplist(self.ra_ctx, rev)
-    self.assert_("svn:log" in revprops)
-    self.assert_("testprop" in revprops)
+    self.assertTrue(b"svn:log" in revprops)
+    self.assertTrue(b"testprop" in revprops)
 
     def receiver(log_entry, pool):
       called[0] = True
       self.assertEqual(log_entry.revision, rev)
       if discover_changed_paths:
-        self.assertEqual(list(log_entry.changed_paths.keys()), ['/bla3'])
-        changed_path = log_entry.changed_paths['/bla3']
-        self.assert_(changed_path.action in ['A', 'D', 'R', 'M'])
+        self.assertEqual(core._as_list(log_entry.changed_paths.keys()), [b'/bla3'])
+        changed_path = log_entry.changed_paths[b'/bla3']
+        self.assertTrue(changed_path.action in [b'A', b'D', b'R', b'M'])
         self.assertEqual(changed_path.copyfrom_path, None)
         self.assertEqual(changed_path.copyfrom_rev, -1)
       else:
@@ -368,7 +363,7 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
       if log_revprops is None:
         self.assertEqual(log_entry.revprops, revprops)
       elif len(log_revprops) == 0:
-        self.assert_(log_entry.revprops == None or len(log_entry.revprops) == 0)
+        self.assertTrue(log_entry.revprops == None or len(log_entry.revprops) == 0)
       else:
         revprop_names = sorted(log_entry.revprops.keys())
         log_revprops.sort()
@@ -381,9 +376,9 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
 
     for log_revprops in (
       # Retrieve the standard three.
-      ["svn:author", "svn:date", "svn:log"],
+      [b"svn:author", b"svn:date", b"svn:log"],
       # Retrieve just testprop.
-      ["testprop"],
+      [b"testprop"],
       # Retrieve all.
       None,
       # Retrieve none.
@@ -391,14 +386,14 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
       ):
       for discover_changed_paths in [True, False]:
         called = [False]
-        ra.get_log2(self.ra_ctx, [""],
+        ra.get_log2(self.ra_ctx, [b""],
                     rev, rev,   # start, end
                     1,          # limit
                     discover_changed_paths,
                     True,       # strict_node_history
                     False,      # include_merged_revisions
                     log_revprops, receiver)
-        self.assert_(called[0])
+        self.assertTrue(called[0])
 
   def test_update(self):
     class TestEditor(delta.Editor):
@@ -408,23 +403,23 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
 
     e_ptr, e_baton = delta.make_editor(editor)
 
-    reporter, reporter_baton = ra.do_update(self.ra_ctx, 10, "", True, e_ptr, e_baton)
+    reporter, reporter_baton = ra.do_update(self.ra_ctx, 10, b"", True, e_ptr, e_baton)
 
-    reporter.set_path(reporter_baton, "", 0, True, None)
+    reporter.set_path(reporter_baton, b"", 0, True, None)
 
     reporter.finish_report(reporter_baton)
 
   def test_namestring(self):
     # Only ra-{svn,serf} support this right now.
     uri = self.repos_uri
-    if uri.startswith('http') or uri.startswith('svn'):
+    if uri.startswith(b'http') or uri.startswith(b'svn'):
       called = [False]
       def cb(pool):
         called[0] = True
-        return 'namestring_test'
+        return b'namestring_test'
       self.callbacks.get_client_string = cb
-      ra.stat(self.ra_ctx, "", 1)
-      self.assert_(called[0])
+      ra.stat(self.ra_ctx, b"", 1)
+      self.assertTrue(called[0])
 
 def suite():
     return unittest.defaultTestLoader.loadTestsFromTestCase(
diff --git a/subversion/bindings/swig/python/tests/repository.py b/subversion/bindings/swig/python/tests/repository.py
index 6d78986..abf5d72 100644
--- a/subversion/bindings/swig/python/tests/repository.py
+++ b/subversion/bindings/swig/python/tests/repository.py
@@ -20,12 +20,7 @@
 #
 import unittest, setup_path, os, sys
 from sys import version_info # For Python version check
-if version_info[0] >= 3:
-  # Python >=3.0
-  from io import StringIO
-else:
-  # Python <3.0
-  from StringIO import StringIO
+from io import BytesIO
 from svn import core, repos, fs, delta
 from svn.core import SubversionException
 import utils
@@ -49,34 +44,34 @@ class DumpStreamParser(repos.ParseFns3):
     repos.ParseFns3.__init__(self)
     self.ops = []
   def magic_header_record(self, version, pool=None):
-    self.ops.append(("magic-header", version))
+    self.ops.append((b"magic-header", version))
   def uuid_record(self, uuid, pool=None):
-    self.ops.append(("uuid", uuid))
+    self.ops.append((b"uuid", uuid))
   def new_revision_record(self, headers, pool=None):
     rev = int(headers[repos.DUMPFILE_REVISION_NUMBER])
-    self.ops.append(("new-revision", rev))
+    self.ops.append((b"new-revision", rev))
     return rev
   def close_revision(self, revision_baton):
-    self.ops.append(("close-revision", revision_baton))
+    self.ops.append((b"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))
+    self.ops.append((b"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]))
+    self.ops.append((b"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))
+    self.ops.append((b"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))
+    self.ops.append((b"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]))
+    self.ops.append((b"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))
+    self.ops.append((b"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]))
+    self.ops.append((b"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]))
+    self.ops.append((b"set-fulltext", node_baton[0], node_baton[1]))
     return None
 
 
@@ -109,17 +104,17 @@ class SubversionRepositoryTestCase(unittest.TestCase):
       raise core.SubversionException(apr_err=core.SVN_ERR_CEASE_INVOCATION,
                                      message="Hi from history_lookup")
 
-    repos.history2(self.fs, '/trunk/README2.txt', history_lookup, None, 0,
+    repos.history2(self.fs, b'/trunk/README2.txt', history_lookup, None, 0,
                    self.rev, True)
     self.assertEqual(len(revs), 1)
 
   def test_create(self):
     """Make sure that repos.create doesn't segfault when we set fs-type
        using a config hash"""
-    fs_config = { "fs-type": "fsfs" }
+    fs_config = { b"fs-type": b"fsfs" }
     for i in range(5):
       path = self.temper.alloc_empty_dir(suffix='-repository-create%d' % i)
-      repos.create(path, "", "", None, fs_config)
+      repos.create(path, b"", b"", None, fs_config)
 
   def test_dump_fs2(self):
     """Test the dump_fs2 function"""
@@ -130,18 +125,18 @@ class SubversionRepositoryTestCase(unittest.TestCase):
       self.callback_calls += 1
       return None
 
-    dumpstream = StringIO()
-    feedbackstream = StringIO()
+    dumpstream = BytesIO()
+    feedbackstream = BytesIO()
     repos.dump_fs2(self.repos, dumpstream, feedbackstream, 0, self.rev, 0, 0,
                    is_cancelled)
 
     # Check that we can dump stuff
     dump = dumpstream.getvalue()
     feedback = feedbackstream.getvalue()
-    expected_feedback = "* Dumped revision " + str(self.rev)
-    self.assertEquals(dump.count("Node-path: trunk/README.txt"), 2)
-    self.assertEquals(feedback.count(expected_feedback), 1)
-    self.assertEquals(self.callback_calls, 13)
+    expected_feedback = b"* Dumped revision " + str(self.rev).encode('utf-8')
+    self.assertEqual(dump.count(b"Node-path: trunk/README.txt"), 2)
+    self.assertEqual(feedback.count(expected_feedback), 1)
+    self.assertEqual(self.callback_calls, 13)
 
     # Check that the dump can be cancelled
     self.assertRaises(SubversionException, repos.dump_fs2,
@@ -154,22 +149,22 @@ class SubversionRepositoryTestCase(unittest.TestCase):
     self.assertRaises(ValueError, repos.dump_fs2,
       self.repos, dumpstream, feedbackstream, 0, self.rev, 0, 0, None)
 
-    dumpstream = StringIO()
-    feedbackstream = StringIO()
+    dumpstream = BytesIO()
+    feedbackstream = BytesIO()
 
     # Check that we can grab the feedback stream, but not the dumpstream
     repos.dump_fs2(self.repos, None, feedbackstream, 0, self.rev, 0, 0, None)
     feedback = feedbackstream.getvalue()
-    self.assertEquals(feedback.count(expected_feedback), 1)
+    self.assertEqual(feedback.count(expected_feedback), 1)
 
     # Check that we can grab the dumpstream, but not the feedbackstream
     repos.dump_fs2(self.repos, dumpstream, None, 0, self.rev, 0, 0, None)
     dump = dumpstream.getvalue()
-    self.assertEquals(dump.count("Node-path: trunk/README.txt"), 2)
+    self.assertEqual(dump.count(b"Node-path: trunk/README.txt"), 2)
 
     # Check that we can ignore both the dumpstream and the feedbackstream
     repos.dump_fs2(self.repos, dumpstream, None, 0, self.rev, 0, 0, None)
-    self.assertEquals(feedback.count(expected_feedback), 1)
+    self.assertEqual(feedback.count(expected_feedback), 1)
 
     # FIXME: The Python bindings don't check for 'NULL' values for
     #        svn_repos_t objects, so the following call segfaults
@@ -182,50 +177,50 @@ class SubversionRepositoryTestCase(unittest.TestCase):
       return None
     dump_path = os.path.join(os.path.dirname(sys.argv[0]),
         "trac/versioncontrol/tests/svnrepos.dump")
-    stream = open(dump_path)
+    stream = open(dump_path, 'rb')
     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),
+        (b"magic-header", 2),
+        (b'uuid', b'92ea810a-adf3-0310-b540-bef912dcf5ba'),
+        (b'new-revision', 0),
+        (b'set-revision-prop', 0, b'svn:date', b'2005-04-01T09:57:41.312767Z'),
+        (b'close-revision', 0),
+        (b'new-revision', 1),
+        (b'set-revision-prop', 1, b'svn:log', b'Initial directory layout.'),
+        (b'set-revision-prop', 1, b'svn:author', b'john'),
+        (b'set-revision-prop', 1, b'svn:date', b'2005-04-01T10:00:52.353248Z'),
+        (b'new-node', 1, b'branches'),
+        (b'remove-node-props', 1, b'branches'),
+        (b'close-node', 1, b'branches'),
+        (b'new-node', 1, b'tags'),
+        (b'remove-node-props', 1, b'tags'),
+        (b'close-node', 1, b'tags'),
+        (b'new-node', 1, b'trunk'),
+        (b'remove-node-props', 1, b'trunk'),
+        (b'close-node', 1, b'trunk'),
+        (b'close-revision', 1),
+        (b'new-revision', 2),
+        (b'set-revision-prop', 2, b'svn:log', b'Added README.'),
+        (b'set-revision-prop', 2, b'svn:author', b'john'),
+        (b'set-revision-prop', 2, b'svn:date', b'2005-04-01T13:12:18.216267Z'),
+        (b'new-node', 2, b'trunk/README.txt'),
+        (b'remove-node-props', 2, b'trunk/README.txt'),
+        (b'set-fulltext', 2, b'trunk/README.txt'),
+        (b'close-node', 2, b'trunk/README.txt'),
+        (b'close-revision', 2), (b'new-revision', 3),
+        (b'set-revision-prop', 3, b'svn:log', b'Fixed README.\n'),
+        (b'set-revision-prop', 3, b'svn:author', b'kate'),
+        (b'set-revision-prop', 3, b'svn:date', b'2005-04-01T13:24:58.234643Z'),
+        (b'new-node', 3, b'trunk/README.txt'),
+        (b'remove-node-props', 3, b'trunk/README.txt'),
+        (b'set-node-prop', 3, b'trunk/README.txt', b'svn:mime-type', b'text/plain'),
+        (b'set-node-prop', 3, b'trunk/README.txt', b'svn:eol-style', b'native'),
+        (b'set-fulltext', 3, b'trunk/README.txt'),
+        (b'close-node', 3, b'trunk/README.txt'), (b'close-revision', 3),
         ]
     # Compare only the first X nodes described in the expected list - otherwise
     # the comparison list gets too long.
@@ -237,7 +232,7 @@ class SubversionRepositoryTestCase(unittest.TestCase):
         DumpStreamParser.set_fulltext(self, node_baton)
         return 42
     stream = open(os.path.join(os.path.dirname(sys.argv[0]),
-                               "trac/versioncontrol/tests/svnrepos.dump"))
+                               "trac/versioncontrol/tests/svnrepos.dump"), "rb")
     try:
       dsp = DumpStreamParserSubclass()
       ptr, baton = repos.make_parse_fns3(dsp)
@@ -254,16 +249,16 @@ class SubversionRepositoryTestCase(unittest.TestCase):
         logs.append(paths)
 
     # Run get_logs
-    repos.get_logs(self.repos, ['/'], self.rev, 0, True, 0, addLog)
+    repos.get_logs(self.repos, [b'/'], self.rev, 0, True, 0, addLog)
 
     # Count and verify changes
     change_count = 0
     for log in logs:
-      for path_changed in log.values():
+      for path_changed in core._as_list(log.values()):
         change_count += 1
         path_changed.assert_valid()
-    self.assertEqual(logs[2]["/tags/v1.1"].action, "A")
-    self.assertEqual(logs[2]["/tags/v1.1"].copyfrom_path, "/branches/v1x")
+    self.assertEqual(logs[2][b"/tags/v1.1"].action, b"A")
+    self.assertEqual(logs[2][b"/tags/v1.1"].copyfrom_path, b"/branches/v1x")
     self.assertEqual(len(logs), 12)
     self.assertEqual(change_count, 19)
 
@@ -274,14 +269,14 @@ class SubversionRepositoryTestCase(unittest.TestCase):
     prev_root = fs.revision_root(self.fs, self.rev-1)
     editor = ChangeReceiver(this_root, prev_root)
     e_ptr, e_baton = delta.make_editor(editor)
-    repos.dir_delta(prev_root, '', '', this_root, '', e_ptr, e_baton,
+    repos.dir_delta(prev_root, b'', b'', this_root, b'', e_ptr, e_baton,
                     _authz_callback, 1, 1, 0, 0)
 
     # Check results.
     # Ignore the order in which the editor delivers the two sibling files.
     self.assertEqual(set([editor.textdeltas[0].new_data,
                           editor.textdeltas[1].new_data]),
-                     set(["This is a test.\n", "A test.\n"]))
+                     set([b"This is a test.\n", b"A test.\n"]))
     self.assertEqual(len(editor.textdeltas), 2)
 
   def test_unnamed_editor(self):
@@ -292,29 +287,29 @@ class SubversionRepositoryTestCase(unittest.TestCase):
       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,
+      repos.dir_delta(prev_root, b'', b'', this_root, b'', 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",
+    self.assertEqual(repos.fs_revision_prop(self.repos, self.rev, b"svn:log",
                                             _authz_callback),
-                     "''(a few years later)'' Argh... v1.1 was buggy, "
-                     "after all")
+                     b"''(a few years later)'' Argh... v1.1 was buggy, "
+                     b"after all")
 
     # We expect this to complain because we have no pre-revprop-change
     # hook script for the repository.
     self.assertRaises(SubversionException, repos.fs_change_rev_prop3,
-                      self.repos, self.rev, "jrandom", "svn:log",
-                      "Youngest revision", True, True, _authz_callback)
+                      self.repos, self.rev, b"jrandom", b"svn:log",
+                      b"Youngest revision", True, True, _authz_callback)
 
-    repos.fs_change_rev_prop3(self.repos, self.rev, "jrandom", "svn:log",
-                              "Youngest revision", False, False,
+    repos.fs_change_rev_prop3(self.repos, self.rev, b"jrandom", b"svn:log",
+                              b"Youngest revision", False, False,
                               _authz_callback)
 
-    self.assertEqual(repos.fs_revision_prop(self.repos, self.rev, "svn:log",
+    self.assertEqual(repos.fs_revision_prop(self.repos, self.rev, b"svn:log",
                                             _authz_callback),
-                     "Youngest revision")
+                     b"Youngest revision")
 
   def freeze_body(self, pool):
     self.freeze_invoked += 1
@@ -329,52 +324,52 @@ class SubversionRepositoryTestCase(unittest.TestCase):
   def test_lock_unlock(self):
     """Basic lock/unlock"""
 
-    access = fs.create_access('jrandom')
+    access = fs.create_access(b'jrandom')
     fs.set_access(self.fs, access)
-    fs.lock(self.fs, '/trunk/README.txt', None, None, 0, 0, self.rev, False)
+    fs.lock(self.fs, b'/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)
+      fs.lock(self.fs, b'/trunk/README.txt', None, None, 0, 0, self.rev, False)
     except core.SubversionException as 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)
+    fs.lock(self.fs, b'/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(path, b'/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,
+    the_lock = fs.get_lock(self.fs, b'/trunk/README.txt')
+    fs.unlock_many(self.fs, {b'/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,
+    fs.unlock_many(self.fs, {b'/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')
+      self.assertEqual(path, b'/trunk/README.txt')
       if lock != None:
-        self.assertEqual(lock.owner, 'jrandom')
+        self.assertEqual(lock.owner, b'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},
+    fs.lock_many(self.fs, {b'trunk/README.txt':target},
                  None, False, 0, False, lock_callback)
     self.assertEqual(self.calls, 1)
     self.assertEqual(self.locks, 1)
@@ -382,7 +377,7 @@ class SubversionRepositoryTestCase(unittest.TestCase):
 
     self.calls = 0
     self.locks = 0
-    fs.lock_many(self.fs, {'trunk/README.txt':target},
+    fs.lock_many(self.fs, {b'trunk/README.txt':target},
                  None, False, 0, False, lock_callback)
     self.assertEqual(self.calls, 1)
     self.assertEqual(self.locks, 0)
@@ -390,21 +385,21 @@ class SubversionRepositoryTestCase(unittest.TestCase):
 
     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},
+    the_lock = fs.get_lock(self.fs, b'/trunk/README.txt')
+    repos.fs_unlock_many(self.repos, {b'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},
+    repos.fs_unlock_many(self.repos, {b'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},
+    repos.fs_lock_many(self.repos, {b'trunk/README.txt':target},
                        None, False, 0, False, lock_callback)
     self.assertEqual(self.calls, 1)
     self.assertEqual(self.locks, 1)
@@ -412,7 +407,7 @@ class SubversionRepositoryTestCase(unittest.TestCase):
 
     self.calls = 0
     self.locks = 0
-    repos.fs_lock_many(self.repos, {'trunk/README.txt':target},
+    repos.fs_lock_many(self.repos, {b'trunk/README.txt':target},
                        None, False, 0, False, lock_callback)
     self.assertEqual(self.calls, 1)
     self.assertEqual(self.locks, 0)
diff --git a/subversion/bindings/swig/python/tests/run_all.py b/subversion/bindings/swig/python/tests/run_all.py
index acb0926..3a042e0 100644
--- a/subversion/bindings/swig/python/tests/run_all.py
+++ b/subversion/bindings/swig/python/tests/run_all.py
@@ -18,9 +18,10 @@
 # under the License.
 #
 #
+import sys
 import unittest, setup_path
 import mergeinfo, core, client, delta, checksum, pool, fs, ra, wc, repository, \
-       auth, trac.versioncontrol.tests
+       auth, trac.versioncontrol.tests, typemap
 from svn.core import svn_cache_config_get, svn_cache_config_set
 
 # Run all tests
@@ -28,7 +29,10 @@ from svn.core import svn_cache_config_get, svn_cache_config_set
 def suite():
   """Run all tests"""
   settings = svn_cache_config_get()
-  settings.cache_size = long(1024*1024*32) ### Need explicit long
+  if sys.hexversion < 0x3000000:
+    settings.cache_size = long(1024*1024*32) ### Need explicit long
+  else:
+    settings.cache_size = 1024*1024*32
   svn_cache_config_set(settings)
   s = unittest.TestSuite()
   s.addTest(core.suite())
@@ -43,6 +47,7 @@ def suite():
   s.addTest(repository.suite())
   s.addTest(auth.suite())
   s.addTest(trac.versioncontrol.tests.suite())
+  s.addTest(typemap.suite())
   return s
 
 if __name__ == '__main__':
diff --git a/subversion/bindings/swig/python/tests/trac/versioncontrol/main.py b/subversion/bindings/swig/python/tests/trac/versioncontrol/main.py
index 1b8a87c..0d5d061 100644
--- a/subversion/bindings/swig/python/tests/trac/versioncontrol/main.py
+++ b/subversion/bindings/swig/python/tests/trac/versioncontrol/main.py
@@ -154,12 +154,12 @@ class Node(object):
     Represents a directory or file in the repository.
     """
 
-    DIRECTORY = "dir"
-    FILE = "file"
+    DIRECTORY = b"dir"
+    FILE = b"file"
 
     def __init__(self, path, rev, kind):
         assert kind in (Node.DIRECTORY, Node.FILE), "Unknown node kind %s" % kind
-        self.path = str(path)
+        self.path = path
         self.rev = rev
         self.kind = kind
 
@@ -217,7 +217,7 @@ class Node(object):
     content_type = property(lambda x: x.get_content_type())
 
     def get_name(self):
-        return self.path.split('/')[-1]
+        return self.path.split(b'/')[-1]
     name = property(lambda x: x.get_name())
 
     def get_last_modified(self):
@@ -233,11 +233,11 @@ class Changeset(object):
     Represents a set of changes of a repository.
     """
 
-    ADD = 'add'
-    COPY = 'copy'
-    DELETE = 'delete'
-    EDIT = 'edit'
-    MOVE = 'move'
+    ADD = b'add'
+    COPY = b'copy'
+    DELETE = b'delete'
+    EDIT = b'edit'
+    MOVE = b'move'
 
     def __init__(self, rev, message, author, date):
         self.rev = rev
diff --git a/subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py b/subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py
index 29f0a59..15587cb 100644
--- a/subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py
+++ b/subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py
@@ -63,7 +63,7 @@ _kindmap = {core.svn_node_dir: Node.DIRECTORY,
 
 def _get_history(path, authz, fs_ptr, start, end, limit=None):
     history = []
-    if hasattr(repos, 'svn_repos_history2'):
+    if getattr(repos, 'svn_repos_history2', None) is not None:
         # For Subversion >= 1.1
         def authz_cb(root, path, pool):
             if limit and len(history) >= limit:
@@ -107,17 +107,17 @@ class SubversionRepository(Repository):
             raise TracError("%s does not appear to be a Subversion repository." % (path, ))
         if self.path != path:
             self.scope = path[len(self.path):]
-            if not self.scope[-1] == '/':
-                self.scope += '/'
+            if not self.scope[-1:] == b'/':
+                self.scope += b'/'
         else:
-            self.scope = '/'
+            self.scope = b'/'
 
         self.repos = repos.svn_repos_open(self.path)
         self.fs_ptr = repos.svn_repos_fs(self.repos)
         self.rev = fs.youngest_rev(self.fs_ptr)
 
         self.history = None
-        if self.scope != '/':
+        if self.scope != b'/':
             self.history = []
             for path,rev in _get_history(self.scope[1:], self.authz,
                                          self.fs_ptr, 0, self.rev):
@@ -132,7 +132,7 @@ class SubversionRepository(Repository):
         return node_type in _kindmap
 
     def normalize_path(self, path):
-        return path == '/' and path or path and path.strip('/') or ''
+        return path == b'/' and path or path and path.strip(b'/') or b''
 
     def normalize_rev(self, rev):
         try:
@@ -157,7 +157,7 @@ class SubversionRepository(Repository):
 
     def get_node(self, path, rev=None):
         self.authz.assert_permission(self.scope + path)
-        if path and path[-1] == '/':
+        if path and path[-1] == b'/':
             path = path[:-1]
 
         rev = self.normalize_rev(rev)
@@ -166,13 +166,13 @@ class SubversionRepository(Repository):
 
     def get_oldest_rev(self):
         rev = 0
-        if self.scope == '/':
+        if self.scope == b'/':
             return rev
         return self.history[-1]
 
     def get_youngest_rev(self):
         rev = self.rev
-        if self.scope == '/':
+        if self.scope == b'/':
             return rev
         return self.history[0]
 
@@ -180,7 +180,7 @@ class SubversionRepository(Repository):
         rev = int(rev)
         if rev == 0:
             return None
-        if self.scope == '/':
+        if self.scope == b'/':
             return rev - 1
         idx = self.history.index(rev)
         if idx + 1 < len(self.history):
@@ -191,7 +191,7 @@ class SubversionRepository(Repository):
         rev = int(rev)
         if rev == self.rev:
             return None
-        if self.scope == '/':
+        if self.scope == b'/':
             return rev + 1
         if rev == 0:
             return self.oldest_rev
@@ -224,7 +224,7 @@ class SubversionRepository(Repository):
                         else: # the path changed: 'newer' was a copy
                             rev = self.previous_rev(newer[1]) # restart before the copy op
                             yield newer[0], newer[1], Changeset.COPY
-                            older = (older[0], older[1], 'unknown')
+                            older = (older[0], older[1], b'unknown')
                             break
                     newer = older
                 if older: # either a real ADD or the source of a COPY
@@ -262,7 +262,7 @@ class SubversionRepository(Repository):
             def authz_cb(root, path, pool): return 1
             text_deltas = 0 # as this is anyway re-done in Diff.py...
             entry_props = 0 # ("... typically used only for working copy updates")
-            repos.svn_repos_dir_delta(old_root, old_path, '',
+            repos.svn_repos_dir_delta(old_root, old_path, b'',
                                       new_root, new_path,
                                       e_ptr, e_baton, authz_cb,
                                       text_deltas,
@@ -290,7 +290,7 @@ class SubversionNode(Node):
     def __init__(self, path, rev, authz, scope, fs_ptr):
         self.authz = authz
         self.scope = scope
-        if scope != '/':
+        if scope != b'/':
             self.scoped_path = scope + path
         else:
             self.scoped_path = path
@@ -300,7 +300,8 @@ class SubversionNode(Node):
         self.root = fs.revision_root(fs_ptr, rev)
         node_type = fs.check_path(self.root, self.scoped_path)
         if not node_type in _kindmap:
-            raise TracError("No node at %s in revision %s" % (path, rev))
+            raise TracError("No node at %s in revision %s"
+                            % (path.decode('UTF-8'), rev))
         self.created_rev = fs.node_created_rev(self.root, self.scoped_path)
         self.created_path = fs.node_created_path(self.root, self.scoped_path)
         # Note: 'created_path' differs from 'path' if the last change was a copy,
@@ -322,8 +323,8 @@ class SubversionNode(Node):
         if self.isfile:
             return
         entries = fs.dir_entries(self.root, self.scoped_path)
-        for item in entries.keys():
-            path = '/'.join((self.path, item))
+        for item in entries:
+            path = b'/'.join((self.path, item))
             if not self.authz.has_permission(path):
                 continue
             yield SubversionNode(path, self._requested_rev, self.authz,
@@ -349,8 +350,8 @@ class SubversionNode(Node):
 
     def get_properties(self):
         props = fs.node_proplist(self.root, self.scoped_path)
-        for name,value in props.items():
-            props[name] = str(value) # Make sure the value is a proper string
+        for name,value in core._as_list(props.items()):
+            props[name] = value
         return props
 
     def get_content_length(self):
@@ -366,7 +367,7 @@ class SubversionNode(Node):
     def get_last_modified(self):
         date = fs.revision_prop(self.fs_ptr, self.created_rev,
                                 core.SVN_PROP_REVISION_DATE)
-        return core.svn_time_from_cstring(date) / 1000000
+        return core.svn_time_from_cstring(date) // 1000000
 
     def _get_prop(self, name):
         return fs.node_prop(self.root, self.scoped_path, name)
@@ -382,7 +383,7 @@ class SubversionChangeset(Changeset):
         message = self._get_prop(core.SVN_PROP_REVISION_LOG)
         author = self._get_prop(core.SVN_PROP_REVISION_AUTHOR)
         date = self._get_prop(core.SVN_PROP_REVISION_DATE)
-        date = core.svn_time_from_cstring(date) / 1000000
+        date = core.svn_time_from_cstring(date) // 1000000
         Changeset.__init__(self, rev, message, author, date)
 
     def get_changes(self):
@@ -392,9 +393,10 @@ class SubversionChangeset(Changeset):
         repos.svn_repos_replay(root, e_ptr, e_baton)
 
         idx = 0
+        # Variables to record copy/deletes for later move detection
         copies, deletions = {}, {}
         changes = []
-        for path, change in editor.changes.items():
+        for path, change in core._as_list(editor.changes.items()):
             if not self.authz.has_permission(path):
                 # FIXME: what about base_path?
                 continue
@@ -409,10 +411,12 @@ class SubversionChangeset(Changeset):
             action = ''
             if change.action == repos.CHANGE_ACTION_DELETE:
                 action = Changeset.DELETE
+                # Save off the index within changes of this deletion
                 deletions[change.base_path] = idx
             elif change.added:
                 if change.base_path and change.base_rev:
                     action = Changeset.COPY
+                    # Save off the index within changes of this copy
                     copies[change.base_path] = idx
                 else:
                     action = Changeset.ADD
@@ -423,18 +427,19 @@ class SubversionChangeset(Changeset):
             changes.append([path, kind, action, base_path, change.base_rev])
             idx += 1
 
-        moves = []
-        for k,v in copies.items():
+        # Detect moves by checking for copies whose source was deleted in this
+        # change set.
+        moves = set()
+        for k,v in core._as_list(copies.items()):
             if k in deletions:
                 changes[v][2] = Changeset.MOVE
-                moves.append(deletions[k])
-        offset = 0
-        for i in moves:
-            del changes[i - offset]
-            offset += 1
+                # Record the index of the now redundant delete action.
+                moves.add(deletions[k])
 
-        for change in changes:
-            yield tuple(change)
+        for i, change in enumerate(changes):
+            # Do not return the 'delete' changes that were part of moves.
+            if i not in moves:
+                yield tuple(change)
 
     def _get_prop(self, name):
         return fs.revision_prop(self.fs_ptr, self.rev, name)
@@ -457,7 +462,7 @@ class DiffChangeEditor(delta.Editor):
     # -- svn.delta.Editor callbacks
 
     def open_root(self, base_revision, dir_pool):
-        return ('/', Changeset.EDIT)
+        return (b'/', Changeset.EDIT)
 
     def add_directory(self, path, dir_baton, copyfrom_path, copyfrom_rev, dir_pool):
         self.deltas.append((path, Node.DIRECTORY, Changeset.ADD))
diff --git a/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py b/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
index 57cd886..a31665f 100644
--- a/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
+++ b/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
@@ -53,17 +53,14 @@ import shutil
 import sys
 import tempfile
 import unittest
-from urllib import pathname2url
+from io import BytesIO
 
 if sys.version_info[0] >= 3:
   # Python >=3.0
-  from io import StringIO
+  from urllib.request import pathname2url
 else:
   # Python <3.0
-  try:
-    from cStringIO import StringIO
-  except ImportError:
-    from StringIO import StringIO
+  from urllib import pathname2url
 
 from svn import core, repos
 
@@ -72,35 +69,34 @@ from trac.versioncontrol import Changeset, Node
 from trac.versioncontrol.svn_fs import SubversionRepository
 
 temp_path = tempfile.mktemp("-trac-svnrepos")
-REPOS_PATH = core.svn_dirent_internal_style(temp_path)
-REPOS_URL = pathname2url(temp_path)
+REPOS_PATH = core.svn_dirent_internal_style(temp_path.encode('UTF-8'))
+REPOS_URL = pathname2url(temp_path).encode('UTF-8')
 del temp_path
 
-if REPOS_URL.startswith("///"):
+if REPOS_URL.startswith(b"///"):
   # Don't add extra slashes if they're already present.
   # (This is important for Windows compatibility).
-  REPOS_URL = "file:" + REPOS_URL
+  REPOS_URL = b"file:" + REPOS_URL
 else:
   # If the URL simply starts with '/', we need to add two
   # extra slashes to make it a valid 'file://' URL
-  REPOS_URL = "file://" + REPOS_URL
+  REPOS_URL = b"file://" + REPOS_URL
 
 REPOS_URL = core.svn_uri_canonicalize(REPOS_URL)
 
 class SubversionRepositoryTestSetup(TestSetup):
 
     def setUp(self):
-        dumpfile = open(os.path.join(os.path.split(__file__)[0],
-                                     'svnrepos.dump'), 'rb')
+        dump_path = os.path.join(os.path.split(__file__)[0], 'svnrepos.dump')
+        with open(dump_path, 'rb') as dumpfile:
+            # Remove the trac-svnrepos directory, so that we can
+            # ensure a fresh start.
+            self.tearDown()
 
-        # Remove the trac-svnrepos directory, so that we can
-        # ensure a fresh start.
-        self.tearDown()
-
-        r = repos.svn_repos_create(REPOS_PATH, '', '', None, None)
-        repos.svn_repos_load_fs2(r, dumpfile, StringIO(),
-                                repos.svn_repos_load_uuid_ignore, '',
-                                0, 0, None)
+            r = repos.svn_repos_create(REPOS_PATH, b'', b'', None, None)
+            repos.svn_repos_load_fs2(r, dumpfile, BytesIO(),
+                                    repos.svn_repos_load_uuid_ignore, b'',
+                                    0, 0, None)
 
     def tearDown(self):
         if os.path.exists(REPOS_PATH):
@@ -126,110 +122,111 @@ class SubversionRepositoryTestCase(unittest.TestCase):
         self.assertEqual(None, self.repos.next_rev(12))
 
     def test_get_node(self):
-        node = self.repos.get_node('/trunk')
-        self.assertEqual('trunk', node.name)
-        self.assertEqual('/trunk', node.path)
+        node = self.repos.get_node(b'/trunk')
+        self.assertEqual(b'trunk', node.name)
+        self.assertEqual(b'/trunk', node.path)
         self.assertEqual(Node.DIRECTORY, node.kind)
         self.assertEqual(6, node.rev)
         self.assertEqual(1112381806, node.last_modified)
-        node = self.repos.get_node('/trunk/README.txt')
-        self.assertEqual('README.txt', node.name)
-        self.assertEqual('/trunk/README.txt', node.path)
+        node = self.repos.get_node(b'/trunk/README.txt')
+        self.assertEqual(b'README.txt', node.name)
+        self.assertEqual(b'/trunk/README.txt', node.path)
         self.assertEqual(Node.FILE, node.kind)
         self.assertEqual(3, node.rev)
         self.assertEqual(1112361898, node.last_modified)
 
     def test_get_node_specific_rev(self):
-        node = self.repos.get_node('/trunk', 1)
-        self.assertEqual('trunk', node.name)
-        self.assertEqual('/trunk', node.path)
+        node = self.repos.get_node(b'/trunk', 1)
+        self.assertEqual(b'trunk', node.name)
+        self.assertEqual(b'/trunk', node.path)
         self.assertEqual(Node.DIRECTORY, node.kind)
         self.assertEqual(1, node.rev)
         self.assertEqual(1112349652, node.last_modified)
-        node = self.repos.get_node('/trunk/README.txt', 2)
-        self.assertEqual('README.txt', node.name)
-        self.assertEqual('/trunk/README.txt', node.path)
+        node = self.repos.get_node(b'/trunk/README.txt', 2)
+        self.assertEqual(b'README.txt', node.name)
+        self.assertEqual(b'/trunk/README.txt', node.path)
         self.assertEqual(Node.FILE, node.kind)
         self.assertEqual(2, node.rev)
         self.assertEqual(1112361138, node.last_modified)
 
     def test_get_dir_entries(self):
-        node = self.repos.get_node('/trunk')
+        node = self.repos.get_node(b'/trunk')
         entries = node.get_entries()
-        self.assertEqual('README2.txt', entries.next().name)
-        self.assertEqual('dir1', entries.next().name)
-        self.assertEqual('README.txt', entries.next().name)
-        self.assertRaises(StopIteration, entries.next)
+        self.assertSequenceEqual(sorted([entry.name for entry in entries]),
+                                 sorted([b'README2.txt',
+                                  b'dir1',
+                                  b'README.txt']))
 
     def test_get_file_entries(self):
-        node = self.repos.get_node('/trunk/README.txt')
+        node = self.repos.get_node(b'/trunk/README.txt')
         entries = node.get_entries()
-        self.assertRaises(StopIteration, entries.next)
+        self.assertSequenceEqual([entry.name for entry in entries],
+                                 [])
 
     def test_get_dir_content(self):
-        node = self.repos.get_node('/trunk')
+        node = self.repos.get_node(b'/trunk')
         self.assertEqual(None, node.content_length)
         self.assertEqual(None, node.content_type)
         self.assertEqual(None, node.get_content())
 
     def test_get_file_content(self):
-        node = self.repos.get_node('/trunk/README.txt')
+        node = self.repos.get_node(b'/trunk/README.txt')
         self.assertEqual(8, node.content_length)
-        self.assertEqual('text/plain', node.content_type)
-        self.assertEqual('A test.\n', node.get_content().read())
+        self.assertEqual(b'text/plain', node.content_type)
+        self.assertEqual(b'A test.\n', node.get_content().read())
 
     def test_get_dir_properties(self):
-        f = self.repos.get_node('/trunk')
+        f = self.repos.get_node(b'/trunk')
         props = f.get_properties()
         self.assertEqual(0, len(props))
 
     def test_get_file_properties(self):
-        f = self.repos.get_node('/trunk/README.txt')
+        f = self.repos.get_node(b'/trunk/README.txt')
         props = f.get_properties()
-        self.assertEqual('native', props['svn:eol-style'])
-        self.assertEqual('text/plain', props['svn:mime-type'])
+        self.assertEqual(b'native', props[b'svn:eol-style'])
+        self.assertEqual(b'text/plain', props[b'svn:mime-type'])
 
     # Revision Log / node history
 
     def test_get_node_history(self):
-        node = self.repos.get_node('/trunk/README2.txt')
+        node = self.repos.get_node(b'/trunk/README2.txt')
         history = node.get_history()
-        self.assertEqual(('trunk/README2.txt', 6, 'copy'), history.next())
-        self.assertEqual(('trunk/README.txt', 3, 'edit'), history.next())
-        self.assertEqual(('trunk/README.txt', 2, 'add'), history.next())
-        self.assertRaises(StopIteration, history.next)
+        self.assertSequenceEqual([x for x in history],
+                                 [(b'trunk/README2.txt', 6, b'copy'),
+                                  (b'trunk/README.txt', 3, b'edit'),
+                                  (b'trunk/README.txt', 2, b'add')])
 
     def test_get_node_history_follow_copy(self):
-        node = self.repos.get_node('/tags/v1/README.txt')
+        node = self.repos.get_node(b'/tags/v1/README.txt')
         history = node.get_history()
-        self.assertEqual(('tags/v1/README.txt', 7, 'copy'), history.next())
-        self.assertEqual(('trunk/README.txt', 3, 'edit'), history.next())
-        self.assertEqual(('trunk/README.txt', 2, 'add'), history.next())
-        self.assertRaises(StopIteration, history.next)
+        self.assertSequenceEqual([x for x in history],
+                                 [(b'tags/v1/README.txt', 7, b'copy'),
+                                  (b'trunk/README.txt', 3, b'edit'),
+                                  (b'trunk/README.txt', 2, b'add')])
 
     # Revision Log / path history
 
     def test_get_path_history(self):
-        history = self.repos.get_path_history('/trunk/README2.txt', None)
-        self.assertEqual(('trunk/README2.txt', 6, 'copy'), history.next())
-        self.assertEqual(('trunk/README.txt', 3, 'unknown'), history.next())
-        self.assertRaises(StopIteration, history.next)
+        history = self.repos.get_path_history(b'/trunk/README2.txt', None)
+        self.assertSequenceEqual([x for x in history],
+                                 [(b'trunk/README2.txt', 6, b'copy'),
+                                  (b'trunk/README.txt', 3, b'unknown')])
 
     def test_get_path_history_copied_file(self):
-        history = self.repos.get_path_history('/tags/v1/README.txt', None)
-        self.assertEqual(('tags/v1/README.txt', 7, 'copy'), history.next())
-        self.assertEqual(('trunk/README.txt', 3, 'unknown'), history.next())
-        self.assertRaises(StopIteration, history.next)
+        history = self.repos.get_path_history(b'/tags/v1/README.txt', None)
+        self.assertSequenceEqual([x for x in history],
+                                 [(b'tags/v1/README.txt', 7, b'copy'),
+                                  (b'trunk/README.txt', 3, b'unknown')])
 
     def test_get_path_history_copied_dir(self):
-        history = self.repos.get_path_history('/branches/v1x', None)
-        self.assertEqual(('branches/v1x', 12, 'copy'), history.next())
-        self.assertEqual(('tags/v1.1', 10, 'unknown'), history.next())
-        self.assertEqual(('branches/v1x', 11, 'delete'), history.next())
-        self.assertEqual(('branches/v1x', 9, 'edit'), history.next())
-        self.assertEqual(('branches/v1x', 8, 'copy'), history.next())
-        self.assertEqual(('tags/v1', 7, 'unknown'), history.next())
-        self.assertRaises(StopIteration, history.next)
+        history = self.repos.get_path_history(b'/branches/v1x', None)
+        self.assertSequenceEqual([x for x in history],
+                                 [(b'branches/v1x', 12, b'copy'),
+                                  (b'tags/v1.1', 10, b'unknown'),
+                                  (b'branches/v1x', 11, b'delete'),
+                                  (b'branches/v1x', 9, b'edit'),
+                                  (b'branches/v1x', 8, b'copy'),
+                                  (b'tags/v1', 7, b'unknown')])
 
     # Diffs
 
@@ -243,63 +240,63 @@ class SubversionRepositoryTestCase(unittest.TestCase):
         self.assertEqual(expected[2], (got[2], got[3]))
 
     def test_diff_file_different_revs(self):
-        diffs = self.repos.get_deltas('trunk/README.txt', 2, 'trunk/README.txt', 3)
-        self._cmp_diff((('trunk/README.txt', 2),
-                        ('trunk/README.txt', 3),
-                        (Node.FILE, Changeset.EDIT)), diffs.next())
-        self.assertRaises(StopIteration, diffs.next)
+        diffs = self.repos.get_deltas(b'trunk/README.txt', 2, b'trunk/README.txt', 3)
+        self._cmp_diff(((b'trunk/README.txt', 2),
+                        (b'trunk/README.txt', 3),
+                        (Node.FILE, Changeset.EDIT)), next(diffs))
+        self.assertRaises(StopIteration, lambda: next(diffs))
 
     def test_diff_file_different_files(self):
-        diffs = self.repos.get_deltas('branches/v1x/README.txt', 12,
-                                      'branches/v1x/README2.txt', 12)
-        self._cmp_diff((('branches/v1x/README.txt', 12),
-                        ('branches/v1x/README2.txt', 12),
-                        (Node.FILE, Changeset.EDIT)), diffs.next())
-        self.assertRaises(StopIteration, diffs.next)
+        diffs = self.repos.get_deltas(b'branches/v1x/README.txt', 12,
+                                      b'branches/v1x/README2.txt', 12)
+        self._cmp_diff(((b'branches/v1x/README.txt', 12),
+                        (b'branches/v1x/README2.txt', 12),
+                        (Node.FILE, Changeset.EDIT)), next(diffs))
+        self.assertRaises(StopIteration, lambda: next(diffs))
 
     def test_diff_file_no_change(self):
-        diffs = self.repos.get_deltas('trunk/README.txt', 7,
-                                      'tags/v1/README.txt', 7)
-        self.assertRaises(StopIteration, diffs.next)
+        diffs = self.repos.get_deltas(b'trunk/README.txt', 7,
+                                      b'tags/v1/README.txt', 7)
+        self.assertRaises(StopIteration, lambda: next(diffs))
 
     def test_diff_dir_different_revs(self):
-        diffs = self.repos.get_deltas('trunk', 4, 'trunk', 8)
+        diffs = self.repos.get_deltas(b'trunk', 4, b'trunk', 8)
         expected = [
-          (None, ('trunk/README2.txt', 6),
+          (None, (b'trunk/README2.txt', 6),
            (Node.FILE, Changeset.ADD)),
-          (None, ('trunk/dir1/dir2', 8),
+          (None, (b'trunk/dir1/dir2', 8),
            (Node.DIRECTORY, Changeset.ADD)),
-          (None, ('trunk/dir1/dir3', 8),
+          (None, (b'trunk/dir1/dir3', 8),
            (Node.DIRECTORY, Changeset.ADD)),
-          (('trunk/dir2', 4), None,
+          ((b'trunk/dir2', 4), None,
            (Node.DIRECTORY, Changeset.DELETE)),
-          (('trunk/dir3', 4), None,
+          ((b'trunk/dir3', 4), None,
            (Node.DIRECTORY, Changeset.DELETE)),
         ]
-        actual = [diffs.next() for i in range(5)]
+        actual = [next(diffs) for i in range(5)]
         actual = sorted(actual,
                         key=lambda diff: ((diff[0] or diff[1]).path,
                                           (diff[0] or diff[1]).rev))
         self.assertEqual(len(expected), len(actual))
         for e,a in zip(expected, actual):
           self._cmp_diff(e,a)
-        self.assertRaises(StopIteration, diffs.next)
+        self.assertRaises(StopIteration, lambda: next(diffs))
 
     def test_diff_dir_different_dirs(self):
-        diffs = self.repos.get_deltas('trunk', 1, 'branches/v1x', 12)
+        diffs = self.repos.get_deltas(b'trunk', 1, b'branches/v1x', 12)
         expected = [
-          (None, ('branches/v1x/README.txt', 12),
+          (None, (b'branches/v1x/README.txt', 12),
            (Node.FILE, Changeset.ADD)),
-          (None, ('branches/v1x/README2.txt', 12),
+          (None, (b'branches/v1x/README2.txt', 12),
            (Node.FILE, Changeset.ADD)),
-          (None, ('branches/v1x/dir1', 12),
+          (None, (b'branches/v1x/dir1', 12),
            (Node.DIRECTORY, Changeset.ADD)),
-          (None, ('branches/v1x/dir1/dir2', 12),
+          (None, (b'branches/v1x/dir1/dir2', 12),
            (Node.DIRECTORY, Changeset.ADD)),
-          (None, ('branches/v1x/dir1/dir3', 12),
+          (None, (b'branches/v1x/dir1/dir3', 12),
            (Node.DIRECTORY, Changeset.ADD)),
         ]
-        actual = [diffs.next() for i in range(5)]
+        actual = [next(diffs) for i in range(5)]
         actual = sorted(actual, key=lambda diff: (diff[1].path, diff[1].rev))
         # for e,a in zip(expected, actual):
         #   t.write("%r\n" % (e,))
@@ -308,12 +305,12 @@ class SubversionRepositoryTestCase(unittest.TestCase):
         self.assertEqual(len(expected), len(actual))
         for e,a in zip(expected, actual):
           self._cmp_diff(e,a)
-        self.assertRaises(StopIteration, diffs.next)
+        self.assertRaises(StopIteration, lambda: next(diffs))
 
     def test_diff_dir_no_change(self):
-        diffs = self.repos.get_deltas('trunk', 7,
-                                      'tags/v1', 7)
-        self.assertRaises(StopIteration, diffs.next)
+        diffs = self.repos.get_deltas(b'trunk', 7,
+                                      b'tags/v1', 7)
+        self.assertRaises(StopIteration, lambda: next(diffs))
 
     # Changesets
 
@@ -323,61 +320,57 @@ class SubversionRepositoryTestCase(unittest.TestCase):
         self.assertEqual(None, chgset.message)
         self.assertEqual(None, chgset.author)
         self.assertEqual(1112349461, chgset.date)
-        self.assertRaises(StopIteration, chgset.get_changes().next)
+        self.assertRaises(StopIteration, lambda: next(chgset.get_changes()))
 
     def test_changeset_added_dirs(self):
         chgset = self.repos.get_changeset(1)
         self.assertEqual(1, chgset.rev)
-        self.assertEqual('Initial directory layout.', chgset.message)
-        self.assertEqual('john', chgset.author)
+        self.assertEqual(b'Initial directory layout.', chgset.message)
+        self.assertEqual(b'john', chgset.author)
         self.assertEqual(1112349652, chgset.date)
 
         changes = chgset.get_changes()
-        self.assertEqual(('trunk', Node.DIRECTORY, Changeset.ADD, None, -1),
-                         changes.next())
-        self.assertEqual(('branches', Node.DIRECTORY, Changeset.ADD, None, -1),
-                         changes.next())
-        self.assertEqual(('tags', Node.DIRECTORY, Changeset.ADD, None, -1),
-                         changes.next())
-        self.assertRaises(StopIteration, changes.next)
+        self.assertSequenceEqual(sorted([x for x in changes]),
+          sorted([(b'trunk', Node.DIRECTORY, Changeset.ADD, None, -1),
+                  (b'branches', Node.DIRECTORY, Changeset.ADD, None, -1),
+                  (b'tags', Node.DIRECTORY, Changeset.ADD, None, -1)]))
 
     def test_changeset_file_edit(self):
         chgset = self.repos.get_changeset(3)
         self.assertEqual(3, chgset.rev)
-        self.assertEqual('Fixed README.\n', chgset.message)
-        self.assertEqual('kate', chgset.author)
+        self.assertEqual(b'Fixed README.\n', chgset.message)
+        self.assertEqual(b'kate', chgset.author)
         self.assertEqual(1112361898, chgset.date)
 
         changes = chgset.get_changes()
-        self.assertEqual(('trunk/README.txt', Node.FILE, Changeset.EDIT,
-                          'trunk/README.txt', 2), changes.next())
-        self.assertRaises(StopIteration, changes.next)
+        self.assertSequenceEqual(sorted([x for x in changes]),
+                                 sorted([(b'trunk/README.txt', Node.FILE, Changeset.EDIT,
+                                   b'trunk/README.txt', 2)]))
 
     def test_changeset_dir_moves(self):
         chgset = self.repos.get_changeset(5)
         self.assertEqual(5, chgset.rev)
-        self.assertEqual('Moved directories.', chgset.message)
-        self.assertEqual('kate', chgset.author)
+        self.assertEqual(b'Moved directories.', chgset.message)
+        self.assertEqual(b'kate', chgset.author)
         self.assertEqual(1112372739, chgset.date)
 
         changes = chgset.get_changes()
-        self.assertEqual(('trunk/dir1/dir2', Node.DIRECTORY, Changeset.MOVE,
-                          'trunk/dir2', 4), changes.next())
-        self.assertEqual(('trunk/dir1/dir3', Node.DIRECTORY, Changeset.MOVE,
-                          'trunk/dir3', 4), changes.next())
-        self.assertRaises(StopIteration, changes.next)
+        self.assertSequenceEqual(sorted([x for x in changes]),
+          sorted([
+            (b'trunk/dir1/dir2', Node.DIRECTORY, Changeset.MOVE, b'trunk/dir2', 4),
+            (b'trunk/dir1/dir3', Node.DIRECTORY, Changeset.MOVE, b'trunk/dir3', 4)]))
 
     def test_changeset_file_copy(self):
         chgset = self.repos.get_changeset(6)
         self.assertEqual(6, chgset.rev)
-        self.assertEqual('More things to read', chgset.message)
-        self.assertEqual('john', chgset.author)
+        self.assertEqual(b'More things to read', chgset.message)
+        self.assertEqual(b'john', chgset.author)
         self.assertEqual(1112381806, chgset.date)
 
         changes = chgset.get_changes()
-        self.assertEqual(('trunk/README2.txt', Node.FILE, Changeset.COPY,
-                          'trunk/README.txt', 3), changes.next())
-        self.assertRaises(StopIteration, changes.next)
+        self.assertSequenceEqual(sorted([x for x in changes]),
+          sorted([(b'trunk/README2.txt', Node.FILE, Changeset.COPY,
+                   b'trunk/README.txt', 3)]))
 
 
 def suite():
diff --git a/subversion/bindings/swig/python/tests/typemap.py b/subversion/bindings/swig/python/tests/typemap.py
new file mode 100644
index 0000000..7f6e839
--- /dev/null
+++ b/subversion/bindings/swig/python/tests/typemap.py
@@ -0,0 +1,133 @@
+#
+#
+# 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.
+#
+#
+import unittest
+import os
+import tempfile
+
+import svn.core
+
+class SubversionTypemapTestCase(unittest.TestCase):
+  """Test cases for the SWIG typemaps argments and return values transration"""
+
+  def test_char_ptr_in(self):
+    """Check %typemap(in) IN_STRING works correctly"""
+    self.assertEqual(svn.core.svn_path_canonicalize(b'foo'), b'foo')
+    self.assertEqual(svn.core.svn_dirent_join(b'foo', 'bar'), b'foo/bar')
+    with self.assertRaises(TypeError) as cm:
+      svn.core.svn_dirent_join(None, b'bar')
+    self.assertEqual(str(cm.exception),
+                     "svn_dirent_join() argument base must be"
+                     " bytes or str, not %s" % None.__class__.__name__)
+    with self.assertRaises(TypeError) as cm:
+      svn.core.svn_dirent_join(b'foo', self)
+    self.assertEqual(str(cm.exception),
+                     "svn_dirent_join() argument component must be"
+                     " bytes or str, not %s" % self.__class__.__name__)
+    with self.assertRaises(TypeError) as cm:
+      svn.core.svn_dirent_join('foo', 10)
+    self.assertEqual(str(cm.exception),
+                     "svn_dirent_join() argument component must be"
+                     " bytes or str, not int")
+
+  def test_char_ptr_in_unicode_exception(self):
+    """Check %typemap(in) IN_STRING handles unicode encode error correctly"""
+    with self.assertRaises(UnicodeEncodeError):
+      svn.core.svn_dirent_join(b'foo', u'\udc62\udc61\udc72')
+
+  def test_char_ptr_may_be_null(self):
+    """Check %typemap(in) char *MAY_BE_NULL works correctly"""
+    cfg = svn.core.svn_config_create2(False, False)
+    self.assertEqual(svn.core.svn_config_get(cfg, b'foo', b'bar', b'baz'),
+                     b'baz')
+    self.assertEqual(svn.core.svn_config_get(cfg, b'foo', b'bar', 'baz'),
+                     b'baz')
+    self.assertIsNone(svn.core.svn_config_get(cfg, b'foo', b'bar', None))
+    with self.assertRaises(TypeError) as cm:
+      svn.core.svn_config_get(cfg, b'foo', b'bar', self)
+    self.assertEqual(str(cm.exception),
+                     "svn_config_get() argument default_value"
+                     " must be bytes or str or None, not %s"
+                     % self.__class__.__name__)
+
+  def test_char_ptr_may_be_null_unicode_exception(self):
+    """Check %typemap(in) char *MAY_BE_NULL handles unicode encode error correctly"""
+    cfg = svn.core.svn_config_create2(False, False)
+    with self.assertRaises(UnicodeEncodeError):
+      svn.core.svn_config_get(cfg, u'f\udc6fo', b'bar', None)
+
+  def test_make_string_from_ob(self):
+    """Check make_string_from_ob and make_svn_string_from_ob work correctly"""
+    source_props = { b'a' : b'foo',
+                     b'b' :  'foo',
+                      'c' : b''     }
+    target_props = { b'a' :  '',
+                      'b' :  'bar',
+                     b'c' : b'baz'  }
+    expected     = { b'a' : b'',
+                     b'b' : b'bar',
+                     b'c' : b'baz'  }
+    self.assertEqual(svn.core.svn_prop_diffs(target_props, source_props),
+                     expected)
+
+  def test_prophash_from_dict_null_value(self):
+    """Check make_svn_string_from_ob_maybe_null work correctly"""
+    source_props = {  'a' :  'foo',
+                      'b' :  'foo',
+                      'c' : None    }
+    target_props = {  'a' : None,
+                      'b' :  'bar',
+                      'c' :  'baz'  }
+    expected     = { b'a' : None,
+                     b'b' : b'bar',
+                     b'c' : b'baz'  }
+    self.assertEqual(svn.core.svn_prop_diffs(target_props, source_props),
+                     expected)
+
+  def test_make_string_from_ob_unicode_exception(self):
+    """Check make_string_from_ob  handles unicode encode error correctly"""
+    source_props = { b'a'      : b'foo',
+                     b'b'      : u'foo',
+                     u'\udc63' : b''     }
+    target_props = { b'a'      : u'',
+                     u'b'      : u'bar',
+                     b'c'      : b'baz'  }
+    with self.assertRaises(UnicodeEncodeError):
+      svn.core.svn_prop_diffs(target_props, source_props)
+
+  def test_make_svn_string_from_ob_unicode_exception(self):
+    """Check make_string_from_ob handles unicode encode error correctly"""
+    source_props = { b'a' : b'foo',
+                     b'b' :  'foo',
+                     u'c' : b''     }
+    target_props = { b'a' : u'',
+                     u'b' : u'b\udc61r',
+                     b'c' : b'baz'  }
+    with self.assertRaises(UnicodeEncodeError):
+      svn.core.svn_prop_diffs(target_props, source_props)
+
+
+def suite():
+    return unittest.defaultTestLoader.loadTestsFromTestCase(
+      SubversionTypemapTestCase)
+
+if __name__ == '__main__':
+    runner = unittest.TextTestRunner()
+    runner.run(suite())
diff --git a/subversion/bindings/swig/python/tests/utils.py b/subversion/bindings/swig/python/tests/utils.py
index 2223809..c8b7e9d 100644
--- a/subversion/bindings/swig/python/tests/utils.py
+++ b/subversion/bindings/swig/python/tests/utils.py
@@ -18,9 +18,15 @@
 # under the License.
 #
 #
-import os.path, sys, tempfile, urllib
+import os.path, sys, tempfile
 from svn import core, repos
-from StringIO import StringIO
+from io import BytesIO
+try:
+  # Python >=3.0
+  from urllib.request import pathname2url
+except ImportError:
+  # Python <3.0
+  from urllib import pathname2url
 
 class Temper(object):
   """Class to simplify allocation and cleanup of dummy Subversion
@@ -41,14 +47,19 @@ class Temper(object):
   def alloc_empty_dir(self, suffix = ""):
     """Create an empty temporary directory. Returns its full path
        in canonical internal form."""
-    temp_dir_name = core.svn_dirent_internal_style(tempfile.mkdtemp(suffix))
+    if isinstance(suffix, bytes):
+      suffix = suffix.decode('UTF-8')
+    temp_dir_name = tempfile.mkdtemp(suffix).encode('UTF-8')
+    temp_dir_name = core.svn_dirent_internal_style(temp_dir_name)
     self._cleanup_list.append((temp_dir_name, core.svn_io_remove_dir))
     return temp_dir_name
 
   def alloc_empty_repo(self, suffix = ""):
     """Create an empty repository. Returns a tuple of its handle, path and
        file: URI in canonical internal form."""
-    temp_path = tempfile.mkdtemp(suffix)
+    if isinstance(suffix, bytes):
+      suffix = suffix.decode('UTF-8')
+    temp_path = tempfile.mkdtemp(suffix).encode('UTF-8')
     repo_path = core.svn_dirent_internal_style(temp_path)
     repo_uri = core.svn_uri_canonicalize(file_uri_for_path(temp_path))
     handle = repos.create(repo_path, None, None, None, None)
@@ -61,15 +72,18 @@ class Temper(object):
        location. Returns the same as alloc_empty_repo."""
     dump_path = os.path.join(os.path.dirname(sys.argv[0]), repo_id)
     (handle, repo_path, repo_uri) = self.alloc_empty_repo(suffix=suffix)
-    repos.svn_repos_load_fs2(handle, open(dump_path, 'rb'), StringIO(),
-                             repos.load_uuid_default, None, False, False, None)
+    with open(dump_path, 'rb') as dump_fp:
+      repos.svn_repos_load_fs2(handle, dump_fp, BytesIO(),
+                               repos.load_uuid_default, None, False, False, None)
     return (handle, repo_path, repo_uri)
 
 def file_uri_for_path(path):
   """Return the file: URI corresponding to the given path."""
-  uri_path = urllib.pathname2url(path)
+  if not isinstance(path, str):
+    path = path.decode('UTF-8')
+  uri_path = pathname2url(path).encode('UTF-8')
 
   # pathname2url claims to return the path part of the URI, but on Windows
   # it returns both the authority and path parts for no reason, which
   # means we have to trim the leading slashes to "normalize" the result.
-  return 'file:///' + uri_path.lstrip('/')
+  return b'file:///' + uri_path.lstrip(b'/')
diff --git a/subversion/bindings/swig/python/tests/wc.py b/subversion/bindings/swig/python/tests/wc.py
index 07f7ded..b6806d2 100644
--- a/subversion/bindings/swig/python/tests/wc.py
+++ b/subversion/bindings/swig/python/tests/wc.py
@@ -19,12 +19,7 @@
 #
 #
 from sys import version_info # For Python version check
-if version_info[0] >= 3:
-  # Python >=3.0
-  from io import StringIO
-else:
-  # Python <3.0
-  from cStringIO import StringIO
+from io import BytesIO
 import unittest, os, tempfile, setup_path, binascii
 import svn.diff
 from svn import core, repos, wc, client
@@ -61,10 +56,10 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
       wc.entry(self.path, self.wc, True)
 
   def test_lock(self):
-      readme_path = '%s/trunk/README.txt' % self.path
+      readme_path = b'%s/trunk/README.txt' % self.path
 
       lock = core.svn_lock_create(core.Pool())
-      lock.token = 'http://svnbook.org/nightly/en/svn.advanced.locking.html'
+      lock.token = b'http://svnbook.org/nightly/en/svn.advanced.locking.html'
 
       wc.add_lock(readme_path, lock, self.wc)
       self.assertEqual(True, wc.adm_locked(self.wc))
@@ -78,23 +73,23 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
       self.assertEqual(self.path, wc.adm_access_path(self.wc))
 
   def test_is_adm_dir(self):
-      self.assert_(wc.is_adm_dir(".svn"))
-      self.failIf(wc.is_adm_dir(".foosvn"))
+      self.assertTrue(wc.is_adm_dir(b".svn"))
+      self.assertFalse(wc.is_adm_dir(b".foosvn"))
 
   def test_get_adm_dir(self):
-      self.assert_(isinstance(wc.get_adm_dir(), basestring))
+      self.assertTrue(isinstance(wc.get_adm_dir(), bytes))
 
   def test_set_adm_dir(self):
-      self.assertRaises(SubversionException, wc.set_adm_dir, ".foobar")
-      self.assert_(wc.is_adm_dir(".svn"))
-      self.failIf(wc.is_adm_dir("_svn"))
-      self.failIf(wc.is_adm_dir(".foobar"))
-      wc.set_adm_dir("_svn")
-      self.assert_(wc.is_adm_dir("_svn"))
-      self.assertEqual("_svn", wc.get_adm_dir())
-      wc.set_adm_dir(".svn")
-      self.failIf(wc.is_adm_dir("_svn"))
-      self.assertEqual(".svn", wc.get_adm_dir())
+      self.assertRaises(SubversionException, wc.set_adm_dir, b".foobar")
+      self.assertTrue(wc.is_adm_dir(b".svn"))
+      self.assertFalse(wc.is_adm_dir(b"_svn"))
+      self.assertFalse(wc.is_adm_dir(b".foobar"))
+      wc.set_adm_dir(b"_svn")
+      self.assertTrue(wc.is_adm_dir(b"_svn"))
+      self.assertEqual(b"_svn", wc.get_adm_dir())
+      wc.set_adm_dir(b".svn")
+      self.assertFalse(wc.is_adm_dir(b"_svn"))
+      self.assertEqual(b".svn", wc.get_adm_dir())
 
   def test_init_traversal_info(self):
       wc.init_traversal_info()
@@ -127,8 +122,8 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
               pass
 
       # Remove trunk/README.txt
-      readme_path = '%s/trunk/README.txt' % self.path
-      self.assert_(os.path.exists(readme_path))
+      readme_path = b'%s/trunk/README.txt' % self.path
+      self.assertTrue(os.path.exists(readme_path))
       os.remove(readme_path)
 
       # Restore trunk/README.txt using crawl_revision2
@@ -138,8 +133,8 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
                           True, True, False, notify, info)
 
       # Check that the report finished
-      self.assert_(reporter.finished_report)
-      self.assertEqual([''], set_paths)
+      self.assertTrue(reporter.finished_report)
+      self.assertEqual([b''], set_paths)
       self.assertEqual(1, len(infos))
 
       # Check content of infos object
@@ -152,7 +147,7 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
       wc.create_notify(self.path, wc.notify_add)
 
   def test_check_wc(self):
-      self.assert_(wc.check_wc(self.path) > 0)
+      self.assertTrue(wc.check_wc(self.path) > 0)
 
   def test_get_ancestry(self):
       self.assertEqual([self.repos_uri, 12],
@@ -164,7 +159,6 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
   def test_status_editor(self):
       paths = []
       def status_func(target, status):
-        self.assert_(target.startswith(self.path))
         paths.append(target)
 
       (anchor_access, target_access,
@@ -181,54 +175,79 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
                                               None,  # traversal_info
                                               )
       editor.close_edit(edit_baton)
-      self.assert_(len(paths) > 0)
+      self.assertTrue(len(paths) > 0)
+      for target in paths:
+        self.assertTrue(target.startswith(self.path))
+
+  def test_status_editor_callback_exception(self):
+      """test case for status_editor call back not to be crashed by Python exception"""
+      def status_func(target, status):
+        # Note: exception with in this call back doesn't propagate to
+        # the caller
+        raise AssertionError('intentional exception')
+
+      (anchor_access, target_access,
+       target) = wc.adm_open_anchor(self.path, False, -1, None)
+      (editor, edit_baton, set_locks_baton,
+       edit_revision) = wc.get_status_editor2(anchor_access,
+                                              target,
+                                              None,  # SvnConfig
+                                              True,  # recursive
+                                              True, # get_all
+                                              False, # no_ignore
+                                              status_func,
+                                              None,  # cancel_func
+                                              None,  # traversal_info
+                                              )
+      editor.close_edit(edit_baton)
 
   def test_is_normal_prop(self):
-      self.failIf(wc.is_normal_prop('svn:wc:foo:bar'))
-      self.failIf(wc.is_normal_prop('svn:entry:foo:bar'))
-      self.assert_(wc.is_normal_prop('svn:foo:bar'))
-      self.assert_(wc.is_normal_prop('foreign:foo:bar'))
+      self.assertFalse(wc.is_normal_prop(b'svn:wc:foo:bar'))
+      self.assertFalse(wc.is_normal_prop(b'svn:entry:foo:bar'))
+      self.assertTrue(wc.is_normal_prop(b'svn:foo:bar'))
+      self.assertTrue(wc.is_normal_prop(b'foreign:foo:bar'))
 
   def test_is_wc_prop(self):
-      self.assert_(wc.is_wc_prop('svn:wc:foo:bar'))
-      self.failIf(wc.is_wc_prop('svn:entry:foo:bar'))
-      self.failIf(wc.is_wc_prop('svn:foo:bar'))
-      self.failIf(wc.is_wc_prop('foreign:foo:bar'))
+      self.assertTrue(wc.is_wc_prop(b'svn:wc:foo:bar'))
+      self.assertFalse(wc.is_wc_prop(b'svn:entry:foo:bar'))
+      self.assertFalse(wc.is_wc_prop(b'svn:foo:bar'))
+      self.assertFalse(wc.is_wc_prop(b'foreign:foo:bar'))
 
   def test_is_entry_prop(self):
-      self.assert_(wc.is_entry_prop('svn:entry:foo:bar'))
-      self.failIf(wc.is_entry_prop('svn:wc:foo:bar'))
-      self.failIf(wc.is_entry_prop('svn:foo:bar'))
-      self.failIf(wc.is_entry_prop('foreign:foo:bar'))
+      self.assertTrue(wc.is_entry_prop(b'svn:entry:foo:bar'))
+      self.assertFalse(wc.is_entry_prop(b'svn:wc:foo:bar'))
+      self.assertFalse(wc.is_entry_prop(b'svn:foo:bar'))
+      self.assertFalse(wc.is_entry_prop(b'foreign:foo:bar'))
 
   def test_get_prop_diffs(self):
-      wc.prop_set("foreign:foo", "bla", self.path, self.wc)
-      self.assertEquals([{"foreign:foo": "bla"}, {}],
+      wc.prop_set(b"foreign:foo", b"bla", self.path, self.wc)
+      self.assertEqual([{b"foreign:foo": b"bla"}, {}],
               wc.get_prop_diffs(self.path, self.wc))
 
   def test_get_pristine_copy_path(self):
-      path_to_file = '%s/trunk/README.txt' % self.path
+      path_to_file = b'%s/trunk/README.txt' % self.path
       path_to_text_base = wc.get_pristine_copy_path(path_to_file)
-      text_base = open(path_to_text_base).read()
+      with open(path_to_text_base, 'rb') as fp:
+          text_base = fp.read()
       # TODO: This test should modify the working file first, to ensure the
       # path isn't just the path to the working file.
-      self.assertEqual(text_base, 'A test.\n')
+      self.assertEqual(text_base, b'A test.\n')
 
   def test_entries_read(self):
       entries = wc.entries_read(self.wc, True)
-      keys = list(entries.keys())
+      keys = core._as_list(entries.keys())
       keys.sort()
-      self.assertEqual(['', 'branches', 'tags', 'trunk'], keys)
+      self.assertEqual([b'', b'branches', b'tags', b'trunk'], keys)
 
   def test_get_ignores(self):
-      self.assert_(isinstance(wc.get_ignores(None, self.wc), list))
+      self.assertTrue(isinstance(wc.get_ignores(None, self.wc), list))
 
   def test_commit(self):
     # Replace README.txt's contents, using binary mode so we know the
     # exact contents even on Windows, and therefore the MD5 checksum.
-    readme_path = '%s/trunk/README.txt' % self.path
+    readme_path = b'%s/trunk/README.txt' % self.path
     fp = open(readme_path, 'wb')
-    fp.write('hello\n')
+    fp.write(b'hello\n')
     fp.close()
 
     # Setup ra_ctx.
@@ -240,7 +259,7 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
     commit_info = [None]
     def commit_cb(_commit_info, pool):
       commit_info[0] = _commit_info
-    (editor, edit_baton) = ra.get_commit_editor2(ra_ctx, 'log message',
+    (editor, edit_baton) = ra.get_commit_editor2(ra_ctx, b'log message',
                                                  commit_cb,
                                                  None,
                                                  False)
@@ -254,7 +273,7 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
                                                   False, editor, baton, pool)
       return baton
     try:
-      delta.path_driver(editor, edit_baton, -1, ['trunk/README.txt'],
+      delta.path_driver(editor, edit_baton, -1, [b'trunk/README.txt'],
                         driver_cb)
       editor.close_edit(edit_baton)
     except:
@@ -269,9 +288,9 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
     (commit_info,) = commit_info
 
     # Assert the commit.
-    self.assertEquals(binascii.b2a_hex(checksum),
-                      'b1946ac92492d2347c6235b4d2611184')
-    self.assertEquals(commit_info.revision, 13)
+    self.assertEqual(binascii.b2a_hex(checksum),
+                      b'b1946ac92492d2347c6235b4d2611184')
+    self.assertEqual(commit_info.revision, 13)
 
     # Bump working copy state.
     wc.process_committed4(readme_path,
@@ -282,10 +301,10 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
 
     # Assert bumped state.
     entry = wc.entry(readme_path, self.wc, False)
-    self.assertEquals(entry.revision, commit_info.revision)
-    self.assertEquals(entry.schedule, wc.schedule_normal)
-    self.assertEquals(entry.cmt_rev, commit_info.revision)
-    self.assertEquals(entry.cmt_date,
+    self.assertEqual(entry.revision, commit_info.revision)
+    self.assertEqual(entry.schedule, wc.schedule_normal)
+    self.assertEqual(entry.cmt_rev, commit_info.revision)
+    self.assertEqual(entry.cmt_date,
                       core.svn_time_from_cstring(commit_info.date))
 
   def test_diff_editor4(self):
@@ -294,14 +313,14 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
     url = self.repos_uri
 
     # cause file_changed: Replace README.txt's contents.
-    readme_path = '%s/trunk/README.txt' % self.path
-    fp = open(readme_path, 'w')
-    fp.write('hello\n')
+    readme_path = b'%s/trunk/README.txt' % self.path
+    fp = open(readme_path, 'wb')
+    fp.write(b'hello\n')
     fp.close()
     # cause file_added: Create readme3.
-    readme3_path = '%s/trunk/readme3' % self.path
-    fp = open(readme3_path, 'w')
-    fp.write('hello\n')
+    readme3_path = b'%s/trunk/readme3' % self.path
+    fp = open(readme3_path, 'wb')
+    fp.write(b'hello\n')
     fp.close()
     wc.add2(readme3_path,
             wc.adm_probe_retrieve(self.wc,
@@ -311,7 +330,7 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
             None,                     # notify_func
             pool)
     # cause file_deleted: Delete README2.txt.
-    readme2_path = '%s/trunk/README2.txt' % self.path
+    readme2_path = b'%s/trunk/README2.txt' % self.path
     wc.delete3(readme2_path,
                wc.adm_probe_retrieve(self.wc,
                                      os.path.dirname(readme2_path), pool),
@@ -320,8 +339,8 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
                False,                 # keep_local
                pool)
     # cause dir_props_changed: ps testprop testval dir1/dir2
-    dir2_path = '%s/trunk/dir1/dir2' % self.path
-    wc.prop_set2('testprop', 'testval', dir2_path,
+    dir2_path = b'%s/trunk/dir1/dir2' % self.path
+    wc.prop_set2(b'testprop', b'testval', dir2_path,
                  wc.adm_probe_retrieve(self.wc,
                                        os.path.dirname(dir2_path), pool),
                  False,               # skip_checks
@@ -331,7 +350,7 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
     # Save prop changes.
     got_prop_changes = []
     def props_changed(path, propchanges):
-      for (name, value) in propchanges.items():
+      for (name, value) in core._as_list(propchanges.items()):
         (kind, _) = core.svn_property_kind(name)
         if kind != core.svn_prop_regular_kind:
           continue
@@ -342,16 +361,16 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
     def write_diff(path, left, right):
       options = svn.diff.file_options_create()
       diff = svn.diff.file_diff_2(left, right, options, pool)
-      original_header = modified_header = ''
-      encoding = 'utf8'
+      original_header = modified_header = b''
+      encoding = b'utf8'
       relative_to_dir = None
-      sio = StringIO()
-      svn.diff.file_output_unified3(sio, diff,
+      bio = BytesIO()
+      svn.diff.file_output_unified3(bio, diff,
                                     left, right,
                                     original_header, modified_header,
                                     encoding, relative_to_dir,
                                     options.show_c_function, pool)
-      got_diffs[path[len(self.path) + 1:]] = sio.getvalue().splitlines()
+      got_diffs[path[len(self.path) + 1:]] = bio.getvalue().splitlines()
 
     # Diff callbacks that call props_changed and write_diff.
     contentstate = propstate = state = wc.notify_state_unknown
@@ -383,7 +402,7 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
 
     # Setup wc diff editor.
     (editor, edit_baton) = wc.get_diff_editor4(
-      self.wc, '', diff_callbacks, depth,
+      self.wc, b'', diff_callbacks, depth,
       False,                    # ignore_ancestry
       False,                    # use_text_base
       False,                    # reverse_order
@@ -400,39 +419,39 @@ class SubversionWorkingCopyTestCase(unittest.TestCase):
     (reporter, report_baton) = ra.do_diff3(
       ra_ctx,
       head,                     # versus_url revision
-      '',                       # diff_target
+      b'',                       # diff_target
       depth,
       False,                    # ignore_ancestry
       True,                     # text_deltas
       url,                      # versus_url
       editor, edit_baton, pool)
     # Report wc state (pretty plain).
-    reporter.set_path(report_baton, '', head, depth,
+    reporter.set_path(report_baton, b'', head, depth,
                       False,    # start_empty
                       None,     # lock_token
                       pool)
     reporter.finish_report(report_baton, pool)
 
     # Assert we got the right diff.
-    expected_prop_changes = [('trunk/dir1/dir2',
-                              'testprop', 'testval')]
+    expected_prop_changes = [(b'trunk/dir1/dir2',
+                              b'testprop', b'testval')]
     expected_diffs = {
-      'trunk/readme3':
-        ['--- ',
-         '+++ ',
-         '@@ -0,0 +1 @@',
-         '+hello'],
-      'trunk/README.txt':
-        ['--- ',
-         '+++ ',
-         '@@ -1 +1 @@',
-         '-A test.',
-         '+hello'],
-      'trunk/README2.txt':
-        ['--- ',
-         '+++ ',
-         '@@ -1 +0,0 @@',
-         '-A test.'],
+      b'trunk/readme3':
+        [b'--- ',
+         b'+++ ',
+         b'@@ -0,0 +1 @@',
+         b'+hello'],
+      b'trunk/README.txt':
+        [b'--- ',
+         b'+++ ',
+         b'@@ -1 +1 @@',
+         b'-A test.',
+         b'+hello'],
+      b'trunk/README2.txt':
+        [b'--- ',
+         b'+++ ',
+         b'@@ -1 +0,0 @@',
+         b'-A test.'],
       }
     self.assertEqual(got_prop_changes, expected_prop_changes)
     self.assertEqual(got_diffs, expected_diffs)
diff --git a/subversion/bindings/swig/python/wc.py b/subversion/bindings/swig/python/wc.py
index e489805..eb93fdd 100644
--- a/subversion/bindings/swig/python/wc.py
+++ b/subversion/bindings/swig/python/wc.py
@@ -39,6 +39,11 @@ else:
 del _swig_python_version_info
 
 try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
@@ -54,7 +59,7 @@ def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
     if method:
         return method(self, value)
     if (not static):
-        self.__dict__[name] = value
+        object.__setattr__(self, name, value)
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
 
@@ -80,14 +85,26 @@ def _swig_repr(self):
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self, name, value):
+        if (name == "thisown"):
+            return self.this.own(value)
+        if hasattr(self, name) or (name == "this"):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
+
 def _copy_metadata_deep(value, old_value):
   """Copy all attributes of old_value into value, recursively traversing
   lists and dicts if needed."""
   if value is None or old_value is None or value is old_value: return
 
   if isinstance(value, dict):
-    for k, v in value.iteritems():
-      _copy_metadata_deep(v, old_value[k])
+    for k in value:
+      _copy_metadata_deep(value[k], old_value[k])
   elif isinstance(value, list):
     for v, old_v in zip(value, old_value):
       _copy_metadata_deep(v, old_v)
@@ -100,20 +117,40 @@ def _copy_metadata_deep(value, old_value):
 def _assert_valid_deep(value):
   """Assert value's validity, recursively traversing lists and dicts."""
   if isinstance(value, dict):
-    for v in value.itervalues():
-      _assert_valid_deep(v)
+    for k in value:
+      _assert_valid_deep(value[k])
   elif isinstance(value, list):
     for v in value:
       _assert_valid_deep(v)
-  else:
-    if hasattr(value, "assert_valid"):
-      value.assert_valid()
+# Ensure that the passed in value isn't a type, which could have an
+# assert_valid attribute, but it can not be called without an instance.
+  elif type(value) != type:
+    try:
+      fn = value.assert_valid
+    except AttributeError:
+      pass
+    else:
+      fn()
+
+
+
+  # SWIG classes generated with -modern do not define this variable
+try:
+  _newclass
+except NameError:
+  _newclass = 1
+else:
+  raise RuntimeError("Require -modern option, but _newclass is defined")
+
+_get_instance_attr = object.__getattribute__
+_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
 
 import libsvn.core
 import libsvn.delta
 import libsvn.ra
 
-def svn_wc_version():
+def svn_wc_version() -> "svn_version_t const *":
     """svn_wc_version() -> svn_version_t const *"""
     return _wc.svn_wc_version()
 SVN_WC_TRANSLATE_FROM_NF = _wc.SVN_WC_TRANSLATE_FROM_NF
@@ -123,130 +160,123 @@ SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP = _wc.SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP
 SVN_WC_TRANSLATE_FORCE_COPY = _wc.SVN_WC_TRANSLATE_FORCE_COPY
 SVN_WC_TRANSLATE_USE_GLOBAL_TMP = _wc.SVN_WC_TRANSLATE_USE_GLOBAL_TMP
 
-def svn_wc_context_create(*args):
+def svn_wc_context_create(*args) -> "SWIGTYPE **":
     """svn_wc_context_create(svn_config_t const * config, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_context_create(*args)
 
-def svn_wc_context_destroy(wc_ctx):
+def svn_wc_context_destroy(wc_ctx: 'svn_wc_context_t *') -> "svn_error_t *":
     """svn_wc_context_destroy(svn_wc_context_t * wc_ctx) -> svn_error_t"""
     return _wc.svn_wc_context_destroy(wc_ctx)
 
-def svn_wc_adm_open3(*args):
+def svn_wc_adm_open3(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_open3(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, int levels_to_lock, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_open3(*args)
 
-def svn_wc_adm_open2(*args):
+def svn_wc_adm_open2(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_open2(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, int levels_to_lock, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_open2(*args)
 
-def svn_wc_adm_open(*args):
+def svn_wc_adm_open(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_open(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, svn_boolean_t tree_lock, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_open(*args)
 
-def svn_wc_adm_probe_open3(*args):
+def svn_wc_adm_probe_open3(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_probe_open3(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, int levels_to_lock, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_probe_open3(*args)
 
-def svn_wc_adm_probe_open2(*args):
+def svn_wc_adm_probe_open2(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_probe_open2(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, int levels_to_lock, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_probe_open2(*args)
 
-def svn_wc_adm_probe_open(*args):
+def svn_wc_adm_probe_open(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_probe_open(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, svn_boolean_t tree_lock, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_probe_open(*args)
 
-def svn_wc_adm_open_anchor(*args):
+def svn_wc_adm_open_anchor(*args) -> "svn_wc_adm_access_t **, svn_wc_adm_access_t **, char const **":
     """svn_wc_adm_open_anchor(char const * path, svn_boolean_t write_lock, int levels_to_lock, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_open_anchor(*args)
 
-def svn_wc_adm_retrieve(*args):
+def svn_wc_adm_retrieve(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_retrieve(svn_wc_adm_access_t * associated, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_retrieve(*args)
 
-def svn_wc_adm_probe_retrieve(*args):
+def svn_wc_adm_probe_retrieve(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_probe_retrieve(svn_wc_adm_access_t * associated, char const * path, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_probe_retrieve(*args)
 
-def svn_wc_adm_probe_try3(*args):
+def svn_wc_adm_probe_try3(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_probe_try3(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, int levels_to_lock, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_probe_try3(*args)
 
-def svn_wc_adm_probe_try2(*args):
+def svn_wc_adm_probe_try2(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_probe_try2(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, int levels_to_lock, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_probe_try2(*args)
 
-def svn_wc_adm_probe_try(*args):
+def svn_wc_adm_probe_try(*args) -> "svn_wc_adm_access_t **":
     """svn_wc_adm_probe_try(svn_wc_adm_access_t * associated, char const * path, svn_boolean_t write_lock, svn_boolean_t tree_lock, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_adm_probe_try(*args)
 
-def svn_wc_adm_close2(*args):
+def svn_wc_adm_close2(*args) -> "svn_error_t *":
     """svn_wc_adm_close2(svn_wc_adm_access_t * adm_access, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_adm_close2(*args)
 
-def svn_wc_adm_close(adm_access):
+def svn_wc_adm_close(adm_access: 'svn_wc_adm_access_t *') -> "svn_error_t *":
     """svn_wc_adm_close(svn_wc_adm_access_t * adm_access) -> svn_error_t"""
     return _wc.svn_wc_adm_close(adm_access)
 
-def svn_wc_adm_access_path(adm_access):
+def svn_wc_adm_access_path(adm_access: 'svn_wc_adm_access_t const *') -> "char const *":
     """svn_wc_adm_access_path(svn_wc_adm_access_t const * adm_access) -> char const *"""
     return _wc.svn_wc_adm_access_path(adm_access)
 
-def svn_wc_adm_access_pool(adm_access):
+def svn_wc_adm_access_pool(adm_access: 'svn_wc_adm_access_t const *') -> "apr_pool_t *":
     """svn_wc_adm_access_pool(svn_wc_adm_access_t const * adm_access) -> apr_pool_t"""
     return _wc.svn_wc_adm_access_pool(adm_access)
 
-def svn_wc_adm_locked(adm_access):
+def svn_wc_adm_locked(adm_access: 'svn_wc_adm_access_t const *') -> "svn_boolean_t":
     """svn_wc_adm_locked(svn_wc_adm_access_t const * adm_access) -> svn_boolean_t"""
     return _wc.svn_wc_adm_locked(adm_access)
 
-def svn_wc_locked2(*args):
+def svn_wc_locked2(*args) -> "svn_boolean_t *, svn_boolean_t *":
     """svn_wc_locked2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_locked2(*args)
 
-def svn_wc_locked(*args):
+def svn_wc_locked(*args) -> "svn_boolean_t *":
     """svn_wc_locked(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_locked(*args)
 SVN_WC_ADM_DIR_NAME = _wc.SVN_WC_ADM_DIR_NAME
 
-def svn_wc_is_adm_dir(*args):
+def svn_wc_is_adm_dir(*args) -> "svn_boolean_t":
     """svn_wc_is_adm_dir(char const * name, apr_pool_t pool) -> svn_boolean_t"""
     return _wc.svn_wc_is_adm_dir(*args)
 
-def svn_wc_get_adm_dir(*args):
+def svn_wc_get_adm_dir(*args) -> "char const *":
     """svn_wc_get_adm_dir(apr_pool_t pool) -> char const *"""
     return _wc.svn_wc_get_adm_dir(*args)
 
-def svn_wc_set_adm_dir(*args):
+def svn_wc_set_adm_dir(*args) -> "svn_error_t *":
     """svn_wc_set_adm_dir(char const * name, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_set_adm_dir(*args)
 
-def svn_wc_init_traversal_info(*args):
+def svn_wc_init_traversal_info(*args) -> "svn_wc_traversal_info_t *":
     """svn_wc_init_traversal_info(apr_pool_t pool) -> svn_wc_traversal_info_t *"""
     return _wc.svn_wc_init_traversal_info(*args)
 
-def svn_wc_edited_externals(traversal_info):
+def svn_wc_edited_externals(traversal_info: 'svn_wc_traversal_info_t *') -> "apr_hash_t **, apr_hash_t **":
     """svn_wc_edited_externals(svn_wc_traversal_info_t * traversal_info)"""
     return _wc.svn_wc_edited_externals(traversal_info)
 
-def svn_wc_traversed_depths(traversal_info):
+def svn_wc_traversed_depths(traversal_info: 'svn_wc_traversal_info_t *') -> "apr_hash_t **":
     """svn_wc_traversed_depths(svn_wc_traversal_info_t * traversal_info)"""
     return _wc.svn_wc_traversed_depths(traversal_info)
-class svn_wc_external_item2_t:
+class svn_wc_external_item2_t(object):
     """Proxy of C svn_wc_external_item2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_external_item2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_external_item2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["target_dir"] = _wc.svn_wc_external_item2_t_target_dir_set
-    __swig_getmethods__["target_dir"] = _wc.svn_wc_external_item2_t_target_dir_get
-    __swig_setmethods__["url"] = _wc.svn_wc_external_item2_t_url_set
-    __swig_getmethods__["url"] = _wc.svn_wc_external_item2_t_url_get
-    __swig_setmethods__["revision"] = _wc.svn_wc_external_item2_t_revision_set
-    __swig_getmethods__["revision"] = _wc.svn_wc_external_item2_t_revision_get
-    __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
+    target_dir = _swig_property(_wc.svn_wc_external_item2_t_target_dir_get, _wc.svn_wc_external_item2_t_target_dir_set)
+    url = _swig_property(_wc.svn_wc_external_item2_t_url_get, _wc.svn_wc_external_item2_t_url_set)
+    revision = _swig_property(_wc.svn_wc_external_item2_t_revision_get, _wc.svn_wc_external_item2_t_revision_set)
+    peg_revision = _swig_property(_wc.svn_wc_external_item2_t_peg_revision_get, _wc.svn_wc_external_item2_t_peg_revision_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -261,23 +291,57 @@ class svn_wc_external_item2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -287,7 +351,7 @@ class svn_wc_external_item2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -303,31 +367,25 @@ svn_wc_external_item2_t_swigregister = _wc.svn_wc_external_item2_t_swigregister
 svn_wc_external_item2_t_swigregister(svn_wc_external_item2_t)
 
 
-def svn_wc_external_item2_create(*args):
+def svn_wc_external_item2_create(*args) -> "svn_wc_external_item2_t **":
     """svn_wc_external_item2_create(apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_external_item2_create(*args)
 
-def svn_wc_external_item_create(*args):
+def svn_wc_external_item_create(*args) -> "svn_wc_external_item2_t **":
     """svn_wc_external_item_create(apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_external_item_create(*args)
 
-def svn_wc_external_item2_dup(*args):
+def svn_wc_external_item2_dup(*args) -> "svn_wc_external_item2_t *":
     """svn_wc_external_item2_dup(svn_wc_external_item2_t item, apr_pool_t pool) -> svn_wc_external_item2_t"""
     return _wc.svn_wc_external_item2_dup(*args)
-class svn_wc_external_item_t:
+class svn_wc_external_item_t(object):
     """Proxy of C svn_wc_external_item_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_external_item_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_external_item_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["target_dir"] = _wc.svn_wc_external_item_t_target_dir_set
-    __swig_getmethods__["target_dir"] = _wc.svn_wc_external_item_t_target_dir_get
-    __swig_setmethods__["url"] = _wc.svn_wc_external_item_t_url_set
-    __swig_getmethods__["url"] = _wc.svn_wc_external_item_t_url_get
-    __swig_setmethods__["revision"] = _wc.svn_wc_external_item_t_revision_set
-    __swig_getmethods__["revision"] = _wc.svn_wc_external_item_t_revision_get
+    target_dir = _swig_property(_wc.svn_wc_external_item_t_target_dir_get, _wc.svn_wc_external_item_t_target_dir_set)
+    url = _swig_property(_wc.svn_wc_external_item_t_url_get, _wc.svn_wc_external_item_t_url_set)
+    revision = _swig_property(_wc.svn_wc_external_item_t_revision_get, _wc.svn_wc_external_item_t_revision_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -342,23 +400,57 @@ class svn_wc_external_item_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -368,7 +460,7 @@ class svn_wc_external_item_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -384,19 +476,19 @@ svn_wc_external_item_t_swigregister = _wc.svn_wc_external_item_t_swigregister
 svn_wc_external_item_t_swigregister(svn_wc_external_item_t)
 
 
-def svn_wc_external_item_dup(*args):
+def svn_wc_external_item_dup(*args) -> "svn_wc_external_item_t *":
     """svn_wc_external_item_dup(svn_wc_external_item_t item, apr_pool_t pool) -> svn_wc_external_item_t"""
     return _wc.svn_wc_external_item_dup(*args)
 
-def svn_wc_parse_externals_description3(*args):
+def svn_wc_parse_externals_description3(*args) -> "apr_array_header_t **":
     """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)
 
-def svn_wc_parse_externals_description2(*args):
+def svn_wc_parse_externals_description2(*args) -> "apr_array_header_t **":
     """svn_wc_parse_externals_description2(char const * parent_directory, char const * desc, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_parse_externals_description2(*args)
 
-def svn_wc_parse_externals_description(*args):
+def svn_wc_parse_externals_description(*args) -> "apr_hash_t **":
     """svn_wc_parse_externals_description(char const * parent_directory, char const * desc, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_parse_externals_description(*args)
 svn_wc_notify_add = _wc.svn_wc_notify_add
@@ -499,60 +591,34 @@ svn_wc_notify_lock_state_unknown = _wc.svn_wc_notify_lock_state_unknown
 svn_wc_notify_lock_state_unchanged = _wc.svn_wc_notify_lock_state_unchanged
 svn_wc_notify_lock_state_locked = _wc.svn_wc_notify_lock_state_locked
 svn_wc_notify_lock_state_unlocked = _wc.svn_wc_notify_lock_state_unlocked
-class svn_wc_notify_t:
+class svn_wc_notify_t(object):
     """Proxy of C svn_wc_notify_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_notify_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_notify_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _wc.svn_wc_notify_t_path_set
-    __swig_getmethods__["path"] = _wc.svn_wc_notify_t_path_get
-    __swig_setmethods__["action"] = _wc.svn_wc_notify_t_action_set
-    __swig_getmethods__["action"] = _wc.svn_wc_notify_t_action_get
-    __swig_setmethods__["kind"] = _wc.svn_wc_notify_t_kind_set
-    __swig_getmethods__["kind"] = _wc.svn_wc_notify_t_kind_get
-    __swig_setmethods__["mime_type"] = _wc.svn_wc_notify_t_mime_type_set
-    __swig_getmethods__["mime_type"] = _wc.svn_wc_notify_t_mime_type_get
-    __swig_setmethods__["lock"] = _wc.svn_wc_notify_t_lock_set
-    __swig_getmethods__["lock"] = _wc.svn_wc_notify_t_lock_get
-    __swig_setmethods__["err"] = _wc.svn_wc_notify_t_err_set
-    __swig_getmethods__["err"] = _wc.svn_wc_notify_t_err_get
-    __swig_setmethods__["content_state"] = _wc.svn_wc_notify_t_content_state_set
-    __swig_getmethods__["content_state"] = _wc.svn_wc_notify_t_content_state_get
-    __swig_setmethods__["prop_state"] = _wc.svn_wc_notify_t_prop_state_set
-    __swig_getmethods__["prop_state"] = _wc.svn_wc_notify_t_prop_state_get
-    __swig_setmethods__["lock_state"] = _wc.svn_wc_notify_t_lock_state_set
-    __swig_getmethods__["lock_state"] = _wc.svn_wc_notify_t_lock_state_get
-    __swig_setmethods__["revision"] = _wc.svn_wc_notify_t_revision_set
-    __swig_getmethods__["revision"] = _wc.svn_wc_notify_t_revision_get
-    __swig_setmethods__["changelist_name"] = _wc.svn_wc_notify_t_changelist_name_set
-    __swig_getmethods__["changelist_name"] = _wc.svn_wc_notify_t_changelist_name_get
-    __swig_setmethods__["merge_range"] = _wc.svn_wc_notify_t_merge_range_set
-    __swig_getmethods__["merge_range"] = _wc.svn_wc_notify_t_merge_range_get
-    __swig_setmethods__["url"] = _wc.svn_wc_notify_t_url_set
-    __swig_getmethods__["url"] = _wc.svn_wc_notify_t_url_get
-    __swig_setmethods__["path_prefix"] = _wc.svn_wc_notify_t_path_prefix_set
-    __swig_getmethods__["path_prefix"] = _wc.svn_wc_notify_t_path_prefix_get
-    __swig_setmethods__["prop_name"] = _wc.svn_wc_notify_t_prop_name_set
-    __swig_getmethods__["prop_name"] = _wc.svn_wc_notify_t_prop_name_get
-    __swig_setmethods__["rev_props"] = _wc.svn_wc_notify_t_rev_props_set
-    __swig_getmethods__["rev_props"] = _wc.svn_wc_notify_t_rev_props_get
-    __swig_setmethods__["old_revision"] = _wc.svn_wc_notify_t_old_revision_set
-    __swig_getmethods__["old_revision"] = _wc.svn_wc_notify_t_old_revision_get
-    __swig_setmethods__["hunk_original_start"] = _wc.svn_wc_notify_t_hunk_original_start_set
-    __swig_getmethods__["hunk_original_start"] = _wc.svn_wc_notify_t_hunk_original_start_get
-    __swig_setmethods__["hunk_original_length"] = _wc.svn_wc_notify_t_hunk_original_length_set
-    __swig_getmethods__["hunk_original_length"] = _wc.svn_wc_notify_t_hunk_original_length_get
-    __swig_setmethods__["hunk_modified_start"] = _wc.svn_wc_notify_t_hunk_modified_start_set
-    __swig_getmethods__["hunk_modified_start"] = _wc.svn_wc_notify_t_hunk_modified_start_get
-    __swig_setmethods__["hunk_modified_length"] = _wc.svn_wc_notify_t_hunk_modified_length_set
-    __swig_getmethods__["hunk_modified_length"] = _wc.svn_wc_notify_t_hunk_modified_length_get
-    __swig_setmethods__["hunk_matched_line"] = _wc.svn_wc_notify_t_hunk_matched_line_set
-    __swig_getmethods__["hunk_matched_line"] = _wc.svn_wc_notify_t_hunk_matched_line_get
-    __swig_setmethods__["hunk_fuzz"] = _wc.svn_wc_notify_t_hunk_fuzz_set
-    __swig_getmethods__["hunk_fuzz"] = _wc.svn_wc_notify_t_hunk_fuzz_get
+    path = _swig_property(_wc.svn_wc_notify_t_path_get, _wc.svn_wc_notify_t_path_set)
+    action = _swig_property(_wc.svn_wc_notify_t_action_get, _wc.svn_wc_notify_t_action_set)
+    kind = _swig_property(_wc.svn_wc_notify_t_kind_get, _wc.svn_wc_notify_t_kind_set)
+    mime_type = _swig_property(_wc.svn_wc_notify_t_mime_type_get, _wc.svn_wc_notify_t_mime_type_set)
+    lock = _swig_property(_wc.svn_wc_notify_t_lock_get, _wc.svn_wc_notify_t_lock_set)
+    err = _swig_property(_wc.svn_wc_notify_t_err_get, _wc.svn_wc_notify_t_err_set)
+    content_state = _swig_property(_wc.svn_wc_notify_t_content_state_get, _wc.svn_wc_notify_t_content_state_set)
+    prop_state = _swig_property(_wc.svn_wc_notify_t_prop_state_get, _wc.svn_wc_notify_t_prop_state_set)
+    lock_state = _swig_property(_wc.svn_wc_notify_t_lock_state_get, _wc.svn_wc_notify_t_lock_state_set)
+    revision = _swig_property(_wc.svn_wc_notify_t_revision_get, _wc.svn_wc_notify_t_revision_set)
+    changelist_name = _swig_property(_wc.svn_wc_notify_t_changelist_name_get, _wc.svn_wc_notify_t_changelist_name_set)
+    merge_range = _swig_property(_wc.svn_wc_notify_t_merge_range_get, _wc.svn_wc_notify_t_merge_range_set)
+    url = _swig_property(_wc.svn_wc_notify_t_url_get, _wc.svn_wc_notify_t_url_set)
+    path_prefix = _swig_property(_wc.svn_wc_notify_t_path_prefix_get, _wc.svn_wc_notify_t_path_prefix_set)
+    prop_name = _swig_property(_wc.svn_wc_notify_t_prop_name_get, _wc.svn_wc_notify_t_prop_name_set)
+    rev_props = _swig_property(_wc.svn_wc_notify_t_rev_props_get, _wc.svn_wc_notify_t_rev_props_set)
+    old_revision = _swig_property(_wc.svn_wc_notify_t_old_revision_get, _wc.svn_wc_notify_t_old_revision_set)
+    hunk_original_start = _swig_property(_wc.svn_wc_notify_t_hunk_original_start_get, _wc.svn_wc_notify_t_hunk_original_start_set)
+    hunk_original_length = _swig_property(_wc.svn_wc_notify_t_hunk_original_length_get, _wc.svn_wc_notify_t_hunk_original_length_set)
+    hunk_modified_start = _swig_property(_wc.svn_wc_notify_t_hunk_modified_start_get, _wc.svn_wc_notify_t_hunk_modified_start_set)
+    hunk_modified_length = _swig_property(_wc.svn_wc_notify_t_hunk_modified_length_get, _wc.svn_wc_notify_t_hunk_modified_length_set)
+    hunk_matched_line = _swig_property(_wc.svn_wc_notify_t_hunk_matched_line_get, _wc.svn_wc_notify_t_hunk_matched_line_set)
+    hunk_fuzz = _swig_property(_wc.svn_wc_notify_t_hunk_fuzz_get, _wc.svn_wc_notify_t_hunk_fuzz_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -567,23 +633,57 @@ class svn_wc_notify_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -593,7 +693,7 @@ class svn_wc_notify_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -609,15 +709,15 @@ svn_wc_notify_t_swigregister = _wc.svn_wc_notify_t_swigregister
 svn_wc_notify_t_swigregister(svn_wc_notify_t)
 
 
-def svn_wc_create_notify(*args):
+def svn_wc_create_notify(*args) -> "svn_wc_notify_t *":
     """svn_wc_create_notify(char const * path, svn_wc_notify_action_t action, apr_pool_t pool) -> svn_wc_notify_t"""
     return _wc.svn_wc_create_notify(*args)
 
-def svn_wc_create_notify_url(*args):
+def svn_wc_create_notify_url(*args) -> "svn_wc_notify_t *":
     """svn_wc_create_notify_url(char const * url, svn_wc_notify_action_t action, apr_pool_t pool) -> svn_wc_notify_t"""
     return _wc.svn_wc_create_notify_url(*args)
 
-def svn_wc_dup_notify(*args):
+def svn_wc_dup_notify(*args) -> "svn_wc_notify_t *":
     """svn_wc_dup_notify(svn_wc_notify_t notify, apr_pool_t pool) -> svn_wc_notify_t"""
     return _wc.svn_wc_dup_notify(*args)
 svn_wc_conflict_action_edit = _wc.svn_wc_conflict_action_edit
@@ -640,24 +740,16 @@ svn_wc_operation_none = _wc.svn_wc_operation_none
 svn_wc_operation_update = _wc.svn_wc_operation_update
 svn_wc_operation_switch = _wc.svn_wc_operation_switch
 svn_wc_operation_merge = _wc.svn_wc_operation_merge
-class svn_wc_conflict_version_t:
+class svn_wc_conflict_version_t(object):
     """Proxy of C svn_wc_conflict_version_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_conflict_version_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_conflict_version_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["repos_url"] = _wc.svn_wc_conflict_version_t_repos_url_set
-    __swig_getmethods__["repos_url"] = _wc.svn_wc_conflict_version_t_repos_url_get
-    __swig_setmethods__["peg_rev"] = _wc.svn_wc_conflict_version_t_peg_rev_set
-    __swig_getmethods__["peg_rev"] = _wc.svn_wc_conflict_version_t_peg_rev_get
-    __swig_setmethods__["path_in_repos"] = _wc.svn_wc_conflict_version_t_path_in_repos_set
-    __swig_getmethods__["path_in_repos"] = _wc.svn_wc_conflict_version_t_path_in_repos_get
-    __swig_setmethods__["node_kind"] = _wc.svn_wc_conflict_version_t_node_kind_set
-    __swig_getmethods__["node_kind"] = _wc.svn_wc_conflict_version_t_node_kind_get
-    __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
+    repos_url = _swig_property(_wc.svn_wc_conflict_version_t_repos_url_get, _wc.svn_wc_conflict_version_t_repos_url_set)
+    peg_rev = _swig_property(_wc.svn_wc_conflict_version_t_peg_rev_get, _wc.svn_wc_conflict_version_t_peg_rev_set)
+    path_in_repos = _swig_property(_wc.svn_wc_conflict_version_t_path_in_repos_get, _wc.svn_wc_conflict_version_t_path_in_repos_set)
+    node_kind = _swig_property(_wc.svn_wc_conflict_version_t_node_kind_get, _wc.svn_wc_conflict_version_t_node_kind_set)
+    repos_uuid = _swig_property(_wc.svn_wc_conflict_version_t_repos_uuid_get, _wc.svn_wc_conflict_version_t_repos_uuid_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -672,23 +764,57 @@ class svn_wc_conflict_version_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -698,7 +824,7 @@ class svn_wc_conflict_version_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -714,57 +840,38 @@ svn_wc_conflict_version_t_swigregister = _wc.svn_wc_conflict_version_t_swigregis
 svn_wc_conflict_version_t_swigregister(svn_wc_conflict_version_t)
 
 
-def svn_wc_conflict_version_create2(*args):
+def svn_wc_conflict_version_create2(*args) -> "svn_wc_conflict_version_t *":
     """svn_wc_conflict_version_create2(char const * repos_root_url, char const * repos_uuid, char const * repos_relpath, svn_revnum_t revision, svn_node_kind_t kind, apr_pool_t result_pool) -> svn_wc_conflict_version_t"""
     return _wc.svn_wc_conflict_version_create2(*args)
 
-def svn_wc_conflict_version_create(*args):
+def svn_wc_conflict_version_create(*args) -> "svn_wc_conflict_version_t *":
     """svn_wc_conflict_version_create(char const * repos_url, char const * path_in_repos, svn_revnum_t peg_rev, svn_node_kind_t node_kind, apr_pool_t pool) -> svn_wc_conflict_version_t"""
     return _wc.svn_wc_conflict_version_create(*args)
 
-def svn_wc_conflict_version_dup(*args):
+def svn_wc_conflict_version_dup(*args) -> "svn_wc_conflict_version_t *":
     """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_description_t:
+class svn_wc_conflict_description_t(object):
     """Proxy of C svn_wc_conflict_description_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_conflict_description_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_conflict_description_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["path"] = _wc.svn_wc_conflict_description_t_path_set
-    __swig_getmethods__["path"] = _wc.svn_wc_conflict_description_t_path_get
-    __swig_setmethods__["node_kind"] = _wc.svn_wc_conflict_description_t_node_kind_set
-    __swig_getmethods__["node_kind"] = _wc.svn_wc_conflict_description_t_node_kind_get
-    __swig_setmethods__["kind"] = _wc.svn_wc_conflict_description_t_kind_set
-    __swig_getmethods__["kind"] = _wc.svn_wc_conflict_description_t_kind_get
-    __swig_setmethods__["property_name"] = _wc.svn_wc_conflict_description_t_property_name_set
-    __swig_getmethods__["property_name"] = _wc.svn_wc_conflict_description_t_property_name_get
-    __swig_setmethods__["is_binary"] = _wc.svn_wc_conflict_description_t_is_binary_set
-    __swig_getmethods__["is_binary"] = _wc.svn_wc_conflict_description_t_is_binary_get
-    __swig_setmethods__["mime_type"] = _wc.svn_wc_conflict_description_t_mime_type_set
-    __swig_getmethods__["mime_type"] = _wc.svn_wc_conflict_description_t_mime_type_get
-    __swig_setmethods__["access"] = _wc.svn_wc_conflict_description_t_access_set
-    __swig_getmethods__["access"] = _wc.svn_wc_conflict_description_t_access_get
-    __swig_setmethods__["action"] = _wc.svn_wc_conflict_description_t_action_set
-    __swig_getmethods__["action"] = _wc.svn_wc_conflict_description_t_action_get
-    __swig_setmethods__["reason"] = _wc.svn_wc_conflict_description_t_reason_set
-    __swig_getmethods__["reason"] = _wc.svn_wc_conflict_description_t_reason_get
-    __swig_setmethods__["base_file"] = _wc.svn_wc_conflict_description_t_base_file_set
-    __swig_getmethods__["base_file"] = _wc.svn_wc_conflict_description_t_base_file_get
-    __swig_setmethods__["their_file"] = _wc.svn_wc_conflict_description_t_their_file_set
-    __swig_getmethods__["their_file"] = _wc.svn_wc_conflict_description_t_their_file_get
-    __swig_setmethods__["my_file"] = _wc.svn_wc_conflict_description_t_my_file_set
-    __swig_getmethods__["my_file"] = _wc.svn_wc_conflict_description_t_my_file_get
-    __swig_setmethods__["merged_file"] = _wc.svn_wc_conflict_description_t_merged_file_set
-    __swig_getmethods__["merged_file"] = _wc.svn_wc_conflict_description_t_merged_file_get
-    __swig_setmethods__["operation"] = _wc.svn_wc_conflict_description_t_operation_set
-    __swig_getmethods__["operation"] = _wc.svn_wc_conflict_description_t_operation_get
-    __swig_setmethods__["src_left_version"] = _wc.svn_wc_conflict_description_t_src_left_version_set
-    __swig_getmethods__["src_left_version"] = _wc.svn_wc_conflict_description_t_src_left_version_get
-    __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
+    path = _swig_property(_wc.svn_wc_conflict_description_t_path_get, _wc.svn_wc_conflict_description_t_path_set)
+    node_kind = _swig_property(_wc.svn_wc_conflict_description_t_node_kind_get, _wc.svn_wc_conflict_description_t_node_kind_set)
+    kind = _swig_property(_wc.svn_wc_conflict_description_t_kind_get, _wc.svn_wc_conflict_description_t_kind_set)
+    property_name = _swig_property(_wc.svn_wc_conflict_description_t_property_name_get, _wc.svn_wc_conflict_description_t_property_name_set)
+    is_binary = _swig_property(_wc.svn_wc_conflict_description_t_is_binary_get, _wc.svn_wc_conflict_description_t_is_binary_set)
+    mime_type = _swig_property(_wc.svn_wc_conflict_description_t_mime_type_get, _wc.svn_wc_conflict_description_t_mime_type_set)
+    access = _swig_property(_wc.svn_wc_conflict_description_t_access_get, _wc.svn_wc_conflict_description_t_access_set)
+    action = _swig_property(_wc.svn_wc_conflict_description_t_action_get, _wc.svn_wc_conflict_description_t_action_set)
+    reason = _swig_property(_wc.svn_wc_conflict_description_t_reason_get, _wc.svn_wc_conflict_description_t_reason_set)
+    base_file = _swig_property(_wc.svn_wc_conflict_description_t_base_file_get, _wc.svn_wc_conflict_description_t_base_file_set)
+    their_file = _swig_property(_wc.svn_wc_conflict_description_t_their_file_get, _wc.svn_wc_conflict_description_t_their_file_set)
+    my_file = _swig_property(_wc.svn_wc_conflict_description_t_my_file_get, _wc.svn_wc_conflict_description_t_my_file_set)
+    merged_file = _swig_property(_wc.svn_wc_conflict_description_t_merged_file_get, _wc.svn_wc_conflict_description_t_merged_file_set)
+    operation = _swig_property(_wc.svn_wc_conflict_description_t_operation_get, _wc.svn_wc_conflict_description_t_operation_set)
+    src_left_version = _swig_property(_wc.svn_wc_conflict_description_t_src_left_version_get, _wc.svn_wc_conflict_description_t_src_left_version_set)
+    src_right_version = _swig_property(_wc.svn_wc_conflict_description_t_src_right_version_get, _wc.svn_wc_conflict_description_t_src_right_version_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -779,23 +886,57 @@ class svn_wc_conflict_description_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -805,7 +946,7 @@ class svn_wc_conflict_description_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -821,35 +962,35 @@ svn_wc_conflict_description_t_swigregister = _wc.svn_wc_conflict_description_t_s
 svn_wc_conflict_description_t_swigregister(svn_wc_conflict_description_t)
 
 
-def svn_wc_conflict_description_create_text2(*args):
+def svn_wc_conflict_description_create_text2(*args) -> "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):
+def svn_wc_conflict_description_create_text(*args) -> "svn_wc_conflict_description_t *":
     """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"""
     return _wc.svn_wc_conflict_description_create_text(*args)
 
-def svn_wc_conflict_description_create_prop2(*args):
+def svn_wc_conflict_description_create_prop2(*args) -> "svn_wc_conflict_description2_t *":
     """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 *"""
     return _wc.svn_wc_conflict_description_create_prop2(*args)
 
-def svn_wc_conflict_description_create_prop(*args):
+def svn_wc_conflict_description_create_prop(*args) -> "svn_wc_conflict_description_t *":
     """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, apr_pool_t pool) -> svn_wc_conflict_description_t"""
     return _wc.svn_wc_conflict_description_create_prop(*args)
 
-def svn_wc_conflict_description_create_tree2(*args):
+def svn_wc_conflict_description_create_tree2(*args) -> "svn_wc_conflict_description2_t *":
     """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 *"""
     return _wc.svn_wc_conflict_description_create_tree2(*args)
 
-def svn_wc_conflict_description_create_tree(*args):
+def svn_wc_conflict_description_create_tree(*args) -> "svn_wc_conflict_description_t *":
     """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, svn_wc_conflict_version_t src_left_version, svn_wc_conflict_version_t src_right_version, apr_pool_t pool) -> svn_wc_conflict_description_t"""
     return _wc.svn_wc_conflict_description_create_tree(*args)
 
-def svn_wc_conflict_description2_dup(*args):
+def svn_wc_conflict_description2_dup(*args) -> "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)
 
-def svn_wc__conflict_description2_dup(*args):
+def svn_wc__conflict_description2_dup(*args) -> "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
@@ -862,35 +1003,23 @@ 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
 
-def svn_wc_create_conflict_result(*args):
+def svn_wc_create_conflict_result(*args) -> "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:
+class svn_wc_diff_callbacks4_t(object):
     """Proxy of C svn_wc_diff_callbacks4_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_diff_callbacks4_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_diff_callbacks4_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["file_opened"] = _wc.svn_wc_diff_callbacks4_t_file_opened_set
-    __swig_getmethods__["file_opened"] = _wc.svn_wc_diff_callbacks4_t_file_opened_get
-    __swig_setmethods__["file_changed"] = _wc.svn_wc_diff_callbacks4_t_file_changed_set
-    __swig_getmethods__["file_changed"] = _wc.svn_wc_diff_callbacks4_t_file_changed_get
-    __swig_setmethods__["file_added"] = _wc.svn_wc_diff_callbacks4_t_file_added_set
-    __swig_getmethods__["file_added"] = _wc.svn_wc_diff_callbacks4_t_file_added_get
-    __swig_setmethods__["file_deleted"] = _wc.svn_wc_diff_callbacks4_t_file_deleted_set
-    __swig_getmethods__["file_deleted"] = _wc.svn_wc_diff_callbacks4_t_file_deleted_get
-    __swig_setmethods__["dir_deleted"] = _wc.svn_wc_diff_callbacks4_t_dir_deleted_set
-    __swig_getmethods__["dir_deleted"] = _wc.svn_wc_diff_callbacks4_t_dir_deleted_get
-    __swig_setmethods__["dir_opened"] = _wc.svn_wc_diff_callbacks4_t_dir_opened_set
-    __swig_getmethods__["dir_opened"] = _wc.svn_wc_diff_callbacks4_t_dir_opened_get
-    __swig_setmethods__["dir_added"] = _wc.svn_wc_diff_callbacks4_t_dir_added_set
-    __swig_getmethods__["dir_added"] = _wc.svn_wc_diff_callbacks4_t_dir_added_get
-    __swig_setmethods__["dir_props_changed"] = _wc.svn_wc_diff_callbacks4_t_dir_props_changed_set
-    __swig_getmethods__["dir_props_changed"] = _wc.svn_wc_diff_callbacks4_t_dir_props_changed_get
-    __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
+    file_opened = _swig_property(_wc.svn_wc_diff_callbacks4_t_file_opened_get, _wc.svn_wc_diff_callbacks4_t_file_opened_set)
+    file_changed = _swig_property(_wc.svn_wc_diff_callbacks4_t_file_changed_get, _wc.svn_wc_diff_callbacks4_t_file_changed_set)
+    file_added = _swig_property(_wc.svn_wc_diff_callbacks4_t_file_added_get, _wc.svn_wc_diff_callbacks4_t_file_added_set)
+    file_deleted = _swig_property(_wc.svn_wc_diff_callbacks4_t_file_deleted_get, _wc.svn_wc_diff_callbacks4_t_file_deleted_set)
+    dir_deleted = _swig_property(_wc.svn_wc_diff_callbacks4_t_dir_deleted_get, _wc.svn_wc_diff_callbacks4_t_dir_deleted_set)
+    dir_opened = _swig_property(_wc.svn_wc_diff_callbacks4_t_dir_opened_get, _wc.svn_wc_diff_callbacks4_t_dir_opened_set)
+    dir_added = _swig_property(_wc.svn_wc_diff_callbacks4_t_dir_added_get, _wc.svn_wc_diff_callbacks4_t_dir_added_set)
+    dir_props_changed = _swig_property(_wc.svn_wc_diff_callbacks4_t_dir_props_changed_get, _wc.svn_wc_diff_callbacks4_t_dir_props_changed_set)
+    dir_closed = _swig_property(_wc.svn_wc_diff_callbacks4_t_dir_closed_get, _wc.svn_wc_diff_callbacks4_t_dir_closed_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -905,23 +1034,57 @@ class svn_wc_diff_callbacks4_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -931,7 +1094,7 @@ class svn_wc_diff_callbacks4_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def file_opened(self, *args):
@@ -982,30 +1145,19 @@ class svn_wc_diff_callbacks4_t:
 svn_wc_diff_callbacks4_t_swigregister = _wc.svn_wc_diff_callbacks4_t_swigregister
 svn_wc_diff_callbacks4_t_swigregister(svn_wc_diff_callbacks4_t)
 
-class svn_wc_diff_callbacks3_t:
+class svn_wc_diff_callbacks3_t(object):
     """Proxy of C svn_wc_diff_callbacks3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_diff_callbacks3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_diff_callbacks3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["file_changed"] = _wc.svn_wc_diff_callbacks3_t_file_changed_set
-    __swig_getmethods__["file_changed"] = _wc.svn_wc_diff_callbacks3_t_file_changed_get
-    __swig_setmethods__["file_added"] = _wc.svn_wc_diff_callbacks3_t_file_added_set
-    __swig_getmethods__["file_added"] = _wc.svn_wc_diff_callbacks3_t_file_added_get
-    __swig_setmethods__["file_deleted"] = _wc.svn_wc_diff_callbacks3_t_file_deleted_set
-    __swig_getmethods__["file_deleted"] = _wc.svn_wc_diff_callbacks3_t_file_deleted_get
-    __swig_setmethods__["dir_added"] = _wc.svn_wc_diff_callbacks3_t_dir_added_set
-    __swig_getmethods__["dir_added"] = _wc.svn_wc_diff_callbacks3_t_dir_added_get
-    __swig_setmethods__["dir_deleted"] = _wc.svn_wc_diff_callbacks3_t_dir_deleted_set
-    __swig_getmethods__["dir_deleted"] = _wc.svn_wc_diff_callbacks3_t_dir_deleted_get
-    __swig_setmethods__["dir_props_changed"] = _wc.svn_wc_diff_callbacks3_t_dir_props_changed_set
-    __swig_getmethods__["dir_props_changed"] = _wc.svn_wc_diff_callbacks3_t_dir_props_changed_get
-    __swig_setmethods__["dir_opened"] = _wc.svn_wc_diff_callbacks3_t_dir_opened_set
-    __swig_getmethods__["dir_opened"] = _wc.svn_wc_diff_callbacks3_t_dir_opened_get
-    __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
+    file_changed = _swig_property(_wc.svn_wc_diff_callbacks3_t_file_changed_get, _wc.svn_wc_diff_callbacks3_t_file_changed_set)
+    file_added = _swig_property(_wc.svn_wc_diff_callbacks3_t_file_added_get, _wc.svn_wc_diff_callbacks3_t_file_added_set)
+    file_deleted = _swig_property(_wc.svn_wc_diff_callbacks3_t_file_deleted_get, _wc.svn_wc_diff_callbacks3_t_file_deleted_set)
+    dir_added = _swig_property(_wc.svn_wc_diff_callbacks3_t_dir_added_get, _wc.svn_wc_diff_callbacks3_t_dir_added_set)
+    dir_deleted = _swig_property(_wc.svn_wc_diff_callbacks3_t_dir_deleted_get, _wc.svn_wc_diff_callbacks3_t_dir_deleted_set)
+    dir_props_changed = _swig_property(_wc.svn_wc_diff_callbacks3_t_dir_props_changed_get, _wc.svn_wc_diff_callbacks3_t_dir_props_changed_set)
+    dir_opened = _swig_property(_wc.svn_wc_diff_callbacks3_t_dir_opened_get, _wc.svn_wc_diff_callbacks3_t_dir_opened_set)
+    dir_closed = _swig_property(_wc.svn_wc_diff_callbacks3_t_dir_closed_get, _wc.svn_wc_diff_callbacks3_t_dir_closed_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1020,23 +1172,57 @@ class svn_wc_diff_callbacks3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1046,7 +1232,7 @@ class svn_wc_diff_callbacks3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def file_changed(self, *args):
@@ -1093,26 +1279,17 @@ class svn_wc_diff_callbacks3_t:
 svn_wc_diff_callbacks3_t_swigregister = _wc.svn_wc_diff_callbacks3_t_swigregister
 svn_wc_diff_callbacks3_t_swigregister(svn_wc_diff_callbacks3_t)
 
-class svn_wc_diff_callbacks2_t:
+class svn_wc_diff_callbacks2_t(object):
     """Proxy of C svn_wc_diff_callbacks2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_diff_callbacks2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_diff_callbacks2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["file_changed"] = _wc.svn_wc_diff_callbacks2_t_file_changed_set
-    __swig_getmethods__["file_changed"] = _wc.svn_wc_diff_callbacks2_t_file_changed_get
-    __swig_setmethods__["file_added"] = _wc.svn_wc_diff_callbacks2_t_file_added_set
-    __swig_getmethods__["file_added"] = _wc.svn_wc_diff_callbacks2_t_file_added_get
-    __swig_setmethods__["file_deleted"] = _wc.svn_wc_diff_callbacks2_t_file_deleted_set
-    __swig_getmethods__["file_deleted"] = _wc.svn_wc_diff_callbacks2_t_file_deleted_get
-    __swig_setmethods__["dir_added"] = _wc.svn_wc_diff_callbacks2_t_dir_added_set
-    __swig_getmethods__["dir_added"] = _wc.svn_wc_diff_callbacks2_t_dir_added_get
-    __swig_setmethods__["dir_deleted"] = _wc.svn_wc_diff_callbacks2_t_dir_deleted_set
-    __swig_getmethods__["dir_deleted"] = _wc.svn_wc_diff_callbacks2_t_dir_deleted_get
-    __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
+    file_changed = _swig_property(_wc.svn_wc_diff_callbacks2_t_file_changed_get, _wc.svn_wc_diff_callbacks2_t_file_changed_set)
+    file_added = _swig_property(_wc.svn_wc_diff_callbacks2_t_file_added_get, _wc.svn_wc_diff_callbacks2_t_file_added_set)
+    file_deleted = _swig_property(_wc.svn_wc_diff_callbacks2_t_file_deleted_get, _wc.svn_wc_diff_callbacks2_t_file_deleted_set)
+    dir_added = _swig_property(_wc.svn_wc_diff_callbacks2_t_dir_added_get, _wc.svn_wc_diff_callbacks2_t_dir_added_set)
+    dir_deleted = _swig_property(_wc.svn_wc_diff_callbacks2_t_dir_deleted_get, _wc.svn_wc_diff_callbacks2_t_dir_deleted_set)
+    dir_props_changed = _swig_property(_wc.svn_wc_diff_callbacks2_t_dir_props_changed_get, _wc.svn_wc_diff_callbacks2_t_dir_props_changed_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1127,23 +1304,57 @@ class svn_wc_diff_callbacks2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1153,7 +1364,7 @@ class svn_wc_diff_callbacks2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def file_changed(self, *args):
@@ -1192,26 +1403,17 @@ class svn_wc_diff_callbacks2_t:
 svn_wc_diff_callbacks2_t_swigregister = _wc.svn_wc_diff_callbacks2_t_swigregister
 svn_wc_diff_callbacks2_t_swigregister(svn_wc_diff_callbacks2_t)
 
-class svn_wc_diff_callbacks_t:
+class svn_wc_diff_callbacks_t(object):
     """Proxy of C svn_wc_diff_callbacks_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_diff_callbacks_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_diff_callbacks_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["file_changed"] = _wc.svn_wc_diff_callbacks_t_file_changed_set
-    __swig_getmethods__["file_changed"] = _wc.svn_wc_diff_callbacks_t_file_changed_get
-    __swig_setmethods__["file_added"] = _wc.svn_wc_diff_callbacks_t_file_added_set
-    __swig_getmethods__["file_added"] = _wc.svn_wc_diff_callbacks_t_file_added_get
-    __swig_setmethods__["file_deleted"] = _wc.svn_wc_diff_callbacks_t_file_deleted_set
-    __swig_getmethods__["file_deleted"] = _wc.svn_wc_diff_callbacks_t_file_deleted_get
-    __swig_setmethods__["dir_added"] = _wc.svn_wc_diff_callbacks_t_dir_added_set
-    __swig_getmethods__["dir_added"] = _wc.svn_wc_diff_callbacks_t_dir_added_get
-    __swig_setmethods__["dir_deleted"] = _wc.svn_wc_diff_callbacks_t_dir_deleted_set
-    __swig_getmethods__["dir_deleted"] = _wc.svn_wc_diff_callbacks_t_dir_deleted_get
-    __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
+    file_changed = _swig_property(_wc.svn_wc_diff_callbacks_t_file_changed_get, _wc.svn_wc_diff_callbacks_t_file_changed_set)
+    file_added = _swig_property(_wc.svn_wc_diff_callbacks_t_file_added_get, _wc.svn_wc_diff_callbacks_t_file_added_set)
+    file_deleted = _swig_property(_wc.svn_wc_diff_callbacks_t_file_deleted_get, _wc.svn_wc_diff_callbacks_t_file_deleted_set)
+    dir_added = _swig_property(_wc.svn_wc_diff_callbacks_t_dir_added_get, _wc.svn_wc_diff_callbacks_t_dir_added_set)
+    dir_deleted = _swig_property(_wc.svn_wc_diff_callbacks_t_dir_deleted_get, _wc.svn_wc_diff_callbacks_t_dir_deleted_set)
+    props_changed = _swig_property(_wc.svn_wc_diff_callbacks_t_props_changed_get, _wc.svn_wc_diff_callbacks_t_props_changed_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1226,23 +1428,57 @@ class svn_wc_diff_callbacks_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1252,7 +1488,7 @@ class svn_wc_diff_callbacks_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def file_changed(self, *args):
@@ -1292,31 +1528,31 @@ svn_wc_diff_callbacks_t_swigregister = _wc.svn_wc_diff_callbacks_t_swigregister
 svn_wc_diff_callbacks_t_swigregister(svn_wc_diff_callbacks_t)
 
 
-def svn_wc_check_wc2(*args):
+def svn_wc_check_wc2(*args) -> "int *":
     """svn_wc_check_wc2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_check_wc2(*args)
 
-def svn_wc_check_wc(*args):
+def svn_wc_check_wc(*args) -> "int *":
     """svn_wc_check_wc(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_check_wc(*args)
 
-def svn_wc_has_binary_prop(*args):
+def svn_wc_has_binary_prop(*args) -> "svn_boolean_t *":
     """svn_wc_has_binary_prop(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_has_binary_prop(*args)
 
-def svn_wc_text_modified_p2(*args):
+def svn_wc_text_modified_p2(*args) -> "svn_boolean_t *":
     """svn_wc_text_modified_p2(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t unused, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_text_modified_p2(*args)
 
-def svn_wc_text_modified_p(*args):
+def svn_wc_text_modified_p(*args) -> "svn_boolean_t *":
     """svn_wc_text_modified_p(char const * filename, svn_boolean_t force_comparison, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_text_modified_p(*args)
 
-def svn_wc_props_modified_p2(*args):
+def svn_wc_props_modified_p2(*args) -> "svn_boolean_t *":
     """svn_wc_props_modified_p2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_props_modified_p2(*args)
 
-def svn_wc_props_modified_p(*args):
+def svn_wc_props_modified_p(*args) -> "svn_boolean_t *":
     """svn_wc_props_modified_p(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_props_modified_p(*args)
 svn_wc_schedule_normal = _wc.svn_wc_schedule_normal
@@ -1324,92 +1560,50 @@ svn_wc_schedule_add = _wc.svn_wc_schedule_add
 svn_wc_schedule_delete = _wc.svn_wc_schedule_delete
 svn_wc_schedule_replace = _wc.svn_wc_schedule_replace
 SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN = _wc.SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN
-class svn_wc_entry_t:
+class svn_wc_entry_t(object):
     """Proxy of C svn_wc_entry_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_entry_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_entry_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["name"] = _wc.svn_wc_entry_t_name_set
-    __swig_getmethods__["name"] = _wc.svn_wc_entry_t_name_get
-    __swig_setmethods__["revision"] = _wc.svn_wc_entry_t_revision_set
-    __swig_getmethods__["revision"] = _wc.svn_wc_entry_t_revision_get
-    __swig_setmethods__["url"] = _wc.svn_wc_entry_t_url_set
-    __swig_getmethods__["url"] = _wc.svn_wc_entry_t_url_get
-    __swig_setmethods__["repos"] = _wc.svn_wc_entry_t_repos_set
-    __swig_getmethods__["repos"] = _wc.svn_wc_entry_t_repos_get
-    __swig_setmethods__["uuid"] = _wc.svn_wc_entry_t_uuid_set
-    __swig_getmethods__["uuid"] = _wc.svn_wc_entry_t_uuid_get
-    __swig_setmethods__["kind"] = _wc.svn_wc_entry_t_kind_set
-    __swig_getmethods__["kind"] = _wc.svn_wc_entry_t_kind_get
-    __swig_setmethods__["schedule"] = _wc.svn_wc_entry_t_schedule_set
-    __swig_getmethods__["schedule"] = _wc.svn_wc_entry_t_schedule_get
-    __swig_setmethods__["copied"] = _wc.svn_wc_entry_t_copied_set
-    __swig_getmethods__["copied"] = _wc.svn_wc_entry_t_copied_get
-    __swig_setmethods__["deleted"] = _wc.svn_wc_entry_t_deleted_set
-    __swig_getmethods__["deleted"] = _wc.svn_wc_entry_t_deleted_get
-    __swig_setmethods__["absent"] = _wc.svn_wc_entry_t_absent_set
-    __swig_getmethods__["absent"] = _wc.svn_wc_entry_t_absent_get
-    __swig_setmethods__["incomplete"] = _wc.svn_wc_entry_t_incomplete_set
-    __swig_getmethods__["incomplete"] = _wc.svn_wc_entry_t_incomplete_get
-    __swig_setmethods__["copyfrom_url"] = _wc.svn_wc_entry_t_copyfrom_url_set
-    __swig_getmethods__["copyfrom_url"] = _wc.svn_wc_entry_t_copyfrom_url_get
-    __swig_setmethods__["copyfrom_rev"] = _wc.svn_wc_entry_t_copyfrom_rev_set
-    __swig_getmethods__["copyfrom_rev"] = _wc.svn_wc_entry_t_copyfrom_rev_get
-    __swig_setmethods__["conflict_old"] = _wc.svn_wc_entry_t_conflict_old_set
-    __swig_getmethods__["conflict_old"] = _wc.svn_wc_entry_t_conflict_old_get
-    __swig_setmethods__["conflict_new"] = _wc.svn_wc_entry_t_conflict_new_set
-    __swig_getmethods__["conflict_new"] = _wc.svn_wc_entry_t_conflict_new_get
-    __swig_setmethods__["conflict_wrk"] = _wc.svn_wc_entry_t_conflict_wrk_set
-    __swig_getmethods__["conflict_wrk"] = _wc.svn_wc_entry_t_conflict_wrk_get
-    __swig_setmethods__["prejfile"] = _wc.svn_wc_entry_t_prejfile_set
-    __swig_getmethods__["prejfile"] = _wc.svn_wc_entry_t_prejfile_get
-    __swig_setmethods__["text_time"] = _wc.svn_wc_entry_t_text_time_set
-    __swig_getmethods__["text_time"] = _wc.svn_wc_entry_t_text_time_get
-    __swig_setmethods__["prop_time"] = _wc.svn_wc_entry_t_prop_time_set
-    __swig_getmethods__["prop_time"] = _wc.svn_wc_entry_t_prop_time_get
-    __swig_setmethods__["checksum"] = _wc.svn_wc_entry_t_checksum_set
-    __swig_getmethods__["checksum"] = _wc.svn_wc_entry_t_checksum_get
-    __swig_setmethods__["cmt_rev"] = _wc.svn_wc_entry_t_cmt_rev_set
-    __swig_getmethods__["cmt_rev"] = _wc.svn_wc_entry_t_cmt_rev_get
-    __swig_setmethods__["cmt_date"] = _wc.svn_wc_entry_t_cmt_date_set
-    __swig_getmethods__["cmt_date"] = _wc.svn_wc_entry_t_cmt_date_get
-    __swig_setmethods__["cmt_author"] = _wc.svn_wc_entry_t_cmt_author_set
-    __swig_getmethods__["cmt_author"] = _wc.svn_wc_entry_t_cmt_author_get
-    __swig_setmethods__["lock_token"] = _wc.svn_wc_entry_t_lock_token_set
-    __swig_getmethods__["lock_token"] = _wc.svn_wc_entry_t_lock_token_get
-    __swig_setmethods__["lock_owner"] = _wc.svn_wc_entry_t_lock_owner_set
-    __swig_getmethods__["lock_owner"] = _wc.svn_wc_entry_t_lock_owner_get
-    __swig_setmethods__["lock_comment"] = _wc.svn_wc_entry_t_lock_comment_set
-    __swig_getmethods__["lock_comment"] = _wc.svn_wc_entry_t_lock_comment_get
-    __swig_setmethods__["lock_creation_date"] = _wc.svn_wc_entry_t_lock_creation_date_set
-    __swig_getmethods__["lock_creation_date"] = _wc.svn_wc_entry_t_lock_creation_date_get
-    __swig_setmethods__["has_props"] = _wc.svn_wc_entry_t_has_props_set
-    __swig_getmethods__["has_props"] = _wc.svn_wc_entry_t_has_props_get
-    __swig_setmethods__["has_prop_mods"] = _wc.svn_wc_entry_t_has_prop_mods_set
-    __swig_getmethods__["has_prop_mods"] = _wc.svn_wc_entry_t_has_prop_mods_get
-    __swig_setmethods__["cachable_props"] = _wc.svn_wc_entry_t_cachable_props_set
-    __swig_getmethods__["cachable_props"] = _wc.svn_wc_entry_t_cachable_props_get
-    __swig_setmethods__["present_props"] = _wc.svn_wc_entry_t_present_props_set
-    __swig_getmethods__["present_props"] = _wc.svn_wc_entry_t_present_props_get
-    __swig_setmethods__["changelist"] = _wc.svn_wc_entry_t_changelist_set
-    __swig_getmethods__["changelist"] = _wc.svn_wc_entry_t_changelist_get
-    __swig_setmethods__["working_size"] = _wc.svn_wc_entry_t_working_size_set
-    __swig_getmethods__["working_size"] = _wc.svn_wc_entry_t_working_size_get
-    __swig_setmethods__["keep_local"] = _wc.svn_wc_entry_t_keep_local_set
-    __swig_getmethods__["keep_local"] = _wc.svn_wc_entry_t_keep_local_get
-    __swig_setmethods__["depth"] = _wc.svn_wc_entry_t_depth_set
-    __swig_getmethods__["depth"] = _wc.svn_wc_entry_t_depth_get
-    __swig_setmethods__["tree_conflict_data"] = _wc.svn_wc_entry_t_tree_conflict_data_set
-    __swig_getmethods__["tree_conflict_data"] = _wc.svn_wc_entry_t_tree_conflict_data_get
-    __swig_setmethods__["file_external_path"] = _wc.svn_wc_entry_t_file_external_path_set
-    __swig_getmethods__["file_external_path"] = _wc.svn_wc_entry_t_file_external_path_get
-    __swig_setmethods__["file_external_peg_rev"] = _wc.svn_wc_entry_t_file_external_peg_rev_set
-    __swig_getmethods__["file_external_peg_rev"] = _wc.svn_wc_entry_t_file_external_peg_rev_get
-    __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
+    name = _swig_property(_wc.svn_wc_entry_t_name_get, _wc.svn_wc_entry_t_name_set)
+    revision = _swig_property(_wc.svn_wc_entry_t_revision_get, _wc.svn_wc_entry_t_revision_set)
+    url = _swig_property(_wc.svn_wc_entry_t_url_get, _wc.svn_wc_entry_t_url_set)
+    repos = _swig_property(_wc.svn_wc_entry_t_repos_get, _wc.svn_wc_entry_t_repos_set)
+    uuid = _swig_property(_wc.svn_wc_entry_t_uuid_get, _wc.svn_wc_entry_t_uuid_set)
+    kind = _swig_property(_wc.svn_wc_entry_t_kind_get, _wc.svn_wc_entry_t_kind_set)
+    schedule = _swig_property(_wc.svn_wc_entry_t_schedule_get, _wc.svn_wc_entry_t_schedule_set)
+    copied = _swig_property(_wc.svn_wc_entry_t_copied_get, _wc.svn_wc_entry_t_copied_set)
+    deleted = _swig_property(_wc.svn_wc_entry_t_deleted_get, _wc.svn_wc_entry_t_deleted_set)
+    absent = _swig_property(_wc.svn_wc_entry_t_absent_get, _wc.svn_wc_entry_t_absent_set)
+    incomplete = _swig_property(_wc.svn_wc_entry_t_incomplete_get, _wc.svn_wc_entry_t_incomplete_set)
+    copyfrom_url = _swig_property(_wc.svn_wc_entry_t_copyfrom_url_get, _wc.svn_wc_entry_t_copyfrom_url_set)
+    copyfrom_rev = _swig_property(_wc.svn_wc_entry_t_copyfrom_rev_get, _wc.svn_wc_entry_t_copyfrom_rev_set)
+    conflict_old = _swig_property(_wc.svn_wc_entry_t_conflict_old_get, _wc.svn_wc_entry_t_conflict_old_set)
+    conflict_new = _swig_property(_wc.svn_wc_entry_t_conflict_new_get, _wc.svn_wc_entry_t_conflict_new_set)
+    conflict_wrk = _swig_property(_wc.svn_wc_entry_t_conflict_wrk_get, _wc.svn_wc_entry_t_conflict_wrk_set)
+    prejfile = _swig_property(_wc.svn_wc_entry_t_prejfile_get, _wc.svn_wc_entry_t_prejfile_set)
+    text_time = _swig_property(_wc.svn_wc_entry_t_text_time_get, _wc.svn_wc_entry_t_text_time_set)
+    prop_time = _swig_property(_wc.svn_wc_entry_t_prop_time_get, _wc.svn_wc_entry_t_prop_time_set)
+    checksum = _swig_property(_wc.svn_wc_entry_t_checksum_get, _wc.svn_wc_entry_t_checksum_set)
+    cmt_rev = _swig_property(_wc.svn_wc_entry_t_cmt_rev_get, _wc.svn_wc_entry_t_cmt_rev_set)
+    cmt_date = _swig_property(_wc.svn_wc_entry_t_cmt_date_get, _wc.svn_wc_entry_t_cmt_date_set)
+    cmt_author = _swig_property(_wc.svn_wc_entry_t_cmt_author_get, _wc.svn_wc_entry_t_cmt_author_set)
+    lock_token = _swig_property(_wc.svn_wc_entry_t_lock_token_get, _wc.svn_wc_entry_t_lock_token_set)
+    lock_owner = _swig_property(_wc.svn_wc_entry_t_lock_owner_get, _wc.svn_wc_entry_t_lock_owner_set)
+    lock_comment = _swig_property(_wc.svn_wc_entry_t_lock_comment_get, _wc.svn_wc_entry_t_lock_comment_set)
+    lock_creation_date = _swig_property(_wc.svn_wc_entry_t_lock_creation_date_get, _wc.svn_wc_entry_t_lock_creation_date_set)
+    has_props = _swig_property(_wc.svn_wc_entry_t_has_props_get, _wc.svn_wc_entry_t_has_props_set)
+    has_prop_mods = _swig_property(_wc.svn_wc_entry_t_has_prop_mods_get, _wc.svn_wc_entry_t_has_prop_mods_set)
+    cachable_props = _swig_property(_wc.svn_wc_entry_t_cachable_props_get, _wc.svn_wc_entry_t_cachable_props_set)
+    present_props = _swig_property(_wc.svn_wc_entry_t_present_props_get, _wc.svn_wc_entry_t_present_props_set)
+    changelist = _swig_property(_wc.svn_wc_entry_t_changelist_get, _wc.svn_wc_entry_t_changelist_set)
+    working_size = _swig_property(_wc.svn_wc_entry_t_working_size_get, _wc.svn_wc_entry_t_working_size_set)
+    keep_local = _swig_property(_wc.svn_wc_entry_t_keep_local_get, _wc.svn_wc_entry_t_keep_local_set)
+    depth = _swig_property(_wc.svn_wc_entry_t_depth_get, _wc.svn_wc_entry_t_depth_set)
+    tree_conflict_data = _swig_property(_wc.svn_wc_entry_t_tree_conflict_data_get, _wc.svn_wc_entry_t_tree_conflict_data_set)
+    file_external_path = _swig_property(_wc.svn_wc_entry_t_file_external_path_get, _wc.svn_wc_entry_t_file_external_path_set)
+    file_external_peg_rev = _swig_property(_wc.svn_wc_entry_t_file_external_peg_rev_get, _wc.svn_wc_entry_t_file_external_peg_rev_set)
+    file_external_rev = _swig_property(_wc.svn_wc_entry_t_file_external_rev_get, _wc.svn_wc_entry_t_file_external_rev_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1424,23 +1618,57 @@ class svn_wc_entry_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1450,7 +1678,7 @@ class svn_wc_entry_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1467,49 +1695,34 @@ svn_wc_entry_t_swigregister(svn_wc_entry_t)
 
 SVN_WC_ENTRY_THIS_DIR = _wc.SVN_WC_ENTRY_THIS_DIR
 
-def svn_wc_entry(*args):
+def svn_wc_entry(*args) -> "svn_wc_entry_t **":
     """svn_wc_entry(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t show_hidden, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_entry(*args)
 
-def svn_wc_entries_read(*args):
+def svn_wc_entries_read(*args) -> "apr_hash_t **":
     """svn_wc_entries_read(svn_wc_adm_access_t * adm_access, svn_boolean_t show_hidden, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_entries_read(*args)
 
-def svn_wc_entry_dup(*args):
+def svn_wc_entry_dup(*args) -> "svn_wc_entry_t *":
     """svn_wc_entry_dup(svn_wc_entry_t entry, apr_pool_t pool) -> svn_wc_entry_t"""
     return _wc.svn_wc_entry_dup(*args)
-class svn_wc_info_t:
+class svn_wc_info_t(object):
     """Proxy of C svn_wc_info_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_info_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_info_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["schedule"] = _wc.svn_wc_info_t_schedule_set
-    __swig_getmethods__["schedule"] = _wc.svn_wc_info_t_schedule_get
-    __swig_setmethods__["copyfrom_url"] = _wc.svn_wc_info_t_copyfrom_url_set
-    __swig_getmethods__["copyfrom_url"] = _wc.svn_wc_info_t_copyfrom_url_get
-    __swig_setmethods__["copyfrom_rev"] = _wc.svn_wc_info_t_copyfrom_rev_set
-    __swig_getmethods__["copyfrom_rev"] = _wc.svn_wc_info_t_copyfrom_rev_get
-    __swig_setmethods__["checksum"] = _wc.svn_wc_info_t_checksum_set
-    __swig_getmethods__["checksum"] = _wc.svn_wc_info_t_checksum_get
-    __swig_setmethods__["changelist"] = _wc.svn_wc_info_t_changelist_set
-    __swig_getmethods__["changelist"] = _wc.svn_wc_info_t_changelist_get
-    __swig_setmethods__["depth"] = _wc.svn_wc_info_t_depth_set
-    __swig_getmethods__["depth"] = _wc.svn_wc_info_t_depth_get
-    __swig_setmethods__["recorded_size"] = _wc.svn_wc_info_t_recorded_size_set
-    __swig_getmethods__["recorded_size"] = _wc.svn_wc_info_t_recorded_size_get
-    __swig_setmethods__["recorded_time"] = _wc.svn_wc_info_t_recorded_time_set
-    __swig_getmethods__["recorded_time"] = _wc.svn_wc_info_t_recorded_time_get
-    __swig_setmethods__["conflicts"] = _wc.svn_wc_info_t_conflicts_set
-    __swig_getmethods__["conflicts"] = _wc.svn_wc_info_t_conflicts_get
-    __swig_setmethods__["wcroot_abspath"] = _wc.svn_wc_info_t_wcroot_abspath_set
-    __swig_getmethods__["wcroot_abspath"] = _wc.svn_wc_info_t_wcroot_abspath_get
-    __swig_setmethods__["moved_from_abspath"] = _wc.svn_wc_info_t_moved_from_abspath_set
-    __swig_getmethods__["moved_from_abspath"] = _wc.svn_wc_info_t_moved_from_abspath_get
-    __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
+    schedule = _swig_property(_wc.svn_wc_info_t_schedule_get, _wc.svn_wc_info_t_schedule_set)
+    copyfrom_url = _swig_property(_wc.svn_wc_info_t_copyfrom_url_get, _wc.svn_wc_info_t_copyfrom_url_set)
+    copyfrom_rev = _swig_property(_wc.svn_wc_info_t_copyfrom_rev_get, _wc.svn_wc_info_t_copyfrom_rev_set)
+    checksum = _swig_property(_wc.svn_wc_info_t_checksum_get, _wc.svn_wc_info_t_checksum_set)
+    changelist = _swig_property(_wc.svn_wc_info_t_changelist_get, _wc.svn_wc_info_t_changelist_set)
+    depth = _swig_property(_wc.svn_wc_info_t_depth_get, _wc.svn_wc_info_t_depth_set)
+    recorded_size = _swig_property(_wc.svn_wc_info_t_recorded_size_get, _wc.svn_wc_info_t_recorded_size_set)
+    recorded_time = _swig_property(_wc.svn_wc_info_t_recorded_time_get, _wc.svn_wc_info_t_recorded_time_set)
+    conflicts = _swig_property(_wc.svn_wc_info_t_conflicts_get, _wc.svn_wc_info_t_conflicts_set)
+    wcroot_abspath = _swig_property(_wc.svn_wc_info_t_wcroot_abspath_get, _wc.svn_wc_info_t_wcroot_abspath_set)
+    moved_from_abspath = _swig_property(_wc.svn_wc_info_t_moved_from_abspath_get, _wc.svn_wc_info_t_moved_from_abspath_set)
+    moved_to_abspath = _swig_property(_wc.svn_wc_info_t_moved_to_abspath_get, _wc.svn_wc_info_t_moved_to_abspath_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1524,23 +1737,57 @@ class svn_wc_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1550,7 +1797,7 @@ class svn_wc_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1566,37 +1813,32 @@ svn_wc_info_t_swigregister = _wc.svn_wc_info_t_swigregister
 svn_wc_info_t_swigregister(svn_wc_info_t)
 
 
-def svn_wc_info_dup(*args):
+def svn_wc_info_dup(*args) -> "svn_wc_info_t *":
     """svn_wc_info_dup(svn_wc_info_t info, apr_pool_t pool) -> svn_wc_info_t"""
     return _wc.svn_wc_info_dup(*args)
 
-def svn_wc_conflicted_p3(*args):
+def svn_wc_conflicted_p3(*args) -> "svn_boolean_t *, svn_boolean_t *, svn_boolean_t *":
     """svn_wc_conflicted_p3(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_conflicted_p3(*args)
 
-def svn_wc_conflicted_p2(*args):
+def svn_wc_conflicted_p2(*args) -> "svn_boolean_t *, svn_boolean_t *, svn_boolean_t *":
     """svn_wc_conflicted_p2(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_conflicted_p2(*args)
 
-def svn_wc_conflicted_p(*args):
+def svn_wc_conflicted_p(*args) -> "svn_boolean_t *, svn_boolean_t *":
     """svn_wc_conflicted_p(char const * dir_path, svn_wc_entry_t entry, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_conflicted_p(*args)
 
-def svn_wc_get_ancestry(*args):
+def svn_wc_get_ancestry(*args) -> "char **, svn_revnum_t *":
     """svn_wc_get_ancestry(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_ancestry(*args)
-class svn_wc_entry_callbacks2_t:
+class svn_wc_entry_callbacks2_t(object):
     """Proxy of C svn_wc_entry_callbacks2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_entry_callbacks2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_entry_callbacks2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["found_entry"] = _wc.svn_wc_entry_callbacks2_t_found_entry_set
-    __swig_getmethods__["found_entry"] = _wc.svn_wc_entry_callbacks2_t_found_entry_get
-    __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
+    found_entry = _swig_property(_wc.svn_wc_entry_callbacks2_t_found_entry_get, _wc.svn_wc_entry_callbacks2_t_found_entry_set)
+    handle_error = _swig_property(_wc.svn_wc_entry_callbacks2_t_handle_error_get, _wc.svn_wc_entry_callbacks2_t_handle_error_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1611,23 +1853,57 @@ class svn_wc_entry_callbacks2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1637,7 +1913,7 @@ class svn_wc_entry_callbacks2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def found_entry(self, *args):
@@ -1660,16 +1936,12 @@ class svn_wc_entry_callbacks2_t:
 svn_wc_entry_callbacks2_t_swigregister = _wc.svn_wc_entry_callbacks2_t_swigregister
 svn_wc_entry_callbacks2_t_swigregister(svn_wc_entry_callbacks2_t)
 
-class svn_wc_entry_callbacks_t:
+class svn_wc_entry_callbacks_t(object):
     """Proxy of C svn_wc_entry_callbacks_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_entry_callbacks_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_entry_callbacks_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __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
+    found_entry = _swig_property(_wc.svn_wc_entry_callbacks_t_found_entry_get, _wc.svn_wc_entry_callbacks_t_found_entry_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1684,23 +1956,57 @@ class svn_wc_entry_callbacks_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1710,7 +2016,7 @@ class svn_wc_entry_callbacks_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def found_entry(self, *args):
@@ -1730,39 +2036,39 @@ svn_wc_entry_callbacks_t_swigregister = _wc.svn_wc_entry_callbacks_t_swigregiste
 svn_wc_entry_callbacks_t_swigregister(svn_wc_entry_callbacks_t)
 
 
-def svn_wc_walk_entries3(*args):
+def svn_wc_walk_entries3(*args) -> "svn_error_t *":
     """svn_wc_walk_entries3(char const * path, svn_wc_adm_access_t * adm_access, svn_wc_entry_callbacks2_t walk_callbacks, void * walk_baton, svn_depth_t depth, svn_boolean_t show_hidden, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_walk_entries3(*args)
 
-def svn_wc_walk_entries2(*args):
+def svn_wc_walk_entries2(*args) -> "svn_error_t *":
     """svn_wc_walk_entries2(char const * path, svn_wc_adm_access_t * adm_access, svn_wc_entry_callbacks_t walk_callbacks, void * walk_baton, svn_boolean_t show_hidden, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_walk_entries2(*args)
 
-def svn_wc_walk_entries(*args):
+def svn_wc_walk_entries(*args) -> "svn_error_t *":
     """svn_wc_walk_entries(char const * path, svn_wc_adm_access_t * adm_access, svn_wc_entry_callbacks_t walk_callbacks, void * walk_baton, svn_boolean_t show_hidden, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_walk_entries(*args)
 
-def svn_wc_mark_missing_deleted(*args):
+def svn_wc_mark_missing_deleted(*args) -> "svn_error_t *":
     """svn_wc_mark_missing_deleted(char const * path, svn_wc_adm_access_t * parent, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_mark_missing_deleted(*args)
 
-def svn_wc_ensure_adm4(*args):
+def svn_wc_ensure_adm4(*args) -> "svn_error_t *":
     """svn_wc_ensure_adm4(svn_wc_context_t * wc_ctx, char const * local_abspath, char const * url, char const * repos_root_url, char const * repos_uuid, svn_revnum_t revision, svn_depth_t depth, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_ensure_adm4(*args)
 
-def svn_wc_ensure_adm3(*args):
+def svn_wc_ensure_adm3(*args) -> "svn_error_t *":
     """svn_wc_ensure_adm3(char const * path, char const * uuid, char const * url, char const * repos, svn_revnum_t revision, svn_depth_t depth, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_ensure_adm3(*args)
 
-def svn_wc_ensure_adm2(*args):
+def svn_wc_ensure_adm2(*args) -> "svn_error_t *":
     """svn_wc_ensure_adm2(char const * path, char const * uuid, char const * url, char const * repos, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_ensure_adm2(*args)
 
-def svn_wc_ensure_adm(*args):
+def svn_wc_ensure_adm(*args) -> "svn_error_t *":
     """svn_wc_ensure_adm(char const * path, char const * uuid, char const * url, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_ensure_adm(*args)
 
-def svn_wc_maybe_set_repos_root(*args):
+def svn_wc_maybe_set_repos_root(*args) -> "svn_error_t *":
     """svn_wc_maybe_set_repos_root(svn_wc_adm_access_t * adm_access, char const * path, char const * repos, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_maybe_set_repos_root(*args)
 svn_wc_status_none = _wc.svn_wc_status_none
@@ -1779,78 +2085,43 @@ svn_wc_status_ignored = _wc.svn_wc_status_ignored
 svn_wc_status_obstructed = _wc.svn_wc_status_obstructed
 svn_wc_status_external = _wc.svn_wc_status_external
 svn_wc_status_incomplete = _wc.svn_wc_status_incomplete
-class svn_wc_status3_t:
+class svn_wc_status3_t(object):
     """Proxy of C svn_wc_status3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_status3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_status3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["kind"] = _wc.svn_wc_status3_t_kind_set
-    __swig_getmethods__["kind"] = _wc.svn_wc_status3_t_kind_get
-    __swig_setmethods__["depth"] = _wc.svn_wc_status3_t_depth_set
-    __swig_getmethods__["depth"] = _wc.svn_wc_status3_t_depth_get
-    __swig_setmethods__["filesize"] = _wc.svn_wc_status3_t_filesize_set
-    __swig_getmethods__["filesize"] = _wc.svn_wc_status3_t_filesize_get
-    __swig_setmethods__["versioned"] = _wc.svn_wc_status3_t_versioned_set
-    __swig_getmethods__["versioned"] = _wc.svn_wc_status3_t_versioned_get
-    __swig_setmethods__["conflicted"] = _wc.svn_wc_status3_t_conflicted_set
-    __swig_getmethods__["conflicted"] = _wc.svn_wc_status3_t_conflicted_get
-    __swig_setmethods__["node_status"] = _wc.svn_wc_status3_t_node_status_set
-    __swig_getmethods__["node_status"] = _wc.svn_wc_status3_t_node_status_get
-    __swig_setmethods__["text_status"] = _wc.svn_wc_status3_t_text_status_set
-    __swig_getmethods__["text_status"] = _wc.svn_wc_status3_t_text_status_get
-    __swig_setmethods__["prop_status"] = _wc.svn_wc_status3_t_prop_status_set
-    __swig_getmethods__["prop_status"] = _wc.svn_wc_status3_t_prop_status_get
-    __swig_setmethods__["copied"] = _wc.svn_wc_status3_t_copied_set
-    __swig_getmethods__["copied"] = _wc.svn_wc_status3_t_copied_get
-    __swig_setmethods__["revision"] = _wc.svn_wc_status3_t_revision_set
-    __swig_getmethods__["revision"] = _wc.svn_wc_status3_t_revision_get
-    __swig_setmethods__["changed_rev"] = _wc.svn_wc_status3_t_changed_rev_set
-    __swig_getmethods__["changed_rev"] = _wc.svn_wc_status3_t_changed_rev_get
-    __swig_setmethods__["changed_date"] = _wc.svn_wc_status3_t_changed_date_set
-    __swig_getmethods__["changed_date"] = _wc.svn_wc_status3_t_changed_date_get
-    __swig_setmethods__["changed_author"] = _wc.svn_wc_status3_t_changed_author_set
-    __swig_getmethods__["changed_author"] = _wc.svn_wc_status3_t_changed_author_get
-    __swig_setmethods__["repos_root_url"] = _wc.svn_wc_status3_t_repos_root_url_set
-    __swig_getmethods__["repos_root_url"] = _wc.svn_wc_status3_t_repos_root_url_get
-    __swig_setmethods__["repos_uuid"] = _wc.svn_wc_status3_t_repos_uuid_set
-    __swig_getmethods__["repos_uuid"] = _wc.svn_wc_status3_t_repos_uuid_get
-    __swig_setmethods__["repos_relpath"] = _wc.svn_wc_status3_t_repos_relpath_set
-    __swig_getmethods__["repos_relpath"] = _wc.svn_wc_status3_t_repos_relpath_get
-    __swig_setmethods__["switched"] = _wc.svn_wc_status3_t_switched_set
-    __swig_getmethods__["switched"] = _wc.svn_wc_status3_t_switched_get
-    __swig_setmethods__["locked"] = _wc.svn_wc_status3_t_locked_set
-    __swig_getmethods__["locked"] = _wc.svn_wc_status3_t_locked_get
-    __swig_setmethods__["lock"] = _wc.svn_wc_status3_t_lock_set
-    __swig_getmethods__["lock"] = _wc.svn_wc_status3_t_lock_get
-    __swig_setmethods__["changelist"] = _wc.svn_wc_status3_t_changelist_set
-    __swig_getmethods__["changelist"] = _wc.svn_wc_status3_t_changelist_get
-    __swig_setmethods__["ood_kind"] = _wc.svn_wc_status3_t_ood_kind_set
-    __swig_getmethods__["ood_kind"] = _wc.svn_wc_status3_t_ood_kind_get
-    __swig_setmethods__["repos_node_status"] = _wc.svn_wc_status3_t_repos_node_status_set
-    __swig_getmethods__["repos_node_status"] = _wc.svn_wc_status3_t_repos_node_status_get
-    __swig_setmethods__["repos_text_status"] = _wc.svn_wc_status3_t_repos_text_status_set
-    __swig_getmethods__["repos_text_status"] = _wc.svn_wc_status3_t_repos_text_status_get
-    __swig_setmethods__["repos_prop_status"] = _wc.svn_wc_status3_t_repos_prop_status_set
-    __swig_getmethods__["repos_prop_status"] = _wc.svn_wc_status3_t_repos_prop_status_get
-    __swig_setmethods__["repos_lock"] = _wc.svn_wc_status3_t_repos_lock_set
-    __swig_getmethods__["repos_lock"] = _wc.svn_wc_status3_t_repos_lock_get
-    __swig_setmethods__["ood_changed_rev"] = _wc.svn_wc_status3_t_ood_changed_rev_set
-    __swig_getmethods__["ood_changed_rev"] = _wc.svn_wc_status3_t_ood_changed_rev_get
-    __swig_setmethods__["ood_changed_date"] = _wc.svn_wc_status3_t_ood_changed_date_set
-    __swig_getmethods__["ood_changed_date"] = _wc.svn_wc_status3_t_ood_changed_date_get
-    __swig_setmethods__["ood_changed_author"] = _wc.svn_wc_status3_t_ood_changed_author_set
-    __swig_getmethods__["ood_changed_author"] = _wc.svn_wc_status3_t_ood_changed_author_get
-    __swig_setmethods__["moved_from_abspath"] = _wc.svn_wc_status3_t_moved_from_abspath_set
-    __swig_getmethods__["moved_from_abspath"] = _wc.svn_wc_status3_t_moved_from_abspath_get
-    __swig_setmethods__["moved_to_abspath"] = _wc.svn_wc_status3_t_moved_to_abspath_set
-    __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
+    kind = _swig_property(_wc.svn_wc_status3_t_kind_get, _wc.svn_wc_status3_t_kind_set)
+    depth = _swig_property(_wc.svn_wc_status3_t_depth_get, _wc.svn_wc_status3_t_depth_set)
+    filesize = _swig_property(_wc.svn_wc_status3_t_filesize_get, _wc.svn_wc_status3_t_filesize_set)
+    versioned = _swig_property(_wc.svn_wc_status3_t_versioned_get, _wc.svn_wc_status3_t_versioned_set)
+    conflicted = _swig_property(_wc.svn_wc_status3_t_conflicted_get, _wc.svn_wc_status3_t_conflicted_set)
+    node_status = _swig_property(_wc.svn_wc_status3_t_node_status_get, _wc.svn_wc_status3_t_node_status_set)
+    text_status = _swig_property(_wc.svn_wc_status3_t_text_status_get, _wc.svn_wc_status3_t_text_status_set)
+    prop_status = _swig_property(_wc.svn_wc_status3_t_prop_status_get, _wc.svn_wc_status3_t_prop_status_set)
+    copied = _swig_property(_wc.svn_wc_status3_t_copied_get, _wc.svn_wc_status3_t_copied_set)
+    revision = _swig_property(_wc.svn_wc_status3_t_revision_get, _wc.svn_wc_status3_t_revision_set)
+    changed_rev = _swig_property(_wc.svn_wc_status3_t_changed_rev_get, _wc.svn_wc_status3_t_changed_rev_set)
+    changed_date = _swig_property(_wc.svn_wc_status3_t_changed_date_get, _wc.svn_wc_status3_t_changed_date_set)
+    changed_author = _swig_property(_wc.svn_wc_status3_t_changed_author_get, _wc.svn_wc_status3_t_changed_author_set)
+    repos_root_url = _swig_property(_wc.svn_wc_status3_t_repos_root_url_get, _wc.svn_wc_status3_t_repos_root_url_set)
+    repos_uuid = _swig_property(_wc.svn_wc_status3_t_repos_uuid_get, _wc.svn_wc_status3_t_repos_uuid_set)
+    repos_relpath = _swig_property(_wc.svn_wc_status3_t_repos_relpath_get, _wc.svn_wc_status3_t_repos_relpath_set)
+    switched = _swig_property(_wc.svn_wc_status3_t_switched_get, _wc.svn_wc_status3_t_switched_set)
+    locked = _swig_property(_wc.svn_wc_status3_t_locked_get, _wc.svn_wc_status3_t_locked_set)
+    lock = _swig_property(_wc.svn_wc_status3_t_lock_get, _wc.svn_wc_status3_t_lock_set)
+    changelist = _swig_property(_wc.svn_wc_status3_t_changelist_get, _wc.svn_wc_status3_t_changelist_set)
+    ood_kind = _swig_property(_wc.svn_wc_status3_t_ood_kind_get, _wc.svn_wc_status3_t_ood_kind_set)
+    repos_node_status = _swig_property(_wc.svn_wc_status3_t_repos_node_status_get, _wc.svn_wc_status3_t_repos_node_status_set)
+    repos_text_status = _swig_property(_wc.svn_wc_status3_t_repos_text_status_get, _wc.svn_wc_status3_t_repos_text_status_set)
+    repos_prop_status = _swig_property(_wc.svn_wc_status3_t_repos_prop_status_get, _wc.svn_wc_status3_t_repos_prop_status_set)
+    repos_lock = _swig_property(_wc.svn_wc_status3_t_repos_lock_get, _wc.svn_wc_status3_t_repos_lock_set)
+    ood_changed_rev = _swig_property(_wc.svn_wc_status3_t_ood_changed_rev_get, _wc.svn_wc_status3_t_ood_changed_rev_set)
+    ood_changed_date = _swig_property(_wc.svn_wc_status3_t_ood_changed_date_get, _wc.svn_wc_status3_t_ood_changed_date_set)
+    ood_changed_author = _swig_property(_wc.svn_wc_status3_t_ood_changed_author_get, _wc.svn_wc_status3_t_ood_changed_author_set)
+    moved_from_abspath = _swig_property(_wc.svn_wc_status3_t_moved_from_abspath_get, _wc.svn_wc_status3_t_moved_from_abspath_set)
+    moved_to_abspath = _swig_property(_wc.svn_wc_status3_t_moved_to_abspath_get, _wc.svn_wc_status3_t_moved_to_abspath_set)
+    file_external = _swig_property(_wc.svn_wc_status3_t_file_external_get, _wc.svn_wc_status3_t_file_external_set)
+    actual_kind = _swig_property(_wc.svn_wc_status3_t_actual_kind_get, _wc.svn_wc_status3_t_actual_kind_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1865,23 +2136,57 @@ class svn_wc_status3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1891,7 +2196,7 @@ class svn_wc_status3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -1906,50 +2211,29 @@ class svn_wc_status3_t:
 svn_wc_status3_t_swigregister = _wc.svn_wc_status3_t_swigregister
 svn_wc_status3_t_swigregister(svn_wc_status3_t)
 
-class svn_wc_status2_t:
+class svn_wc_status2_t(object):
     """Proxy of C svn_wc_status2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_status2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_status2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["entry"] = _wc.svn_wc_status2_t_entry_set
-    __swig_getmethods__["entry"] = _wc.svn_wc_status2_t_entry_get
-    __swig_setmethods__["text_status"] = _wc.svn_wc_status2_t_text_status_set
-    __swig_getmethods__["text_status"] = _wc.svn_wc_status2_t_text_status_get
-    __swig_setmethods__["prop_status"] = _wc.svn_wc_status2_t_prop_status_set
-    __swig_getmethods__["prop_status"] = _wc.svn_wc_status2_t_prop_status_get
-    __swig_setmethods__["locked"] = _wc.svn_wc_status2_t_locked_set
-    __swig_getmethods__["locked"] = _wc.svn_wc_status2_t_locked_get
-    __swig_setmethods__["copied"] = _wc.svn_wc_status2_t_copied_set
-    __swig_getmethods__["copied"] = _wc.svn_wc_status2_t_copied_get
-    __swig_setmethods__["switched"] = _wc.svn_wc_status2_t_switched_set
-    __swig_getmethods__["switched"] = _wc.svn_wc_status2_t_switched_get
-    __swig_setmethods__["repos_text_status"] = _wc.svn_wc_status2_t_repos_text_status_set
-    __swig_getmethods__["repos_text_status"] = _wc.svn_wc_status2_t_repos_text_status_get
-    __swig_setmethods__["repos_prop_status"] = _wc.svn_wc_status2_t_repos_prop_status_set
-    __swig_getmethods__["repos_prop_status"] = _wc.svn_wc_status2_t_repos_prop_status_get
-    __swig_setmethods__["repos_lock"] = _wc.svn_wc_status2_t_repos_lock_set
-    __swig_getmethods__["repos_lock"] = _wc.svn_wc_status2_t_repos_lock_get
-    __swig_setmethods__["url"] = _wc.svn_wc_status2_t_url_set
-    __swig_getmethods__["url"] = _wc.svn_wc_status2_t_url_get
-    __swig_setmethods__["ood_last_cmt_rev"] = _wc.svn_wc_status2_t_ood_last_cmt_rev_set
-    __swig_getmethods__["ood_last_cmt_rev"] = _wc.svn_wc_status2_t_ood_last_cmt_rev_get
-    __swig_setmethods__["ood_last_cmt_date"] = _wc.svn_wc_status2_t_ood_last_cmt_date_set
-    __swig_getmethods__["ood_last_cmt_date"] = _wc.svn_wc_status2_t_ood_last_cmt_date_get
-    __swig_setmethods__["ood_kind"] = _wc.svn_wc_status2_t_ood_kind_set
-    __swig_getmethods__["ood_kind"] = _wc.svn_wc_status2_t_ood_kind_get
-    __swig_setmethods__["ood_last_cmt_author"] = _wc.svn_wc_status2_t_ood_last_cmt_author_set
-    __swig_getmethods__["ood_last_cmt_author"] = _wc.svn_wc_status2_t_ood_last_cmt_author_get
-    __swig_setmethods__["tree_conflict"] = _wc.svn_wc_status2_t_tree_conflict_set
-    __swig_getmethods__["tree_conflict"] = _wc.svn_wc_status2_t_tree_conflict_get
-    __swig_setmethods__["file_external"] = _wc.svn_wc_status2_t_file_external_set
-    __swig_getmethods__["file_external"] = _wc.svn_wc_status2_t_file_external_get
-    __swig_setmethods__["pristine_text_status"] = _wc.svn_wc_status2_t_pristine_text_status_set
-    __swig_getmethods__["pristine_text_status"] = _wc.svn_wc_status2_t_pristine_text_status_get
-    __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
+    entry = _swig_property(_wc.svn_wc_status2_t_entry_get, _wc.svn_wc_status2_t_entry_set)
+    text_status = _swig_property(_wc.svn_wc_status2_t_text_status_get, _wc.svn_wc_status2_t_text_status_set)
+    prop_status = _swig_property(_wc.svn_wc_status2_t_prop_status_get, _wc.svn_wc_status2_t_prop_status_set)
+    locked = _swig_property(_wc.svn_wc_status2_t_locked_get, _wc.svn_wc_status2_t_locked_set)
+    copied = _swig_property(_wc.svn_wc_status2_t_copied_get, _wc.svn_wc_status2_t_copied_set)
+    switched = _swig_property(_wc.svn_wc_status2_t_switched_get, _wc.svn_wc_status2_t_switched_set)
+    repos_text_status = _swig_property(_wc.svn_wc_status2_t_repos_text_status_get, _wc.svn_wc_status2_t_repos_text_status_set)
+    repos_prop_status = _swig_property(_wc.svn_wc_status2_t_repos_prop_status_get, _wc.svn_wc_status2_t_repos_prop_status_set)
+    repos_lock = _swig_property(_wc.svn_wc_status2_t_repos_lock_get, _wc.svn_wc_status2_t_repos_lock_set)
+    url = _swig_property(_wc.svn_wc_status2_t_url_get, _wc.svn_wc_status2_t_url_set)
+    ood_last_cmt_rev = _swig_property(_wc.svn_wc_status2_t_ood_last_cmt_rev_get, _wc.svn_wc_status2_t_ood_last_cmt_rev_set)
+    ood_last_cmt_date = _swig_property(_wc.svn_wc_status2_t_ood_last_cmt_date_get, _wc.svn_wc_status2_t_ood_last_cmt_date_set)
+    ood_kind = _swig_property(_wc.svn_wc_status2_t_ood_kind_get, _wc.svn_wc_status2_t_ood_kind_set)
+    ood_last_cmt_author = _swig_property(_wc.svn_wc_status2_t_ood_last_cmt_author_get, _wc.svn_wc_status2_t_ood_last_cmt_author_set)
+    tree_conflict = _swig_property(_wc.svn_wc_status2_t_tree_conflict_get, _wc.svn_wc_status2_t_tree_conflict_set)
+    file_external = _swig_property(_wc.svn_wc_status2_t_file_external_get, _wc.svn_wc_status2_t_file_external_set)
+    pristine_text_status = _swig_property(_wc.svn_wc_status2_t_pristine_text_status_get, _wc.svn_wc_status2_t_pristine_text_status_set)
+    pristine_prop_status = _swig_property(_wc.svn_wc_status2_t_pristine_prop_status_get, _wc.svn_wc_status2_t_pristine_prop_status_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -1964,23 +2248,57 @@ class svn_wc_status2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -1990,7 +2308,7 @@ class svn_wc_status2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2005,30 +2323,19 @@ class svn_wc_status2_t:
 svn_wc_status2_t_swigregister = _wc.svn_wc_status2_t_swigregister
 svn_wc_status2_t_swigregister(svn_wc_status2_t)
 
-class svn_wc_status_t:
+class svn_wc_status_t(object):
     """Proxy of C svn_wc_status_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_status_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_status_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["entry"] = _wc.svn_wc_status_t_entry_set
-    __swig_getmethods__["entry"] = _wc.svn_wc_status_t_entry_get
-    __swig_setmethods__["text_status"] = _wc.svn_wc_status_t_text_status_set
-    __swig_getmethods__["text_status"] = _wc.svn_wc_status_t_text_status_get
-    __swig_setmethods__["prop_status"] = _wc.svn_wc_status_t_prop_status_set
-    __swig_getmethods__["prop_status"] = _wc.svn_wc_status_t_prop_status_get
-    __swig_setmethods__["locked"] = _wc.svn_wc_status_t_locked_set
-    __swig_getmethods__["locked"] = _wc.svn_wc_status_t_locked_get
-    __swig_setmethods__["copied"] = _wc.svn_wc_status_t_copied_set
-    __swig_getmethods__["copied"] = _wc.svn_wc_status_t_copied_get
-    __swig_setmethods__["switched"] = _wc.svn_wc_status_t_switched_set
-    __swig_getmethods__["switched"] = _wc.svn_wc_status_t_switched_get
-    __swig_setmethods__["repos_text_status"] = _wc.svn_wc_status_t_repos_text_status_set
-    __swig_getmethods__["repos_text_status"] = _wc.svn_wc_status_t_repos_text_status_get
-    __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
+    entry = _swig_property(_wc.svn_wc_status_t_entry_get, _wc.svn_wc_status_t_entry_set)
+    text_status = _swig_property(_wc.svn_wc_status_t_text_status_get, _wc.svn_wc_status_t_text_status_set)
+    prop_status = _swig_property(_wc.svn_wc_status_t_prop_status_get, _wc.svn_wc_status_t_prop_status_set)
+    locked = _swig_property(_wc.svn_wc_status_t_locked_get, _wc.svn_wc_status_t_locked_set)
+    copied = _swig_property(_wc.svn_wc_status_t_copied_get, _wc.svn_wc_status_t_copied_set)
+    switched = _swig_property(_wc.svn_wc_status_t_switched_get, _wc.svn_wc_status_t_switched_set)
+    repos_text_status = _swig_property(_wc.svn_wc_status_t_repos_text_status_get, _wc.svn_wc_status_t_repos_text_status_set)
+    repos_prop_status = _swig_property(_wc.svn_wc_status_t_repos_prop_status_get, _wc.svn_wc_status_t_repos_prop_status_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2043,23 +2350,57 @@ class svn_wc_status_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2069,7 +2410,7 @@ class svn_wc_status_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2085,383 +2426,383 @@ svn_wc_status_t_swigregister = _wc.svn_wc_status_t_swigregister
 svn_wc_status_t_swigregister(svn_wc_status_t)
 
 
-def svn_wc_dup_status3(*args):
+def svn_wc_dup_status3(*args) -> "svn_wc_status3_t *":
     """svn_wc_dup_status3(svn_wc_status3_t orig_stat, apr_pool_t pool) -> svn_wc_status3_t"""
     return _wc.svn_wc_dup_status3(*args)
 
-def svn_wc_dup_status2(*args):
+def svn_wc_dup_status2(*args) -> "svn_wc_status2_t *":
     """svn_wc_dup_status2(svn_wc_status2_t orig_stat, apr_pool_t pool) -> svn_wc_status2_t"""
     return _wc.svn_wc_dup_status2(*args)
 
-def svn_wc_dup_status(*args):
+def svn_wc_dup_status(*args) -> "svn_wc_status_t *":
     """svn_wc_dup_status(svn_wc_status_t orig_stat, apr_pool_t pool) -> svn_wc_status_t"""
     return _wc.svn_wc_dup_status(*args)
 
-def svn_wc_status3(*args):
+def svn_wc_status3(*args) -> "SWIGTYPE **":
     """svn_wc_status3(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_status3(*args)
 
-def svn_wc_status2(*args):
+def svn_wc_status2(*args) -> "svn_wc_status2_t **":
     """svn_wc_status2(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_status2(*args)
 
-def svn_wc_status(*args):
+def svn_wc_status(*args) -> "svn_wc_status_t **":
     """svn_wc_status(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_status(*args)
 
-def svn_wc_walk_status(*args):
+def svn_wc_walk_status(*args) -> "svn_error_t *":
     """svn_wc_walk_status(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t no_ignore, svn_boolean_t ignore_text_mods, apr_array_header_t ignore_patterns, svn_wc_status_func4_t status_func, void * status_baton, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_walk_status(*args)
 
-def svn_wc_get_status_editor5(*args):
+def svn_wc_get_status_editor5(*args) -> "svn_delta_editor_t const **, void **, void **, svn_revnum_t *":
     """svn_wc_get_status_editor5(svn_wc_context_t * wc_ctx, char const * anchor_abspath, char const * target_basename, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t no_ignore, svn_boolean_t depth_as_sticky, svn_boolean_t server_performs_filtering, apr_array_header_t ignore_patterns, svn_wc_status_func4_t status_func, void * status_baton, svn_cancel_func_t cancel_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_status_editor5(*args)
 
-def svn_wc_get_status_editor4(*args):
+def svn_wc_get_status_editor4(*args) -> "svn_delta_editor_t const **, void **, void **, svn_revnum_t *":
     """svn_wc_get_status_editor4(svn_wc_adm_access_t * anchor, char const * target, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t no_ignore, apr_array_header_t ignore_patterns, svn_wc_status_func3_t status_func, void * status_baton, svn_cancel_func_t cancel_func, svn_wc_traversal_info_t * traversal_info, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_status_editor4(*args)
 
-def svn_wc_get_status_editor3(*args):
+def svn_wc_get_status_editor3(*args) -> "svn_delta_editor_t const **, void **, void **, svn_revnum_t *":
     """svn_wc_get_status_editor3(svn_wc_adm_access_t * anchor, char const * target, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t no_ignore, apr_array_header_t ignore_patterns, svn_wc_status_func2_t status_func, svn_cancel_func_t cancel_func, svn_wc_traversal_info_t * traversal_info, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_status_editor3(*args)
 
-def svn_wc_get_status_editor2(*args):
+def svn_wc_get_status_editor2(*args) -> "svn_delta_editor_t const **, void **, void **, svn_revnum_t *":
     """svn_wc_get_status_editor2(svn_wc_adm_access_t * anchor, char const * target, apr_hash_t config, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t no_ignore, svn_wc_status_func2_t status_func, svn_cancel_func_t cancel_func, svn_wc_traversal_info_t * traversal_info, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_status_editor2(*args)
 
-def svn_wc_get_status_editor(*args):
+def svn_wc_get_status_editor(*args) -> "svn_delta_editor_t const **, void **, svn_revnum_t *":
     """svn_wc_get_status_editor(svn_wc_adm_access_t * anchor, char const * target, apr_hash_t config, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t no_ignore, svn_wc_status_func_t status_func, svn_cancel_func_t cancel_func, svn_wc_traversal_info_t * traversal_info, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_status_editor(*args)
 
-def svn_wc_status_set_repos_locks(*args):
+def svn_wc_status_set_repos_locks(*args) -> "svn_error_t *":
     """svn_wc_status_set_repos_locks(void * set_locks_baton, apr_hash_t locks, char const * repos_root, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_status_set_repos_locks(*args)
 
-def svn_wc_copy3(*args):
+def svn_wc_copy3(*args) -> "svn_error_t *":
     """svn_wc_copy3(svn_wc_context_t * wc_ctx, char const * src_abspath, char const * dst_abspath, 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_copy3(*args)
 
-def svn_wc_copy2(*args):
+def svn_wc_copy2(*args) -> "svn_error_t *":
     """svn_wc_copy2(char const * src, svn_wc_adm_access_t * dst_parent, char const * dst_basename, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_copy2(*args)
 
-def svn_wc_copy(*args):
+def svn_wc_copy(*args) -> "svn_error_t *":
     """svn_wc_copy(char const * src, svn_wc_adm_access_t * dst_parent, char const * dst_basename, svn_cancel_func_t cancel_func, svn_wc_notify_func_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_copy(*args)
 
-def svn_wc_move(*args):
+def svn_wc_move(*args) -> "svn_error_t *":
     """svn_wc_move(svn_wc_context_t * wc_ctx, char const * src_abspath, char const * dst_abspath, 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_move(*args)
 
-def svn_wc_delete4(*args):
+def svn_wc_delete4(*args) -> "svn_error_t *":
     """svn_wc_delete4(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t keep_local, svn_boolean_t delete_unversioned_target, 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_delete4(*args)
 
-def svn_wc_delete3(*args):
+def svn_wc_delete3(*args) -> "svn_error_t *":
     """svn_wc_delete3(char const * path, svn_wc_adm_access_t * adm_access, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, svn_boolean_t keep_local, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_delete3(*args)
 
-def svn_wc_delete2(*args):
+def svn_wc_delete2(*args) -> "svn_error_t *":
     """svn_wc_delete2(char const * path, svn_wc_adm_access_t * adm_access, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_delete2(*args)
 
-def svn_wc_delete(*args):
+def svn_wc_delete(*args) -> "svn_error_t *":
     """svn_wc_delete(char const * path, svn_wc_adm_access_t * adm_access, svn_cancel_func_t cancel_func, svn_wc_notify_func_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_delete(*args)
 
-def svn_wc_add_from_disk3(*args):
+def svn_wc_add_from_disk3(*args) -> "svn_error_t *":
     """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):
+def svn_wc_add_from_disk2(*args) -> "svn_error_t *":
     """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, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_add_from_disk2(*args)
 
-def svn_wc_add_from_disk(*args):
+def svn_wc_add_from_disk(*args) -> "svn_error_t *":
     """svn_wc_add_from_disk(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_add_from_disk(*args)
 
-def svn_wc_add4(*args):
+def svn_wc_add4(*args) -> "svn_error_t *":
     """svn_wc_add4(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, char const * copyfrom_url, svn_revnum_t copyfrom_rev, 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_add4(*args)
 
-def svn_wc_add3(*args):
+def svn_wc_add3(*args) -> "svn_error_t *":
     """svn_wc_add3(char const * path, svn_wc_adm_access_t * parent_access, svn_depth_t depth, char const * copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_add3(*args)
 
-def svn_wc_add2(*args):
+def svn_wc_add2(*args) -> "svn_error_t *":
     """svn_wc_add2(char const * path, svn_wc_adm_access_t * parent_access, char const * copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_add2(*args)
 
-def svn_wc_add(*args):
+def svn_wc_add(*args) -> "svn_error_t *":
     """svn_wc_add(char const * path, svn_wc_adm_access_t * parent_access, char const * copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, svn_wc_notify_func_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_add(*args)
 
-def svn_wc_add_repos_file4(*args):
+def svn_wc_add_repos_file4(*args) -> "svn_error_t *":
     """svn_wc_add_repos_file4(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_stream_t * new_base_contents, svn_stream_t * new_contents, apr_hash_t new_base_props, apr_hash_t new_props, char const * copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_add_repos_file4(*args)
 
-def svn_wc_add_repos_file3(*args):
+def svn_wc_add_repos_file3(*args) -> "svn_error_t *":
     """svn_wc_add_repos_file3(char const * dst_path, svn_wc_adm_access_t * adm_access, svn_stream_t * new_base_contents, svn_stream_t * new_contents, apr_hash_t new_base_props, apr_hash_t new_props, char const * copyfrom_url, svn_revnum_t copyfrom_rev, 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_add_repos_file3(*args)
 
-def svn_wc_add_repos_file2(*args):
+def svn_wc_add_repos_file2(*args) -> "svn_error_t *":
     """svn_wc_add_repos_file2(char const * dst_path, svn_wc_adm_access_t * adm_access, char const * new_text_base_path, char const * new_text_path, apr_hash_t new_base_props, apr_hash_t new_props, char const * copyfrom_url, svn_revnum_t copyfrom_rev, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_add_repos_file2(*args)
 
-def svn_wc_add_repos_file(*args):
+def svn_wc_add_repos_file(*args) -> "svn_error_t *":
     """svn_wc_add_repos_file(char const * dst_path, svn_wc_adm_access_t * adm_access, char const * new_text_path, apr_hash_t new_props, char const * copyfrom_url, svn_revnum_t copyfrom_rev, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_add_repos_file(*args)
 
-def svn_wc_remove_from_revision_control2(*args):
+def svn_wc_remove_from_revision_control2(*args) -> "svn_error_t *":
     """svn_wc_remove_from_revision_control2(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t destroy_wf, svn_boolean_t instant_error, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_remove_from_revision_control2(*args)
 
-def svn_wc_remove_from_revision_control(*args):
+def svn_wc_remove_from_revision_control(*args) -> "svn_error_t *":
     """svn_wc_remove_from_revision_control(svn_wc_adm_access_t * adm_access, char const * name, svn_boolean_t destroy_wf, svn_boolean_t instant_error, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_remove_from_revision_control(*args)
 
-def svn_wc_resolved_conflict5(*args):
+def svn_wc_resolved_conflict5(*args) -> "svn_error_t *":
     """svn_wc_resolved_conflict5(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t resolve_text, char const * resolve_prop, svn_boolean_t resolve_tree, svn_wc_conflict_choice_t conflict_choice, 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_resolved_conflict5(*args)
 
-def svn_wc_resolved_conflict4(*args):
+def svn_wc_resolved_conflict4(*args) -> "svn_error_t *":
     """svn_wc_resolved_conflict4(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t resolve_tree, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_wc_notify_func2_t notify_func, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_resolved_conflict4(*args)
 
-def svn_wc_resolved_conflict3(*args):
+def svn_wc_resolved_conflict3(*args) -> "svn_error_t *":
     """svn_wc_resolved_conflict3(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_wc_notify_func2_t notify_func, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_resolved_conflict3(*args)
 
-def svn_wc_resolved_conflict2(*args):
+def svn_wc_resolved_conflict2(*args) -> "svn_error_t *":
     """svn_wc_resolved_conflict2(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_resolved_conflict2(*args)
 
-def svn_wc_resolved_conflict(*args):
+def svn_wc_resolved_conflict(*args) -> "svn_error_t *":
     """svn_wc_resolved_conflict(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_resolved_conflict(*args)
 
-def svn_wc_committed_queue_create(*args):
+def svn_wc_committed_queue_create(*args) -> "svn_wc_committed_queue_t *":
     """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):
+def svn_wc_queue_committed4(*args) -> "svn_error_t *":
     """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):
+def svn_wc_queue_committed3(*args) -> "svn_error_t *":
     """svn_wc_queue_committed3(svn_wc_committed_queue_t * queue, svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t recurse, 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_committed3(*args)
 
-def svn_wc_queue_committed2(*args):
+def svn_wc_queue_committed2(*args) -> "svn_error_t *":
     """svn_wc_queue_committed2(svn_wc_committed_queue_t * queue, char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t recurse, apr_array_header_t wcprop_changes, svn_boolean_t remove_lock, svn_boolean_t remove_changelist, svn_checksum_t md5_checksum, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_queue_committed2(*args)
 
-def svn_wc_queue_committed(*args):
+def svn_wc_queue_committed(*args) -> "svn_wc_committed_queue_t **, unsigned char const *":
     """svn_wc_queue_committed(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t recurse, apr_array_header_t wcprop_changes, svn_boolean_t remove_lock, svn_boolean_t remove_changelist, unsigned char const * digest, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_queue_committed(*args)
 
-def svn_wc_process_committed_queue2(*args):
+def svn_wc_process_committed_queue2(*args) -> "svn_error_t *":
     """svn_wc_process_committed_queue2(svn_wc_committed_queue_t * queue, svn_wc_context_t * wc_ctx, svn_revnum_t new_revnum, char const * rev_date, char const * rev_author, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_process_committed_queue2(*args)
 
-def svn_wc_process_committed_queue(*args):
+def svn_wc_process_committed_queue(*args) -> "svn_error_t *":
     """svn_wc_process_committed_queue(svn_wc_committed_queue_t * queue, svn_wc_adm_access_t * adm_access, svn_revnum_t new_revnum, char const * rev_date, char const * rev_author, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_process_committed_queue(*args)
 
-def svn_wc_process_committed4(*args):
+def svn_wc_process_committed4(*args) -> "unsigned char const *":
     """svn_wc_process_committed4(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t recurse, svn_revnum_t new_revnum, char const * rev_date, char const * rev_author, apr_array_header_t wcprop_changes, svn_boolean_t remove_lock, svn_boolean_t remove_changelist, unsigned char const * digest, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_process_committed4(*args)
 
-def svn_wc_process_committed3(*args):
+def svn_wc_process_committed3(*args) -> "unsigned char const *":
     """svn_wc_process_committed3(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t recurse, svn_revnum_t new_revnum, char const * rev_date, char const * rev_author, apr_array_header_t wcprop_changes, svn_boolean_t remove_lock, unsigned char const * digest, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_process_committed3(*args)
 
-def svn_wc_process_committed2(*args):
+def svn_wc_process_committed2(*args) -> "svn_error_t *":
     """svn_wc_process_committed2(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t recurse, svn_revnum_t new_revnum, char const * rev_date, char const * rev_author, apr_array_header_t wcprop_changes, svn_boolean_t remove_lock, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_process_committed2(*args)
 
-def svn_wc_process_committed(*args):
+def svn_wc_process_committed(*args) -> "svn_error_t *":
     """svn_wc_process_committed(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t recurse, svn_revnum_t new_revnum, char const * rev_date, char const * rev_author, apr_array_header_t wcprop_changes, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_process_committed(*args)
 
-def svn_wc_crawl_revisions5(*args):
+def svn_wc_crawl_revisions5(*args) -> "svn_error_t *":
     """svn_wc_crawl_revisions5(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_ra_reporter3_t reporter, void * report_baton, svn_boolean_t restore_files, svn_depth_t depth, svn_boolean_t honor_depth_exclude, svn_boolean_t depth_compatibility_trick, svn_boolean_t use_commit_times, 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_crawl_revisions5(*args)
 
-def svn_wc_crawl_revisions4(*args):
+def svn_wc_crawl_revisions4(*args) -> "svn_error_t *":
     """svn_wc_crawl_revisions4(char const * path, svn_wc_adm_access_t * adm_access, svn_ra_reporter3_t reporter, void * report_baton, svn_boolean_t restore_files, svn_depth_t depth, svn_boolean_t honor_depth_exclude, svn_boolean_t depth_compatibility_trick, svn_boolean_t use_commit_times, svn_wc_notify_func2_t notify_func, svn_wc_traversal_info_t * traversal_info, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_crawl_revisions4(*args)
 
-def svn_wc_crawl_revisions3(*args):
+def svn_wc_crawl_revisions3(*args) -> "svn_error_t *":
     """svn_wc_crawl_revisions3(char const * path, svn_wc_adm_access_t * adm_access, svn_ra_reporter3_t reporter, void * report_baton, svn_boolean_t restore_files, svn_depth_t depth, svn_boolean_t depth_compatibility_trick, svn_boolean_t use_commit_times, svn_wc_notify_func2_t notify_func, svn_wc_traversal_info_t * traversal_info, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_crawl_revisions3(*args)
 
-def svn_wc_crawl_revisions2(*args):
+def svn_wc_crawl_revisions2(*args) -> "svn_error_t *":
     """svn_wc_crawl_revisions2(char const * path, svn_wc_adm_access_t * adm_access, svn_ra_reporter2_t reporter, svn_boolean_t restore_files, svn_boolean_t recurse, svn_boolean_t use_commit_times, svn_wc_notify_func2_t notify_func, svn_wc_traversal_info_t * traversal_info, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_crawl_revisions2(*args)
 
-def svn_wc_crawl_revisions(*args):
+def svn_wc_crawl_revisions(*args) -> "svn_error_t *":
     """svn_wc_crawl_revisions(char const * path, svn_wc_adm_access_t * adm_access, svn_ra_reporter_t reporter, void * report_baton, svn_boolean_t restore_files, svn_boolean_t recurse, svn_boolean_t use_commit_times, svn_wc_notify_func_t notify_func, svn_wc_traversal_info_t * traversal_info, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_crawl_revisions(*args)
 
-def svn_wc_check_root(*args):
+def svn_wc_check_root(*args) -> "svn_boolean_t *, svn_boolean_t *, svn_node_kind_t *":
     """svn_wc_check_root(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_check_root(*args)
 
-def svn_wc_is_wc_root2(*args):
+def svn_wc_is_wc_root2(*args) -> "svn_boolean_t *":
     """svn_wc_is_wc_root2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_is_wc_root2(*args)
 
-def svn_wc_is_wc_root(*args):
+def svn_wc_is_wc_root(*args) -> "svn_boolean_t *":
     """svn_wc_is_wc_root(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_is_wc_root(*args)
 
-def svn_wc_get_actual_target2(*args):
+def svn_wc_get_actual_target2(*args) -> "char const **, char const **":
     """svn_wc_get_actual_target2(svn_wc_context_t * wc_ctx, char const * path, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_actual_target2(*args)
 
-def svn_wc_get_actual_target(*args):
+def svn_wc_get_actual_target(*args) -> "char const **, char const **":
     """svn_wc_get_actual_target(char const * path, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_actual_target(*args)
 
-def svn_wc_get_update_editor4(*args):
+def svn_wc_get_update_editor4(*args) -> "svn_delta_editor_t const **, void **, svn_revnum_t *":
     """svn_wc_get_update_editor4(svn_wc_context_t * wc_ctx, char const * anchor_abspath, char const * target_basename, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t server_performs_filtering, svn_boolean_t clean_checkout, char const * diff3_cmd, apr_array_header_t preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void * fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void * conflict_baton, svn_wc_external_update_t external_func, void * external_baton, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_update_editor4(*args)
 
-def svn_wc_get_update_editor3(*args):
+def svn_wc_get_update_editor3(*args) -> "svn_revnum_t *, svn_delta_editor_t const **, void **":
     """svn_wc_get_update_editor3(svn_wc_adm_access_t * anchor, char const * target, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_wc_notify_func2_t notify_func, svn_cancel_func_t cancel_func, svn_wc_conflict_resolver_func_t conflict_func, void * conflict_baton, svn_wc_get_file_t fetch_func, void * fetch_baton, char const * diff3_cmd, apr_array_header_t preserved_exts, svn_wc_traversal_info_t * ti, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_update_editor3(*args)
 
-def svn_wc_get_update_editor2(*args):
+def svn_wc_get_update_editor2(*args) -> "svn_revnum_t *, svn_delta_editor_t const **, void **":
     """svn_wc_get_update_editor2(svn_wc_adm_access_t * anchor, char const * target, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, svn_cancel_func_t cancel_func, char const * diff3_cmd, svn_wc_traversal_info_t * ti, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_update_editor2(*args)
 
-def svn_wc_get_update_editor(*args):
+def svn_wc_get_update_editor(*args) -> "svn_revnum_t *, svn_delta_editor_t const **, void **":
     """svn_wc_get_update_editor(svn_wc_adm_access_t * anchor, char const * target, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, svn_cancel_func_t cancel_func, char const * diff3_cmd, svn_wc_traversal_info_t * ti, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_update_editor(*args)
 
-def svn_wc_get_switch_editor4(*args):
+def svn_wc_get_switch_editor4(*args) -> "svn_delta_editor_t const **, void **, svn_revnum_t *":
     """svn_wc_get_switch_editor4(svn_wc_context_t * wc_ctx, char const * anchor_abspath, char const * target_basename, char const * switch_url, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t server_performs_filtering, char const * diff3_cmd, apr_array_header_t preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void * fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void * conflict_baton, svn_wc_external_update_t external_func, void * external_baton, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_switch_editor4(*args)
 
-def svn_wc_get_switch_editor3(*args):
+def svn_wc_get_switch_editor3(*args) -> "svn_revnum_t *, svn_delta_editor_t const **, void **":
     """svn_wc_get_switch_editor3(svn_wc_adm_access_t * anchor, char const * target, char const * switch_url, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_wc_notify_func2_t notify_func, svn_cancel_func_t cancel_func, svn_wc_conflict_resolver_func_t conflict_func, void * conflict_baton, char const * diff3_cmd, apr_array_header_t preserved_exts, svn_wc_traversal_info_t * ti, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_switch_editor3(*args)
 
-def svn_wc_get_switch_editor2(*args):
+def svn_wc_get_switch_editor2(*args) -> "svn_revnum_t *, svn_delta_editor_t const **, void **":
     """svn_wc_get_switch_editor2(svn_wc_adm_access_t * anchor, char const * target, char const * switch_url, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, svn_cancel_func_t cancel_func, char const * diff3_cmd, svn_wc_traversal_info_t * ti, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_switch_editor2(*args)
 
-def svn_wc_get_switch_editor(*args):
+def svn_wc_get_switch_editor(*args) -> "svn_revnum_t *, svn_delta_editor_t const **, void **":
     """svn_wc_get_switch_editor(svn_wc_adm_access_t * anchor, char const * target, char const * switch_url, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, svn_cancel_func_t cancel_func, char const * diff3_cmd, svn_wc_traversal_info_t * ti, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_switch_editor(*args)
 
-def svn_wc_prop_list2(*args):
+def svn_wc_prop_list2(*args) -> "apr_hash_t **":
     """svn_wc_prop_list2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_prop_list2(*args)
 
-def svn_wc_prop_list(*args):
+def svn_wc_prop_list(*args) -> "apr_hash_t **":
     """svn_wc_prop_list(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_prop_list(*args)
 
-def svn_wc_get_pristine_props(*args):
+def svn_wc_get_pristine_props(*args) -> "apr_hash_t **":
     """svn_wc_get_pristine_props(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_pristine_props(*args)
 
-def svn_wc_prop_get2(*args):
+def svn_wc_prop_get2(*args) -> "svn_string_t **":
     """svn_wc_prop_get2(svn_wc_context_t * wc_ctx, char const * local_abspath, char const * name, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_prop_get2(*args)
 
-def svn_wc_prop_get(*args):
+def svn_wc_prop_get(*args) -> "svn_string_t **":
     """svn_wc_prop_get(char const * name, char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_prop_get(*args)
 
-def svn_wc_prop_set4(*args):
+def svn_wc_prop_set4(*args) -> "svn_error_t *":
     """svn_wc_prop_set4(svn_wc_context_t * wc_ctx, char const * local_abspath, char const * name, svn_string_t const * value, svn_depth_t depth, svn_boolean_t skip_checks, apr_array_header_t changelist_filter, 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_prop_set4(*args)
 
-def svn_wc_prop_set3(*args):
+def svn_wc_prop_set3(*args) -> "svn_error_t *":
     """svn_wc_prop_set3(char const * name, svn_string_t const * value, char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t skip_checks, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_prop_set3(*args)
 
-def svn_wc_prop_set2(*args):
+def svn_wc_prop_set2(*args) -> "svn_error_t *":
     """svn_wc_prop_set2(char const * name, svn_string_t const * value, char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t skip_checks, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_prop_set2(*args)
 
-def svn_wc_prop_set(*args):
+def svn_wc_prop_set(*args) -> "svn_error_t *":
     """svn_wc_prop_set(char const * name, svn_string_t const * value, char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_prop_set(*args)
 
-def svn_wc_is_normal_prop(name):
+def svn_wc_is_normal_prop(name: 'char const *') -> "svn_boolean_t":
     """svn_wc_is_normal_prop(char const * name) -> svn_boolean_t"""
     return _wc.svn_wc_is_normal_prop(name)
 
-def svn_wc_is_wc_prop(name):
+def svn_wc_is_wc_prop(name: 'char const *') -> "svn_boolean_t":
     """svn_wc_is_wc_prop(char const * name) -> svn_boolean_t"""
     return _wc.svn_wc_is_wc_prop(name)
 
-def svn_wc_is_entry_prop(name):
+def svn_wc_is_entry_prop(name: 'char const *') -> "svn_boolean_t":
     """svn_wc_is_entry_prop(char const * name) -> svn_boolean_t"""
     return _wc.svn_wc_is_entry_prop(name)
 
-def svn_wc_canonicalize_svn_prop(*args):
+def svn_wc_canonicalize_svn_prop(*args) -> "svn_string_t **":
     """svn_wc_canonicalize_svn_prop(char const * propname, svn_string_t const * propval, char const * path, svn_node_kind_t kind, svn_boolean_t skip_some_checks, svn_wc_canonicalize_svn_prop_get_file_t prop_getter, void * getter_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_canonicalize_svn_prop(*args)
 
-def svn_wc_get_diff_editor6(*args):
+def svn_wc_get_diff_editor6(*args) -> "svn_delta_editor_t const **, void **":
     """svn_wc_get_diff_editor6(svn_wc_context_t * wc_ctx, char const * anchor_abspath, char const * target, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t show_copies_as_adds, svn_boolean_t use_git_diff_format, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_boolean_t server_performs_filtering, apr_array_header_t changelist_filter, svn_wc_diff_callbacks4_t callbacks, void * callback_baton, svn_cancel_func_t cancel_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_diff_editor6(*args)
 
-def svn_wc_get_diff_editor5(*args):
+def svn_wc_get_diff_editor5(*args) -> "svn_delta_editor_t const **, void **":
     """svn_wc_get_diff_editor5(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks3_t callbacks, void * callback_baton, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, apr_array_header_t changelist_filter, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_diff_editor5(*args)
 
-def svn_wc_get_diff_editor4(*args):
+def svn_wc_get_diff_editor4(*args) -> "svn_delta_editor_t const **, void **":
     """svn_wc_get_diff_editor4(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks2_t callbacks, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, apr_array_header_t changelist_filter, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_diff_editor4(*args)
 
-def svn_wc_get_diff_editor3(*args):
+def svn_wc_get_diff_editor3(*args) -> "svn_delta_editor_t const **, void **":
     """svn_wc_get_diff_editor3(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks2_t callbacks, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_diff_editor3(*args)
 
-def svn_wc_get_diff_editor2(*args):
+def svn_wc_get_diff_editor2(*args) -> "svn_delta_editor_t const **, void **":
     """svn_wc_get_diff_editor2(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks_t callbacks, void * callback_baton, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_diff_editor2(*args)
 
-def svn_wc_get_diff_editor(*args):
+def svn_wc_get_diff_editor(*args) -> "svn_delta_editor_t const **, void **":
     """svn_wc_get_diff_editor(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks_t callbacks, void * callback_baton, svn_boolean_t recurse, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_diff_editor(*args)
 
-def svn_wc_diff6(*args):
+def svn_wc_diff6(*args) -> "svn_error_t *":
     """svn_wc_diff6(svn_wc_context_t * wc_ctx, char const * target_abspath, svn_wc_diff_callbacks4_t callbacks, void * callback_baton, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t show_copies_as_adds, svn_boolean_t use_git_diff_format, apr_array_header_t changelist_filter, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff6(*args)
 
-def svn_wc_diff5(*args):
+def svn_wc_diff5(*args) -> "svn_error_t *":
     """svn_wc_diff5(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks3_t callbacks, void * callback_baton, svn_depth_t depth, svn_boolean_t ignore_ancestry, apr_array_header_t changelist_filter, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_diff5(*args)
 
-def svn_wc_diff4(*args):
+def svn_wc_diff4(*args) -> "svn_error_t *":
     """svn_wc_diff4(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks2_t callbacks, svn_depth_t depth, svn_boolean_t ignore_ancestry, apr_array_header_t changelist_filter, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_diff4(*args)
 
-def svn_wc_diff3(*args):
+def svn_wc_diff3(*args) -> "svn_error_t *":
     """svn_wc_diff3(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks2_t callbacks, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_diff3(*args)
 
-def svn_wc_diff2(*args):
+def svn_wc_diff2(*args) -> "svn_error_t *":
     """svn_wc_diff2(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks_t callbacks, void * callback_baton, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_diff2(*args)
 
-def svn_wc_diff(*args):
+def svn_wc_diff(*args) -> "svn_error_t *":
     """svn_wc_diff(svn_wc_adm_access_t * anchor, char const * target, svn_wc_diff_callbacks_t callbacks, void * callback_baton, svn_boolean_t recurse, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_diff(*args)
 
-def svn_wc_get_prop_diffs2(*args):
+def svn_wc_get_prop_diffs2(*args) -> "apr_array_header_t **, apr_hash_t **":
     """svn_wc_get_prop_diffs2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_prop_diffs2(*args)
 
-def svn_wc_get_prop_diffs(*args):
+def svn_wc_get_prop_diffs(*args) -> "apr_array_header_t **, apr_hash_t **":
     """svn_wc_get_prop_diffs(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_prop_diffs(*args)
 svn_wc_merge_unchanged = _wc.svn_wc_merge_unchanged
@@ -2469,207 +2810,199 @@ svn_wc_merge_merged = _wc.svn_wc_merge_merged
 svn_wc_merge_conflict = _wc.svn_wc_merge_conflict
 svn_wc_merge_no_merge = _wc.svn_wc_merge_no_merge
 
-def svn_wc_merge5(*args):
+def svn_wc_merge5(*args) -> "enum svn_wc_merge_outcome_t *":
     """svn_wc_merge5(enum svn_wc_notify_state_t * merge_props_state, svn_wc_context_t * wc_ctx, char const * left_abspath, char const * right_abspath, char const * target_abspath, char const * left_label, char const * right_label, char const * target_label, svn_wc_conflict_version_t left_version, svn_wc_conflict_version_t right_version, svn_boolean_t dry_run, char const * diff3_cmd, apr_array_header_t merge_options, apr_hash_t original_props, apr_array_header_t prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void * conflict_baton, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_merge5(*args)
 
-def svn_wc_merge4(*args):
+def svn_wc_merge4(*args) -> "enum svn_wc_merge_outcome_t *":
     """svn_wc_merge4(svn_wc_context_t * wc_ctx, char const * left_abspath, char const * right_abspath, char const * target_abspath, char const * left_label, char const * right_label, char const * target_label, svn_wc_conflict_version_t left_version, svn_wc_conflict_version_t right_version, svn_boolean_t dry_run, char const * diff3_cmd, apr_array_header_t merge_options, apr_array_header_t prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void * conflict_baton, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_merge4(*args)
 
-def svn_wc_merge3(*args):
+def svn_wc_merge3(*args) -> "enum svn_wc_merge_outcome_t *":
     """svn_wc_merge3(char const * left, char const * right, char const * merge_target, svn_wc_adm_access_t * adm_access, char const * left_label, char const * right_label, char const * target_label, svn_boolean_t dry_run, char const * diff3_cmd, apr_array_header_t merge_options, apr_array_header_t prop_diff, svn_wc_conflict_resolver_func_t conflict_func, void * conflict_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_merge3(*args)
 
-def svn_wc_merge2(*args):
+def svn_wc_merge2(*args) -> "enum svn_wc_merge_outcome_t *":
     """svn_wc_merge2(char const * left, char const * right, char const * merge_target, svn_wc_adm_access_t * adm_access, char const * left_label, char const * right_label, char const * target_label, svn_boolean_t dry_run, char const * diff3_cmd, apr_array_header_t merge_options, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_merge2(*args)
 
-def svn_wc_merge(*args):
+def svn_wc_merge(*args) -> "enum svn_wc_merge_outcome_t *":
     """svn_wc_merge(char const * left, char const * right, char const * merge_target, svn_wc_adm_access_t * adm_access, char const * left_label, char const * right_label, char const * target_label, svn_boolean_t dry_run, char const * diff3_cmd, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_merge(*args)
 
-def svn_wc_merge_props3(*args):
+def svn_wc_merge_props3(*args) -> "svn_error_t *":
     """svn_wc_merge_props3(svn_wc_notify_state_t * state, svn_wc_context_t * wc_ctx, char const * local_abspath, svn_wc_conflict_version_t left_version, svn_wc_conflict_version_t right_version, apr_hash_t baseprops, apr_array_header_t propchanges, svn_boolean_t dry_run, svn_wc_conflict_resolver_func2_t conflict_func, void * conflict_baton, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_merge_props3(*args)
 
-def svn_wc_merge_props2(*args):
+def svn_wc_merge_props2(*args) -> "svn_error_t *":
     """svn_wc_merge_props2(svn_wc_notify_state_t * state, char const * path, svn_wc_adm_access_t * adm_access, apr_hash_t baseprops, apr_array_header_t propchanges, svn_boolean_t base_merge, svn_boolean_t dry_run, svn_wc_conflict_resolver_func_t conflict_func, void * conflict_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_merge_props2(*args)
 
-def svn_wc_merge_props(*args):
+def svn_wc_merge_props(*args) -> "svn_error_t *":
     """svn_wc_merge_props(svn_wc_notify_state_t * state, char const * path, svn_wc_adm_access_t * adm_access, apr_hash_t baseprops, apr_array_header_t propchanges, svn_boolean_t base_merge, svn_boolean_t dry_run, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_merge_props(*args)
 
-def svn_wc_merge_prop_diffs(*args):
+def svn_wc_merge_prop_diffs(*args) -> "svn_error_t *":
     """svn_wc_merge_prop_diffs(svn_wc_notify_state_t * state, char const * path, svn_wc_adm_access_t * adm_access, apr_array_header_t propchanges, svn_boolean_t base_merge, svn_boolean_t dry_run, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_merge_prop_diffs(*args)
 
-def svn_wc_get_pristine_contents2(*args):
+def svn_wc_get_pristine_contents2(*args) -> "svn_stream_t **":
     """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"""
     return _wc.svn_wc_get_pristine_contents2(*args)
 
-def svn_wc_get_pristine_contents(*args):
+def svn_wc_get_pristine_contents(*args) -> "svn_stream_t **":
     """svn_wc_get_pristine_contents(char const * path, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_pristine_contents(*args)
 
-def svn_wc_get_pristine_copy_path(*args):
+def svn_wc_get_pristine_copy_path(*args) -> "char const **":
     """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):
+def svn_wc_cleanup4(*args) -> "svn_error_t *":
     """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):
+def svn_wc_cleanup3(*args) -> "svn_error_t *":
     """svn_wc_cleanup3(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_cleanup3(*args)
 
-def svn_wc_cleanup2(*args):
+def svn_wc_cleanup2(*args) -> "svn_error_t *":
     """svn_wc_cleanup2(char const * path, char const * diff3_cmd, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_cleanup2(*args)
 
-def svn_wc_cleanup(*args):
+def svn_wc_cleanup(*args) -> "svn_error_t *":
     """svn_wc_cleanup(char const * path, svn_wc_adm_access_t * optional_adm_access, char const * diff3_cmd, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_cleanup(*args)
 
-def svn_wc_upgrade(*args):
+def svn_wc_upgrade(*args) -> "svn_error_t *":
     """svn_wc_upgrade(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_wc_upgrade_get_repos_info_t repos_info_func, void * repos_info_baton, 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_upgrade(*args)
 
-def svn_wc_relocate4(*args):
+def svn_wc_relocate4(*args) -> "svn_error_t *":
     """svn_wc_relocate4(svn_wc_context_t * wc_ctx, char const * wcroot_abspath, char const * arg3, char const * to, svn_wc_relocation_validator3_t validator, void * validator_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_relocate4(*args)
 
-def svn_wc_relocate3(*args):
+def svn_wc_relocate3(*args) -> "svn_error_t *":
     """svn_wc_relocate3(char const * path, svn_wc_adm_access_t * adm_access, char const * arg3, char const * to, svn_boolean_t recurse, svn_wc_relocation_validator3_t validator, void * validator_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_relocate3(*args)
 
-def svn_wc_relocate2(*args):
+def svn_wc_relocate2(*args) -> "svn_error_t *":
     """svn_wc_relocate2(char const * path, svn_wc_adm_access_t * adm_access, char const * arg3, char const * to, svn_boolean_t recurse, svn_wc_relocation_validator2_t validator, void * validator_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_relocate2(*args)
 
-def svn_wc_relocate(*args):
+def svn_wc_relocate(*args) -> "svn_error_t *":
     """svn_wc_relocate(char const * path, svn_wc_adm_access_t * adm_access, char const * arg3, char const * to, svn_boolean_t recurse, svn_wc_relocation_validator_t validator, void * validator_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_relocate(*args)
 
-def svn_wc_revert6(*args):
+def svn_wc_revert6(*args) -> "svn_error_t *":
     """svn_wc_revert6(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_boolean_t added_keep_local, 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_revert6(*args)
 
-def svn_wc_revert5(*args):
+def svn_wc_revert5(*args) -> "svn_error_t *":
     """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):
+def svn_wc_revert4(*args) -> "svn_error_t *":
     """svn_wc_revert4(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_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_revert4(*args)
 
-def svn_wc_revert3(*args):
+def svn_wc_revert3(*args) -> "svn_error_t *":
     """svn_wc_revert3(char const * path, svn_wc_adm_access_t * parent_access, svn_depth_t depth, svn_boolean_t use_commit_times, apr_array_header_t changelist_filter, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_revert3(*args)
 
-def svn_wc_revert2(*args):
+def svn_wc_revert2(*args) -> "svn_error_t *":
     """svn_wc_revert2(char const * path, svn_wc_adm_access_t * parent_access, svn_boolean_t recursive, svn_boolean_t use_commit_times, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_revert2(*args)
 
-def svn_wc_revert(*args):
+def svn_wc_revert(*args) -> "svn_error_t *":
     """svn_wc_revert(char const * path, svn_wc_adm_access_t * parent_access, svn_boolean_t recursive, svn_boolean_t use_commit_times, svn_cancel_func_t cancel_func, svn_wc_notify_func_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_revert(*args)
 
-def svn_wc_restore(*args):
+def svn_wc_restore(*args) -> "svn_error_t *":
     """svn_wc_restore(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t use_commit_times, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_restore(*args)
 
-def svn_wc_create_tmp_file2(*args):
+def svn_wc_create_tmp_file2(*args) -> "apr_file_t **, char const **":
     """svn_wc_create_tmp_file2(char const * path, svn_io_file_del_t delete_when, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_create_tmp_file2(*args)
 
-def svn_wc_create_tmp_file(*args):
+def svn_wc_create_tmp_file(*args) -> "apr_file_t **":
     """svn_wc_create_tmp_file(char const * path, svn_boolean_t delete_on_close, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_create_tmp_file(*args)
 
-def svn_wc_translated_file2(*args):
+def svn_wc_translated_file2(*args) -> "char const **":
     """svn_wc_translated_file2(char const * src, char const * versioned_file, svn_wc_adm_access_t * adm_access, apr_uint32_t flags, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_translated_file2(*args)
 
-def svn_wc_translated_file(*args):
+def svn_wc_translated_file(*args) -> "char const **":
     """svn_wc_translated_file(char const * vfile, svn_wc_adm_access_t * adm_access, svn_boolean_t force_repair, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_translated_file(*args)
 
-def svn_wc_translated_stream(*args):
+def svn_wc_translated_stream(*args) -> "svn_stream_t **":
     """svn_wc_translated_stream(char const * path, char const * versioned_file, svn_wc_adm_access_t * adm_access, apr_uint32_t flags, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_translated_stream(*args)
 
-def svn_wc_transmit_text_deltas3(*args):
+def svn_wc_transmit_text_deltas3(*args) -> "svn_checksum_t **, svn_checksum_t **":
     """svn_wc_transmit_text_deltas3(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t fulltext, svn_delta_editor_t editor, void * file_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_transmit_text_deltas3(*args)
 
-def svn_wc_transmit_text_deltas2(*args):
+def svn_wc_transmit_text_deltas2(*args) -> "char const **, unsigned char [ANY]":
     """svn_wc_transmit_text_deltas2(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t fulltext, svn_delta_editor_t editor, void * file_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_transmit_text_deltas2(*args)
 
-def svn_wc_transmit_text_deltas(*args):
+def svn_wc_transmit_text_deltas(*args) -> "char const **":
     """svn_wc_transmit_text_deltas(char const * path, svn_wc_adm_access_t * adm_access, svn_boolean_t fulltext, svn_delta_editor_t editor, void * file_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_transmit_text_deltas(*args)
 
-def svn_wc_transmit_prop_deltas2(*args):
+def svn_wc_transmit_prop_deltas2(*args) -> "svn_error_t *":
     """svn_wc_transmit_prop_deltas2(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_delta_editor_t editor, void * baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_transmit_prop_deltas2(*args)
 
-def svn_wc_transmit_prop_deltas(*args):
+def svn_wc_transmit_prop_deltas(*args) -> "char const **":
     """svn_wc_transmit_prop_deltas(char const * path, svn_wc_adm_access_t * adm_access, svn_wc_entry_t entry, svn_delta_editor_t editor, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_transmit_prop_deltas(*args)
 
-def svn_wc_get_default_ignores(*args):
+def svn_wc_get_default_ignores(*args) -> "apr_array_header_t **":
     """svn_wc_get_default_ignores(apr_hash_t config, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_default_ignores(*args)
 
-def svn_wc_get_ignores2(*args):
+def svn_wc_get_ignores2(*args) -> "apr_array_header_t **":
     """svn_wc_get_ignores2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_hash_t config, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_ignores2(*args)
 
-def svn_wc_get_ignores(*args):
+def svn_wc_get_ignores(*args) -> "apr_array_header_t **":
     """svn_wc_get_ignores(apr_hash_t config, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_get_ignores(*args)
 
-def svn_wc_match_ignore_list(*args):
+def svn_wc_match_ignore_list(*args) -> "svn_boolean_t":
     """svn_wc_match_ignore_list(char const * str, apr_array_header_t list, apr_pool_t pool) -> svn_boolean_t"""
     return _wc.svn_wc_match_ignore_list(*args)
 
-def svn_wc_add_lock2(*args):
+def svn_wc_add_lock2(*args) -> "svn_error_t *":
     """svn_wc_add_lock2(svn_wc_context_t * wc_ctx, char const * abspath, svn_lock_t lock, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_add_lock2(*args)
 
-def svn_wc_add_lock(*args):
+def svn_wc_add_lock(*args) -> "svn_error_t *":
     """svn_wc_add_lock(char const * path, svn_lock_t lock, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_add_lock(*args)
 
-def svn_wc_remove_lock2(*args):
+def svn_wc_remove_lock2(*args) -> "svn_error_t *":
     """svn_wc_remove_lock2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_remove_lock2(*args)
 
-def svn_wc_remove_lock(*args):
+def svn_wc_remove_lock(*args) -> "svn_error_t *":
     """svn_wc_remove_lock(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_remove_lock(*args)
-class svn_wc_revision_status_t:
+class svn_wc_revision_status_t(object):
     """Proxy of C svn_wc_revision_status_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_revision_status_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_revision_status_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    __swig_setmethods__["min_rev"] = _wc.svn_wc_revision_status_t_min_rev_set
-    __swig_getmethods__["min_rev"] = _wc.svn_wc_revision_status_t_min_rev_get
-    __swig_setmethods__["max_rev"] = _wc.svn_wc_revision_status_t_max_rev_set
-    __swig_getmethods__["max_rev"] = _wc.svn_wc_revision_status_t_max_rev_get
-    __swig_setmethods__["switched"] = _wc.svn_wc_revision_status_t_switched_set
-    __swig_getmethods__["switched"] = _wc.svn_wc_revision_status_t_switched_get
-    __swig_setmethods__["modified"] = _wc.svn_wc_revision_status_t_modified_set
-    __swig_getmethods__["modified"] = _wc.svn_wc_revision_status_t_modified_get
-    __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
+    min_rev = _swig_property(_wc.svn_wc_revision_status_t_min_rev_get, _wc.svn_wc_revision_status_t_min_rev_set)
+    max_rev = _swig_property(_wc.svn_wc_revision_status_t_max_rev_get, _wc.svn_wc_revision_status_t_max_rev_set)
+    switched = _swig_property(_wc.svn_wc_revision_status_t_switched_get, _wc.svn_wc_revision_status_t_switched_set)
+    modified = _swig_property(_wc.svn_wc_revision_status_t_modified_get, _wc.svn_wc_revision_status_t_modified_set)
+    sparse_checkout = _swig_property(_wc.svn_wc_revision_status_t_sparse_checkout_get, _wc.svn_wc_revision_status_t_sparse_checkout_set)
     def set_parent_pool(self, parent_pool=None):
       """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
@@ -2684,23 +3017,57 @@ class svn_wc_revision_status_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2710,7 +3077,7 @@ class svn_wc_revision_status_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __init__(self):
@@ -2726,52 +3093,49 @@ svn_wc_revision_status_t_swigregister = _wc.svn_wc_revision_status_t_swigregiste
 svn_wc_revision_status_t_swigregister(svn_wc_revision_status_t)
 
 
-def svn_wc_revision_status2(*args):
+def svn_wc_revision_status2(*args) -> "svn_wc_revision_status_t **":
     """svn_wc_revision_status2(svn_wc_context_t * wc_ctx, char const * local_abspath, char const * trail_url, svn_boolean_t committed, svn_cancel_func_t cancel_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_revision_status2(*args)
 
-def svn_wc_revision_status(*args):
+def svn_wc_revision_status(*args) -> "svn_wc_revision_status_t **":
     """svn_wc_revision_status(char const * wc_path, char const * trail_url, svn_boolean_t committed, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_revision_status(*args)
 
-def svn_wc_set_changelist2(*args):
+def svn_wc_set_changelist2(*args) -> "svn_error_t *":
     """svn_wc_set_changelist2(svn_wc_context_t * wc_ctx, char const * local_abspath, char const * changelist, svn_depth_t depth, apr_array_header_t changelist_filter, 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_set_changelist2(*args)
 
-def svn_wc_set_changelist(*args):
+def svn_wc_set_changelist(*args) -> "svn_error_t *":
     """svn_wc_set_changelist(char const * path, char const * changelist, svn_wc_adm_access_t * adm_access, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_set_changelist(*args)
 
-def svn_wc_get_changelists(*args):
+def svn_wc_get_changelists(*args) -> "svn_error_t *":
     """svn_wc_get_changelists(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, apr_array_header_t changelist_filter, svn_changelist_receiver_t callback_func, void * callback_baton, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_get_changelists(*args)
 
-def svn_wc_crop_tree2(*args):
+def svn_wc_crop_tree2(*args) -> "svn_error_t *":
     """svn_wc_crop_tree2(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, 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_crop_tree2(*args)
 
-def svn_wc_crop_tree(*args):
+def svn_wc_crop_tree(*args) -> "svn_error_t *":
     """svn_wc_crop_tree(svn_wc_adm_access_t * anchor, char const * target, svn_depth_t depth, svn_wc_notify_func2_t notify_func, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_crop_tree(*args)
 
-def svn_wc_exclude(*args):
+def svn_wc_exclude(*args) -> "svn_error_t *":
     """svn_wc_exclude(svn_wc_context_t * wc_ctx, char const * local_abspath, 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_exclude(*args)
 
-def svn_wc_read_kind2(*args):
+def svn_wc_read_kind2(*args) -> "svn_node_kind_t *":
     """svn_wc_read_kind2(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t show_deleted, svn_boolean_t show_hidden, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_read_kind2(*args)
 
-def svn_wc_read_kind(*args):
+def svn_wc_read_kind(*args) -> "svn_node_kind_t *":
     """svn_wc_read_kind(svn_wc_context_t * wc_ctx, char const * abspath, svn_boolean_t show_hidden, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_read_kind(*args)
-class svn_wc_context_t:
+class svn_wc_context_t(object):
     """Proxy of C svn_wc_context_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_context_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_context_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2790,23 +3154,57 @@ class svn_wc_context_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2816,18 +3214,15 @@ class svn_wc_context_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_wc_context_t_swigregister = _wc.svn_wc_context_t_swigregister
 svn_wc_context_t_swigregister(svn_wc_context_t)
 
-class svn_wc_adm_access_t:
+class svn_wc_adm_access_t(object):
     """Proxy of C svn_wc_adm_access_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_adm_access_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_adm_access_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2846,23 +3241,57 @@ class svn_wc_adm_access_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2872,18 +3301,15 @@ class svn_wc_adm_access_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_wc_adm_access_t_swigregister = _wc.svn_wc_adm_access_t_swigregister
 svn_wc_adm_access_t_swigregister(svn_wc_adm_access_t)
 
-class svn_wc_traversal_info_t:
+class svn_wc_traversal_info_t(object):
     """Proxy of C svn_wc_traversal_info_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_traversal_info_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_traversal_info_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2902,23 +3328,57 @@ class svn_wc_traversal_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2928,18 +3388,15 @@ class svn_wc_traversal_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_wc_traversal_info_t_swigregister = _wc.svn_wc_traversal_info_t_swigregister
 svn_wc_traversal_info_t_swigregister(svn_wc_traversal_info_t)
 
-class svn_wc_committed_queue_t:
+class svn_wc_committed_queue_t(object):
     """Proxy of C svn_wc_committed_queue_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_committed_queue_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_committed_queue_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -2958,23 +3415,57 @@ class svn_wc_committed_queue_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -2984,214 +3475,211 @@ class svn_wc_committed_queue_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 svn_wc_committed_queue_t_swigregister = _wc.svn_wc_committed_queue_t_swigregister
 svn_wc_committed_queue_t_swigregister(svn_wc_committed_queue_t)
 
 
-def svn_wc_diff_callbacks4_invoke_file_opened(*args):
+def svn_wc_diff_callbacks4_invoke_file_opened(*args) -> "svn_boolean_t *, svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_file_opened(svn_wc_diff_callbacks4_t _obj, char const * path, svn_revnum_t rev, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_file_opened(*args)
 
-def svn_wc_diff_callbacks4_invoke_file_changed(*args):
+def svn_wc_diff_callbacks4_invoke_file_changed(*args) -> "svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_file_changed(svn_wc_diff_callbacks4_t _obj, svn_wc_notify_state_t * contentstate, svn_wc_notify_state_t * propstate, char const * path, char const * tmpfile1, char const * tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, char const * mimetype1, char const * mimetype2, apr_array_header_t propchanges, apr_hash_t originalprops, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_file_changed(*args)
 
-def svn_wc_diff_callbacks4_invoke_file_added(*args):
+def svn_wc_diff_callbacks4_invoke_file_added(*args) -> "svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_file_added(svn_wc_diff_callbacks4_t _obj, svn_wc_notify_state_t * contentstate, svn_wc_notify_state_t * propstate, char const * path, char const * tmpfile1, char const * tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, char const * mimetype1, char const * mimetype2, char const * copyfrom_path, svn_revnum_t copyfrom_revision, apr_array_header_t propchanges, apr_hash_t originalprops, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_file_added(*args)
 
-def svn_wc_diff_callbacks4_invoke_file_deleted(*args):
+def svn_wc_diff_callbacks4_invoke_file_deleted(*args) -> "svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_file_deleted(svn_wc_diff_callbacks4_t _obj, svn_wc_notify_state_t * state, char const * path, char const * tmpfile1, char const * tmpfile2, char const * mimetype1, char const * mimetype2, apr_hash_t originalprops, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_file_deleted(*args)
 
-def svn_wc_diff_callbacks4_invoke_dir_deleted(*args):
+def svn_wc_diff_callbacks4_invoke_dir_deleted(*args) -> "svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_dir_deleted(svn_wc_diff_callbacks4_t _obj, svn_wc_notify_state_t * state, char const * path, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_dir_deleted(*args)
 
-def svn_wc_diff_callbacks4_invoke_dir_opened(*args):
+def svn_wc_diff_callbacks4_invoke_dir_opened(*args) -> "svn_boolean_t *, svn_boolean_t *, svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_dir_opened(svn_wc_diff_callbacks4_t _obj, char const * path, svn_revnum_t rev, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_dir_opened(*args)
 
-def svn_wc_diff_callbacks4_invoke_dir_added(*args):
+def svn_wc_diff_callbacks4_invoke_dir_added(*args) -> "svn_boolean_t *, svn_boolean_t *, svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_dir_added(svn_wc_diff_callbacks4_t _obj, svn_wc_notify_state_t * state, char const * path, svn_revnum_t rev, char const * copyfrom_path, svn_revnum_t copyfrom_revision, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_dir_added(*args)
 
-def svn_wc_diff_callbacks4_invoke_dir_props_changed(*args):
+def svn_wc_diff_callbacks4_invoke_dir_props_changed(*args) -> "svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_dir_props_changed(svn_wc_diff_callbacks4_t _obj, svn_wc_notify_state_t * propstate, char const * path, svn_boolean_t dir_was_added, apr_array_header_t propchanges, apr_hash_t original_props, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_dir_props_changed(*args)
 
-def svn_wc_diff_callbacks4_invoke_dir_closed(*args):
+def svn_wc_diff_callbacks4_invoke_dir_closed(*args) -> "svn_boolean_t *":
     """svn_wc_diff_callbacks4_invoke_dir_closed(svn_wc_diff_callbacks4_t _obj, svn_wc_notify_state_t * contentstate, svn_wc_notify_state_t * propstate, char const * path, svn_boolean_t dir_was_added, void * diff_baton, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks4_invoke_dir_closed(*args)
 
-def svn_wc_diff_callbacks3_invoke_file_changed(_obj, adm_access, contentstate, propstate, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, propchanges, originalprops, diff_baton):
+def svn_wc_diff_callbacks3_invoke_file_changed(_obj: 'svn_wc_diff_callbacks3_t', adm_access: 'svn_wc_adm_access_t *', contentstate: 'svn_wc_notify_state_t *', propstate: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', rev1: 'svn_revnum_t', rev2: 'svn_revnum_t', mimetype1: 'char const *', mimetype2: 'char const *', propchanges: 'apr_array_header_t', originalprops: 'apr_hash_t', diff_baton: 'void *') -> "svn_boolean_t *":
     """svn_wc_diff_callbacks3_invoke_file_changed(svn_wc_diff_callbacks3_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * contentstate, svn_wc_notify_state_t * propstate, char const * path, char const * tmpfile1, char const * tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, char const * mimetype1, char const * mimetype2, apr_array_header_t propchanges, apr_hash_t originalprops, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks3_invoke_file_changed(_obj, adm_access, contentstate, propstate, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, propchanges, originalprops, diff_baton)
 
-def svn_wc_diff_callbacks3_invoke_file_added(_obj, adm_access, contentstate, propstate, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, propchanges, originalprops, diff_baton):
+def svn_wc_diff_callbacks3_invoke_file_added(_obj: 'svn_wc_diff_callbacks3_t', adm_access: 'svn_wc_adm_access_t *', contentstate: 'svn_wc_notify_state_t *', propstate: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', rev1: 'svn_revnum_t', rev2: 'svn_revnum_t', mimetype1: 'char const *', mimetype2: 'char const *', propchanges: 'apr_array_header_t', originalprops: 'apr_hash_t', diff_baton: 'void *') -> "svn_boolean_t *":
     """svn_wc_diff_callbacks3_invoke_file_added(svn_wc_diff_callbacks3_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * contentstate, svn_wc_notify_state_t * propstate, char const * path, char const * tmpfile1, char const * tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, char const * mimetype1, char const * mimetype2, apr_array_header_t propchanges, apr_hash_t originalprops, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks3_invoke_file_added(_obj, adm_access, contentstate, propstate, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, propchanges, originalprops, diff_baton)
 
-def svn_wc_diff_callbacks3_invoke_file_deleted(_obj, adm_access, state, path, tmpfile1, tmpfile2, mimetype1, mimetype2, originalprops, diff_baton):
+def svn_wc_diff_callbacks3_invoke_file_deleted(_obj: 'svn_wc_diff_callbacks3_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', mimetype1: 'char const *', mimetype2: 'char const *', originalprops: 'apr_hash_t', diff_baton: 'void *') -> "svn_boolean_t *":
     """svn_wc_diff_callbacks3_invoke_file_deleted(svn_wc_diff_callbacks3_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, char const * tmpfile1, char const * tmpfile2, char const * mimetype1, char const * mimetype2, apr_hash_t originalprops, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks3_invoke_file_deleted(_obj, adm_access, state, path, tmpfile1, tmpfile2, mimetype1, mimetype2, originalprops, diff_baton)
 
-def svn_wc_diff_callbacks3_invoke_dir_added(_obj, adm_access, state, path, rev, diff_baton):
+def svn_wc_diff_callbacks3_invoke_dir_added(_obj: 'svn_wc_diff_callbacks3_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', rev: 'svn_revnum_t', diff_baton: 'void *') -> "svn_boolean_t *":
     """svn_wc_diff_callbacks3_invoke_dir_added(svn_wc_diff_callbacks3_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, svn_revnum_t rev, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks3_invoke_dir_added(_obj, adm_access, state, path, rev, diff_baton)
 
-def svn_wc_diff_callbacks3_invoke_dir_deleted(_obj, adm_access, state, path, diff_baton):
+def svn_wc_diff_callbacks3_invoke_dir_deleted(_obj: 'svn_wc_diff_callbacks3_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', diff_baton: 'void *') -> "svn_boolean_t *":
     """svn_wc_diff_callbacks3_invoke_dir_deleted(svn_wc_diff_callbacks3_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks3_invoke_dir_deleted(_obj, adm_access, state, path, diff_baton)
 
-def svn_wc_diff_callbacks3_invoke_dir_props_changed(_obj, adm_access, propstate, path, propchanges, original_props, diff_baton):
+def svn_wc_diff_callbacks3_invoke_dir_props_changed(_obj: 'svn_wc_diff_callbacks3_t', adm_access: 'svn_wc_adm_access_t *', propstate: 'svn_wc_notify_state_t *', path: 'char const *', propchanges: 'apr_array_header_t', original_props: 'apr_hash_t', diff_baton: 'void *') -> "svn_boolean_t *":
     """svn_wc_diff_callbacks3_invoke_dir_props_changed(svn_wc_diff_callbacks3_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * propstate, char const * path, apr_array_header_t propchanges, apr_hash_t original_props, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks3_invoke_dir_props_changed(_obj, adm_access, propstate, path, propchanges, original_props, diff_baton)
 
-def svn_wc_diff_callbacks3_invoke_dir_opened(_obj, adm_access, path, rev, diff_baton):
+def svn_wc_diff_callbacks3_invoke_dir_opened(_obj: 'svn_wc_diff_callbacks3_t', adm_access: 'svn_wc_adm_access_t *', path: 'char const *', rev: 'svn_revnum_t', diff_baton: 'void *') -> "svn_boolean_t *":
     """svn_wc_diff_callbacks3_invoke_dir_opened(svn_wc_diff_callbacks3_t _obj, svn_wc_adm_access_t * adm_access, char const * path, svn_revnum_t rev, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks3_invoke_dir_opened(_obj, adm_access, path, rev, diff_baton)
 
-def svn_wc_diff_callbacks3_invoke_dir_closed(_obj, adm_access, contentstate, propstate, path, diff_baton):
+def svn_wc_diff_callbacks3_invoke_dir_closed(_obj: 'svn_wc_diff_callbacks3_t', adm_access: 'svn_wc_adm_access_t *', contentstate: 'svn_wc_notify_state_t *', propstate: 'svn_wc_notify_state_t *', path: 'char const *', diff_baton: 'void *') -> "svn_boolean_t *":
     """svn_wc_diff_callbacks3_invoke_dir_closed(svn_wc_diff_callbacks3_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * contentstate, svn_wc_notify_state_t * propstate, char const * path, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks3_invoke_dir_closed(_obj, adm_access, contentstate, propstate, path, diff_baton)
 
-def svn_wc_diff_callbacks2_invoke_file_changed(_obj, adm_access, contentstate, propstate, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, propchanges, originalprops, diff_baton):
+def svn_wc_diff_callbacks2_invoke_file_changed(_obj: 'svn_wc_diff_callbacks2_t', adm_access: 'svn_wc_adm_access_t *', contentstate: 'svn_wc_notify_state_t *', propstate: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', rev1: 'svn_revnum_t', rev2: 'svn_revnum_t', mimetype1: 'char const *', mimetype2: 'char const *', propchanges: 'apr_array_header_t', originalprops: 'apr_hash_t', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks2_invoke_file_changed(svn_wc_diff_callbacks2_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * contentstate, svn_wc_notify_state_t * propstate, char const * path, char const * tmpfile1, char const * tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, char const * mimetype1, char const * mimetype2, apr_array_header_t propchanges, apr_hash_t originalprops, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks2_invoke_file_changed(_obj, adm_access, contentstate, propstate, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, propchanges, originalprops, diff_baton)
 
-def svn_wc_diff_callbacks2_invoke_file_added(_obj, adm_access, contentstate, propstate, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, propchanges, originalprops, diff_baton):
+def svn_wc_diff_callbacks2_invoke_file_added(_obj: 'svn_wc_diff_callbacks2_t', adm_access: 'svn_wc_adm_access_t *', contentstate: 'svn_wc_notify_state_t *', propstate: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', rev1: 'svn_revnum_t', rev2: 'svn_revnum_t', mimetype1: 'char const *', mimetype2: 'char const *', propchanges: 'apr_array_header_t', originalprops: 'apr_hash_t', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks2_invoke_file_added(svn_wc_diff_callbacks2_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * contentstate, svn_wc_notify_state_t * propstate, char const * path, char const * tmpfile1, char const * tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, char const * mimetype1, char const * mimetype2, apr_array_header_t propchanges, apr_hash_t originalprops, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks2_invoke_file_added(_obj, adm_access, contentstate, propstate, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, propchanges, originalprops, diff_baton)
 
-def svn_wc_diff_callbacks2_invoke_file_deleted(_obj, adm_access, state, path, tmpfile1, tmpfile2, mimetype1, mimetype2, originalprops, diff_baton):
+def svn_wc_diff_callbacks2_invoke_file_deleted(_obj: 'svn_wc_diff_callbacks2_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', mimetype1: 'char const *', mimetype2: 'char const *', originalprops: 'apr_hash_t', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks2_invoke_file_deleted(svn_wc_diff_callbacks2_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, char const * tmpfile1, char const * tmpfile2, char const * mimetype1, char const * mimetype2, apr_hash_t originalprops, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks2_invoke_file_deleted(_obj, adm_access, state, path, tmpfile1, tmpfile2, mimetype1, mimetype2, originalprops, diff_baton)
 
-def svn_wc_diff_callbacks2_invoke_dir_added(_obj, adm_access, state, path, rev, diff_baton):
+def svn_wc_diff_callbacks2_invoke_dir_added(_obj: 'svn_wc_diff_callbacks2_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', rev: 'svn_revnum_t', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks2_invoke_dir_added(svn_wc_diff_callbacks2_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, svn_revnum_t rev, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks2_invoke_dir_added(_obj, adm_access, state, path, rev, diff_baton)
 
-def svn_wc_diff_callbacks2_invoke_dir_deleted(_obj, adm_access, state, path, diff_baton):
+def svn_wc_diff_callbacks2_invoke_dir_deleted(_obj: 'svn_wc_diff_callbacks2_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks2_invoke_dir_deleted(svn_wc_diff_callbacks2_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks2_invoke_dir_deleted(_obj, adm_access, state, path, diff_baton)
 
-def svn_wc_diff_callbacks2_invoke_dir_props_changed(_obj, adm_access, state, path, propchanges, original_props, diff_baton):
+def svn_wc_diff_callbacks2_invoke_dir_props_changed(_obj: 'svn_wc_diff_callbacks2_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', propchanges: 'apr_array_header_t', original_props: 'apr_hash_t', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks2_invoke_dir_props_changed(svn_wc_diff_callbacks2_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, apr_array_header_t propchanges, apr_hash_t original_props, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks2_invoke_dir_props_changed(_obj, adm_access, state, path, propchanges, original_props, diff_baton)
 
-def svn_wc_diff_callbacks_invoke_file_changed(_obj, adm_access, state, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, diff_baton):
+def svn_wc_diff_callbacks_invoke_file_changed(_obj: 'svn_wc_diff_callbacks_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', rev1: 'svn_revnum_t', rev2: 'svn_revnum_t', mimetype1: 'char const *', mimetype2: 'char const *', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks_invoke_file_changed(svn_wc_diff_callbacks_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, char const * tmpfile1, char const * tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, char const * mimetype1, char const * mimetype2, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks_invoke_file_changed(_obj, adm_access, state, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, diff_baton)
 
-def svn_wc_diff_callbacks_invoke_file_added(_obj, adm_access, state, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, diff_baton):
+def svn_wc_diff_callbacks_invoke_file_added(_obj: 'svn_wc_diff_callbacks_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', rev1: 'svn_revnum_t', rev2: 'svn_revnum_t', mimetype1: 'char const *', mimetype2: 'char const *', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks_invoke_file_added(svn_wc_diff_callbacks_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, char const * tmpfile1, char const * tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, char const * mimetype1, char const * mimetype2, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks_invoke_file_added(_obj, adm_access, state, path, tmpfile1, tmpfile2, rev1, rev2, mimetype1, mimetype2, diff_baton)
 
-def svn_wc_diff_callbacks_invoke_file_deleted(_obj, adm_access, state, path, tmpfile1, tmpfile2, mimetype1, mimetype2, diff_baton):
+def svn_wc_diff_callbacks_invoke_file_deleted(_obj: 'svn_wc_diff_callbacks_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', tmpfile1: 'char const *', tmpfile2: 'char const *', mimetype1: 'char const *', mimetype2: 'char const *', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks_invoke_file_deleted(svn_wc_diff_callbacks_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, char const * tmpfile1, char const * tmpfile2, char const * mimetype1, char const * mimetype2, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks_invoke_file_deleted(_obj, adm_access, state, path, tmpfile1, tmpfile2, mimetype1, mimetype2, diff_baton)
 
-def svn_wc_diff_callbacks_invoke_dir_added(_obj, adm_access, state, path, rev, diff_baton):
+def svn_wc_diff_callbacks_invoke_dir_added(_obj: 'svn_wc_diff_callbacks_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', rev: 'svn_revnum_t', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks_invoke_dir_added(svn_wc_diff_callbacks_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, svn_revnum_t rev, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks_invoke_dir_added(_obj, adm_access, state, path, rev, diff_baton)
 
-def svn_wc_diff_callbacks_invoke_dir_deleted(_obj, adm_access, state, path, diff_baton):
+def svn_wc_diff_callbacks_invoke_dir_deleted(_obj: 'svn_wc_diff_callbacks_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks_invoke_dir_deleted(svn_wc_diff_callbacks_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks_invoke_dir_deleted(_obj, adm_access, state, path, diff_baton)
 
-def svn_wc_diff_callbacks_invoke_props_changed(_obj, adm_access, state, path, propchanges, original_props, diff_baton):
+def svn_wc_diff_callbacks_invoke_props_changed(_obj: 'svn_wc_diff_callbacks_t', adm_access: 'svn_wc_adm_access_t *', state: 'svn_wc_notify_state_t *', path: 'char const *', propchanges: 'apr_array_header_t', original_props: 'apr_hash_t', diff_baton: 'void *') -> "svn_error_t *":
     """svn_wc_diff_callbacks_invoke_props_changed(svn_wc_diff_callbacks_t _obj, svn_wc_adm_access_t * adm_access, svn_wc_notify_state_t * state, char const * path, apr_array_header_t propchanges, apr_hash_t original_props, void * diff_baton) -> svn_error_t"""
     return _wc.svn_wc_diff_callbacks_invoke_props_changed(_obj, adm_access, state, path, propchanges, original_props, diff_baton)
 
-def svn_wc_entry_callbacks2_invoke_found_entry(*args):
+def svn_wc_entry_callbacks2_invoke_found_entry(*args) -> "svn_error_t *":
     """svn_wc_entry_callbacks2_invoke_found_entry(svn_wc_entry_callbacks2_t _obj, char const * path, svn_wc_entry_t entry, void * walk_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_entry_callbacks2_invoke_found_entry(*args)
 
-def svn_wc_entry_callbacks2_invoke_handle_error(*args):
+def svn_wc_entry_callbacks2_invoke_handle_error(*args) -> "svn_error_t *":
     """svn_wc_entry_callbacks2_invoke_handle_error(svn_wc_entry_callbacks2_t _obj, char const * path, svn_error_t err, void * walk_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_entry_callbacks2_invoke_handle_error(*args)
 
-def svn_wc_entry_callbacks_invoke_found_entry(*args):
+def svn_wc_entry_callbacks_invoke_found_entry(*args) -> "svn_error_t *":
     """svn_wc_entry_callbacks_invoke_found_entry(svn_wc_entry_callbacks_t _obj, char const * path, svn_wc_entry_t entry, void * walk_baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_entry_callbacks_invoke_found_entry(*args)
 
-def svn_wc_invoke_external_update(*args):
+def svn_wc_invoke_external_update(*args) -> "svn_error_t *":
     """svn_wc_invoke_external_update(svn_wc_external_update_t _obj, void * baton, char const * local_abspath, svn_string_t const * old_val, svn_string_t const * new_val, svn_depth_t depth, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_external_update(*args)
 
-def svn_wc_invoke_notify_func2(*args):
+def svn_wc_invoke_notify_func2(*args) -> "void":
     """svn_wc_invoke_notify_func2(svn_wc_notify_func2_t _obj, void * baton, svn_wc_notify_t notify, apr_pool_t pool)"""
     return _wc.svn_wc_invoke_notify_func2(*args)
 
-def svn_wc_invoke_notify_func(_obj, baton, path, action, kind, mime_type, content_state, prop_state, revision):
+def svn_wc_invoke_notify_func(_obj: 'svn_wc_notify_func_t', baton: 'void *', path: 'char const *', action: 'svn_wc_notify_action_t', kind: 'svn_node_kind_t', mime_type: 'char const *', content_state: 'svn_wc_notify_state_t', prop_state: 'svn_wc_notify_state_t', revision: 'svn_revnum_t') -> "void":
     """svn_wc_invoke_notify_func(svn_wc_notify_func_t _obj, void * baton, char const * path, svn_wc_notify_action_t action, svn_node_kind_t kind, char const * mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision)"""
     return _wc.svn_wc_invoke_notify_func(_obj, baton, path, action, kind, mime_type, content_state, prop_state, revision)
 
-def svn_wc_invoke_conflict_resolver_func2(*args):
+def svn_wc_invoke_conflict_resolver_func2(*args) -> "SWIGTYPE **":
     """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)
 
-def svn_wc_invoke_conflict_resolver_func(*args):
+def svn_wc_invoke_conflict_resolver_func(*args) -> "SWIGTYPE **":
     """svn_wc_invoke_conflict_resolver_func(svn_wc_conflict_resolver_func_t _obj, svn_wc_conflict_description_t description, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_conflict_resolver_func(*args)
 
-def svn_wc_invoke_status_func4(*args):
+def svn_wc_invoke_status_func4(*args) -> "svn_error_t *":
     """svn_wc_invoke_status_func4(svn_wc_status_func4_t _obj, void * baton, char const * local_abspath, svn_wc_status3_t status, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_status_func4(*args)
 
-def svn_wc_invoke_status_func3(*args):
+def svn_wc_invoke_status_func3(*args) -> "svn_error_t *":
     """svn_wc_invoke_status_func3(svn_wc_status_func3_t _obj, void * baton, char const * path, svn_wc_status2_t status, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_status_func3(*args)
 
-def svn_wc_invoke_status_func2(_obj, baton, path, status):
+def svn_wc_invoke_status_func2(_obj: 'svn_wc_status_func2_t', baton: 'void *', path: 'char const *', status: 'svn_wc_status2_t') -> "void":
     """svn_wc_invoke_status_func2(svn_wc_status_func2_t _obj, void * baton, char const * path, svn_wc_status2_t status)"""
     return _wc.svn_wc_invoke_status_func2(_obj, baton, path, status)
 
-def svn_wc_invoke_status_func(_obj, baton, path, status):
+def svn_wc_invoke_status_func(_obj: 'svn_wc_status_func_t', baton: 'void *', path: 'char const *', status: 'svn_wc_status_t') -> "void":
     """svn_wc_invoke_status_func(svn_wc_status_func_t _obj, void * baton, char const * path, svn_wc_status_t status)"""
     return _wc.svn_wc_invoke_status_func(_obj, baton, path, status)
 
-def svn_wc_invoke_get_file(*args):
+def svn_wc_invoke_get_file(*args) -> "svn_revnum_t *, apr_hash_t **":
     """svn_wc_invoke_get_file(svn_wc_get_file_t _obj, void * baton, char const * path, svn_revnum_t revision, svn_stream_t * stream, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_get_file(*args)
 
-def svn_wc_invoke_dirents_func(*args):
+def svn_wc_invoke_dirents_func(*args) -> "apr_hash_t **":
     """svn_wc_invoke_dirents_func(svn_wc_dirents_func_t _obj, void * baton, char const * repos_root_url, char const * repos_relpath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_dirents_func(*args)
 
-def svn_wc_invoke_canonicalize_svn_prop_get_file(*args):
+def svn_wc_invoke_canonicalize_svn_prop_get_file(*args) -> "svn_string_t **":
     """svn_wc_invoke_canonicalize_svn_prop_get_file(svn_wc_canonicalize_svn_prop_get_file_t _obj, svn_stream_t * stream, void * baton, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_canonicalize_svn_prop_get_file(*args)
 
-def svn_wc_invoke_upgrade_get_repos_info(*args):
+def svn_wc_invoke_upgrade_get_repos_info(*args) -> "char const **, char const **":
     """svn_wc_invoke_upgrade_get_repos_info(svn_wc_upgrade_get_repos_info_t _obj, void * baton, char const * url, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_upgrade_get_repos_info(*args)
 
-def svn_wc_invoke_relocation_validator3(*args):
+def svn_wc_invoke_relocation_validator3(*args) -> "svn_error_t *":
     """svn_wc_invoke_relocation_validator3(svn_wc_relocation_validator3_t _obj, void * baton, char const * uuid, char const * url, char const * root_url, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_relocation_validator3(*args)
 
-def svn_wc_invoke_relocation_validator2(*args):
+def svn_wc_invoke_relocation_validator2(*args) -> "svn_error_t *":
     """svn_wc_invoke_relocation_validator2(svn_wc_relocation_validator2_t _obj, void * baton, char const * uuid, char const * url, svn_boolean_t root, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_invoke_relocation_validator2(*args)
 
-def svn_wc_invoke_relocation_validator(_obj, baton, uuid, url):
+def svn_wc_invoke_relocation_validator(_obj: 'svn_wc_relocation_validator_t', baton: 'void *', uuid: 'char const *', url: 'char const *') -> "svn_error_t *":
     """svn_wc_invoke_relocation_validator(svn_wc_relocation_validator_t _obj, void * baton, char const * uuid, char const * url) -> svn_error_t"""
     return _wc.svn_wc_invoke_relocation_validator(_obj, baton, uuid, url)
 
-def svn_changelist_invoke_receiver(*args):
+def svn_changelist_invoke_receiver(*args) -> "svn_error_t *":
     """svn_changelist_invoke_receiver(svn_changelist_receiver_t _obj, void * baton, char const * path, char const * changelist, apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_changelist_invoke_receiver(*args)
-class svn_wc_external_update_t:
+class svn_wc_external_update_t(object):
     """Proxy of C svn_wc_external_update_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_external_update_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_external_update_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3210,23 +3698,57 @@ class svn_wc_external_update_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3236,7 +3758,7 @@ class svn_wc_external_update_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3245,13 +3767,10 @@ class svn_wc_external_update_t:
 svn_wc_external_update_t_swigregister = _wc.svn_wc_external_update_t_swigregister
 svn_wc_external_update_t_swigregister(svn_wc_external_update_t)
 
-class svn_wc_notify_func2_t:
+class svn_wc_notify_func2_t(object):
     """Proxy of C svn_wc_notify_func2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_notify_func2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_notify_func2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3270,23 +3789,57 @@ class svn_wc_notify_func2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3296,7 +3849,7 @@ class svn_wc_notify_func2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3305,13 +3858,10 @@ class svn_wc_notify_func2_t:
 svn_wc_notify_func2_t_swigregister = _wc.svn_wc_notify_func2_t_swigregister
 svn_wc_notify_func2_t_swigregister(svn_wc_notify_func2_t)
 
-class svn_wc_notify_func_t:
+class svn_wc_notify_func_t(object):
     """Proxy of C svn_wc_notify_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_notify_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_notify_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3330,23 +3880,57 @@ class svn_wc_notify_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3356,7 +3940,7 @@ class svn_wc_notify_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3365,13 +3949,10 @@ class svn_wc_notify_func_t:
 svn_wc_notify_func_t_swigregister = _wc.svn_wc_notify_func_t_swigregister
 svn_wc_notify_func_t_swigregister(svn_wc_notify_func_t)
 
-class svn_wc_conflict_resolver_func2_t:
+class svn_wc_conflict_resolver_func2_t(object):
     """Proxy of C svn_wc_conflict_resolver_func2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_conflict_resolver_func2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_conflict_resolver_func2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3390,23 +3971,57 @@ class svn_wc_conflict_resolver_func2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3416,7 +4031,7 @@ class svn_wc_conflict_resolver_func2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3425,13 +4040,10 @@ class svn_wc_conflict_resolver_func2_t:
 svn_wc_conflict_resolver_func2_t_swigregister = _wc.svn_wc_conflict_resolver_func2_t_swigregister
 svn_wc_conflict_resolver_func2_t_swigregister(svn_wc_conflict_resolver_func2_t)
 
-class svn_wc_conflict_resolver_func_t:
+class svn_wc_conflict_resolver_func_t(object):
     """Proxy of C svn_wc_conflict_resolver_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_conflict_resolver_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_conflict_resolver_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3450,23 +4062,57 @@ class svn_wc_conflict_resolver_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3476,7 +4122,7 @@ class svn_wc_conflict_resolver_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3485,13 +4131,10 @@ class svn_wc_conflict_resolver_func_t:
 svn_wc_conflict_resolver_func_t_swigregister = _wc.svn_wc_conflict_resolver_func_t_swigregister
 svn_wc_conflict_resolver_func_t_swigregister(svn_wc_conflict_resolver_func_t)
 
-class svn_wc_status_func4_t:
+class svn_wc_status_func4_t(object):
     """Proxy of C svn_wc_status_func4_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_status_func4_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_status_func4_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3510,23 +4153,57 @@ class svn_wc_status_func4_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3536,7 +4213,7 @@ class svn_wc_status_func4_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3545,13 +4222,10 @@ class svn_wc_status_func4_t:
 svn_wc_status_func4_t_swigregister = _wc.svn_wc_status_func4_t_swigregister
 svn_wc_status_func4_t_swigregister(svn_wc_status_func4_t)
 
-class svn_wc_status_func3_t:
+class svn_wc_status_func3_t(object):
     """Proxy of C svn_wc_status_func3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_status_func3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_status_func3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3570,23 +4244,57 @@ class svn_wc_status_func3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3596,7 +4304,7 @@ class svn_wc_status_func3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3605,13 +4313,10 @@ class svn_wc_status_func3_t:
 svn_wc_status_func3_t_swigregister = _wc.svn_wc_status_func3_t_swigregister
 svn_wc_status_func3_t_swigregister(svn_wc_status_func3_t)
 
-class svn_wc_status_func2_t:
+class svn_wc_status_func2_t(object):
     """Proxy of C svn_wc_status_func2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_status_func2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_status_func2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3630,23 +4335,57 @@ class svn_wc_status_func2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3656,7 +4395,7 @@ class svn_wc_status_func2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3665,13 +4404,10 @@ class svn_wc_status_func2_t:
 svn_wc_status_func2_t_swigregister = _wc.svn_wc_status_func2_t_swigregister
 svn_wc_status_func2_t_swigregister(svn_wc_status_func2_t)
 
-class svn_wc_status_func_t:
+class svn_wc_status_func_t(object):
     """Proxy of C svn_wc_status_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_status_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_status_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3690,23 +4426,57 @@ class svn_wc_status_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3716,7 +4486,7 @@ class svn_wc_status_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3725,13 +4495,10 @@ class svn_wc_status_func_t:
 svn_wc_status_func_t_swigregister = _wc.svn_wc_status_func_t_swigregister
 svn_wc_status_func_t_swigregister(svn_wc_status_func_t)
 
-class svn_wc_get_file_t:
+class svn_wc_get_file_t(object):
     """Proxy of C svn_wc_get_file_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_get_file_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_get_file_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3750,23 +4517,57 @@ class svn_wc_get_file_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3776,7 +4577,7 @@ class svn_wc_get_file_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3785,13 +4586,10 @@ class svn_wc_get_file_t:
 svn_wc_get_file_t_swigregister = _wc.svn_wc_get_file_t_swigregister
 svn_wc_get_file_t_swigregister(svn_wc_get_file_t)
 
-class svn_wc_dirents_func_t:
+class svn_wc_dirents_func_t(object):
     """Proxy of C svn_wc_dirents_func_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_dirents_func_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_dirents_func_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3810,23 +4608,57 @@ class svn_wc_dirents_func_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3836,7 +4668,7 @@ class svn_wc_dirents_func_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3845,13 +4677,10 @@ class svn_wc_dirents_func_t:
 svn_wc_dirents_func_t_swigregister = _wc.svn_wc_dirents_func_t_swigregister
 svn_wc_dirents_func_t_swigregister(svn_wc_dirents_func_t)
 
-class svn_wc_canonicalize_svn_prop_get_file_t:
+class svn_wc_canonicalize_svn_prop_get_file_t(object):
     """Proxy of C svn_wc_canonicalize_svn_prop_get_file_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_canonicalize_svn_prop_get_file_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_canonicalize_svn_prop_get_file_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3870,23 +4699,57 @@ class svn_wc_canonicalize_svn_prop_get_file_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3896,7 +4759,7 @@ class svn_wc_canonicalize_svn_prop_get_file_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3905,13 +4768,10 @@ class svn_wc_canonicalize_svn_prop_get_file_t:
 svn_wc_canonicalize_svn_prop_get_file_t_swigregister = _wc.svn_wc_canonicalize_svn_prop_get_file_t_swigregister
 svn_wc_canonicalize_svn_prop_get_file_t_swigregister(svn_wc_canonicalize_svn_prop_get_file_t)
 
-class svn_wc_upgrade_get_repos_info_t:
+class svn_wc_upgrade_get_repos_info_t(object):
     """Proxy of C svn_wc_upgrade_get_repos_info_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_upgrade_get_repos_info_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_upgrade_get_repos_info_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3930,23 +4790,57 @@ class svn_wc_upgrade_get_repos_info_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -3956,7 +4850,7 @@ class svn_wc_upgrade_get_repos_info_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -3965,13 +4859,10 @@ class svn_wc_upgrade_get_repos_info_t:
 svn_wc_upgrade_get_repos_info_t_swigregister = _wc.svn_wc_upgrade_get_repos_info_t_swigregister
 svn_wc_upgrade_get_repos_info_t_swigregister(svn_wc_upgrade_get_repos_info_t)
 
-class svn_wc_relocation_validator3_t:
+class svn_wc_relocation_validator3_t(object):
     """Proxy of C svn_wc_relocation_validator3_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_relocation_validator3_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_relocation_validator3_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -3990,23 +4881,57 @@ class svn_wc_relocation_validator3_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4016,7 +4941,7 @@ class svn_wc_relocation_validator3_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4025,13 +4950,10 @@ class svn_wc_relocation_validator3_t:
 svn_wc_relocation_validator3_t_swigregister = _wc.svn_wc_relocation_validator3_t_swigregister
 svn_wc_relocation_validator3_t_swigregister(svn_wc_relocation_validator3_t)
 
-class svn_wc_relocation_validator2_t:
+class svn_wc_relocation_validator2_t(object):
     """Proxy of C svn_wc_relocation_validator2_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_relocation_validator2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_relocation_validator2_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4050,23 +4972,57 @@ class svn_wc_relocation_validator2_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4076,7 +5032,7 @@ class svn_wc_relocation_validator2_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4085,13 +5041,10 @@ class svn_wc_relocation_validator2_t:
 svn_wc_relocation_validator2_t_swigregister = _wc.svn_wc_relocation_validator2_t_swigregister
 svn_wc_relocation_validator2_t_swigregister(svn_wc_relocation_validator2_t)
 
-class svn_wc_relocation_validator_t:
+class svn_wc_relocation_validator_t(object):
     """Proxy of C svn_wc_relocation_validator_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_relocation_validator_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_relocation_validator_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4110,23 +5063,57 @@ class svn_wc_relocation_validator_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4136,7 +5123,7 @@ class svn_wc_relocation_validator_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4145,13 +5132,10 @@ class svn_wc_relocation_validator_t:
 svn_wc_relocation_validator_t_swigregister = _wc.svn_wc_relocation_validator_t_swigregister
 svn_wc_relocation_validator_t_swigregister(svn_wc_relocation_validator_t)
 
-class svn_changelist_receiver_t:
+class svn_changelist_receiver_t(object):
     """Proxy of C svn_changelist_receiver_t struct."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_changelist_receiver_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_changelist_receiver_t, name)
+    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
@@ -4170,23 +5154,57 @@ class svn_changelist_receiver_t:
       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))
+    def _retrieve_swig_value(self, name, value):
+    # If we got back a different object than we have cached, we need to copy
+    # all our metadata into it, so that it looks identical to the one
+    # originally set.
+      members = self.__dict__.get('_members')
+      if members is not None and name in members:
+        _copy_metadata_deep(value, members[name])
 
     # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
 
+    # Attribute access must be intercepted to ensure that objects coming from
+    # read attribute access match those that are set with write attribute access.
+    # Specifically the metadata, such as the associated apr_pool object, should
+    # match the originally assigned object.
+    #
+    # For classic classes it is enough to use __getattr__ to intercept swig
+    # derived attributes. However, with new style classes SWIG makes use of
+    # descriptors which mean that __getattr__ is never called. Therefore,
+    # __getattribute__ must be used for the interception.
+
+    if _newclass:
+      def __getattribute__(self, name):
+        """Manage access to all attributes of this object."""
+
+    # Start by mimicing __getattr__ behavior: immediately return __dict__ or
+    # items directly present in __dict__
+        mydict = object.__getattribute__(self, '__dict__')
+
+        if name == "__dict__":
+          return mydict
+
+        if name in mydict:
+          return mydict[name]
+
+        object.__getattribute__(self, 'assert_valid')()
+
+        value = _get_instance_attr(self, name)
+        fn = object.__getattribute__(self, '_retrieve_swig_value')
+        return fn(name, value)
+    else:
+      def __getattr__(self, name):
+        """Get an attribute from this object"""
+        self.assert_valid()
+
+        value = _swig_getattr(self, self.__class__, name)
+
+        return self._retrieve_swig_value(name, value)
+
     def __setattr__(self, name, value):
       """Set an attribute on this object"""
       self.assert_valid()
@@ -4196,7 +5214,7 @@ class svn_changelist_receiver_t:
     # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
-      return _swig_setattr(self, self.__class__, name, value)
+      return _set_instance_attr(self, name, value)
 
 
     def __call__(self, *args):
@@ -4206,7 +5224,7 @@ svn_changelist_receiver_t_swigregister = _wc.svn_changelist_receiver_t_swigregis
 svn_changelist_receiver_t_swigregister(svn_changelist_receiver_t)
 
 
-def svn_wc_swig_init_asp_dot_net_hack(*args):
+def svn_wc_swig_init_asp_dot_net_hack(*args) -> "svn_error_t *":
     """svn_wc_swig_init_asp_dot_net_hack(apr_pool_t pool) -> svn_error_t"""
     return _wc.svn_wc_swig_init_asp_dot_net_hack(*args)
 svn_wc_swig_init_asp_dot_net_hack() 
diff --git a/subversion/bindings/swig/ruby/core.c b/subversion/bindings/swig/ruby/core.c
index 31d68db..68408c9 100644
--- a/subversion/bindings/swig/ruby/core.c
+++ b/subversion/bindings/swig/ruby/core.c
@@ -2130,7 +2130,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2350,7 +2350,7 @@ typedef struct {
 #include "svn_auth.h"
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -20682,9 +20682,6 @@ _wrap_svn_config_get_user_config_path(int argc, VALUE *argv, VALUE self) {
   VALUE _global_svn_swig_rb_pool ;
   apr_pool_t *_global_pool ;
   char *temp1 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
   svn_error_t *result = 0 ;
   VALUE vresult = Qnil;
   
@@ -20704,11 +20701,13 @@ _wrap_svn_config_get_user_config_path(int argc, VALUE *argv, VALUE self) {
       arg2 = StringValuePtr(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_config_get_user_config_path", 3, argv[1] ));
+  {
+    if (NIL_P(argv[1])) {
+      arg3 = NULL;
+    } else {
+      arg3 = StringValuePtr(argv[1]);
+    }
   }
-  arg3 = (char *)(buf3);
   if (argc > 2) {
     
   }
@@ -20733,7 +20732,6 @@ _wrap_svn_config_get_user_config_path(int argc, VALUE *argv, VALUE self) {
       vresult = SWIG_Ruby_AppendOutput(vresult, Qnil);
     }
   }
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
   {
     VALUE target;
     target = _global_vresult_address == &vresult ? self : vresult;
@@ -20743,7 +20741,6 @@ _wrap_svn_config_get_user_config_path(int argc, VALUE *argv, VALUE self) {
   }
   return vresult;
 fail:
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
   {
     VALUE target;
     target = _global_vresult_address == &vresult ? self : vresult;
@@ -28791,13 +28788,7 @@ _wrap_svn_io_file_checksum2(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_io_file_checksum2 arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_io_file_checksum2 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0));
   }
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   {
@@ -30582,22 +30573,10 @@ _wrap_svn_stream_checksummed2(int argc, VALUE *argv, VALUE self) {
   }
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_stream_t, 0 |  0 );
   {
-    /* FIXME: Missing argout typemap: svn_stream_checksummed2 arg 2 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_checksummed2 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_svn_checksum_t, 0));
   }
   {
-    /* FIXME: Missing argout typemap: svn_stream_checksummed2 arg 3 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_checksummed2 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg3, SWIGTYPE_p_svn_checksum_t, 0));
   }
   {
     VALUE target;
@@ -30677,13 +30656,7 @@ _wrap_svn_stream_contents_checksum(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_stream_contents_checksum arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_contents_checksum is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0));
   }
   {
     VALUE target;
@@ -31114,13 +31087,7 @@ _wrap_svn_stream_mark(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_stream_mark arg 2 (svn_stream_mark_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_mark is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_svn_stream_mark_t, 0));
   }
   {
     VALUE target;
@@ -32475,13 +32442,7 @@ _wrap_svn_io_stat_dirent2(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_io_stat_dirent2 arg 1 (svn_io_dirent2_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_io_stat_dirent2 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_io_dirent2_t, 0));
   }
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   {
@@ -32576,13 +32537,7 @@ _wrap_svn_io_stat_dirent(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_io_stat_dirent arg 1 (svn_io_dirent2_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_io_stat_dirent is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_io_dirent2_t, 0));
   }
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   {
@@ -34795,13 +34750,7 @@ _wrap_svn_stream_invoke_mark_fn(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_stream_invoke_mark_fn arg 3 (svn_stream_mark_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_stream_invoke_mark_fn is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg3, SWIGTYPE_p_svn_stream_mark_t, 0));
   }
   {
     VALUE target;
@@ -35776,13 +35725,7 @@ _wrap_svn_checksum_deserialize(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_checksum_deserialize arg 1 (svn_checksum_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_checksum_deserialize is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0));
   }
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   {
@@ -35874,13 +35817,7 @@ _wrap_svn_checksum_parse_hex(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_checksum_parse_hex arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_checksum_parse_hex is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0));
   }
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
   {
@@ -35963,13 +35900,7 @@ _wrap_svn_checksum(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_checksum arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_checksum is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0));
   }
   {
     VALUE target;
@@ -36230,13 +36161,7 @@ _wrap_svn_checksum_final(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_checksum_final arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_checksum_final is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0));
   }
   {
     VALUE target;
@@ -46386,6 +46311,8 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_FS_CORRUPT_PROPLIST", SWIG_From_int((int)(SVN_ERR_FS_CORRUPT_PROPLIST)));
   rb_define_const(mCore, "SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP", SWIG_From_int((int)(SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP)));
   rb_define_const(mCore, "SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE", SWIG_From_int((int)(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE)));
+  rb_define_const(mCore, "SVN_ERR_FS_REP_SHARING_NOT_ALLOWED", SWIG_From_int((int)(SVN_ERR_FS_REP_SHARING_NOT_ALLOWED)));
+  rb_define_const(mCore, "SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED", SWIG_From_int((int)(SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED)));
   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)));
@@ -46816,16 +46743,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)(13)));
+  rb_define_const(mCore, "SVN_VER_MINOR", SWIG_From_int((int)(14)));
   rb_define_const(mCore, "SVN_VER_PATCH", SWIG_From_int((int)(0)));
   rb_define_const(mCore, "SVN_VER_MICRO", SWIG_From_int((int)(0)));
   rb_define_const(mCore, "SVN_VER_LIBRARY", SWIG_From_int((int)(1)));
-  rb_define_const(mCore, "SVN_VER_TAG", SWIG_FromCharPtr(" (r1867053)"));
+  rb_define_const(mCore, "SVN_VER_TAG", SWIG_FromCharPtr(" (r1876290)"));
   rb_define_const(mCore, "SVN_VER_NUMTAG", SWIG_FromCharPtr(""));
-  rb_define_const(mCore, "SVN_VER_REVISION", SWIG_From_int((int)(1867053)));
-  rb_define_const(mCore, "SVN_VER_NUM", SWIG_FromCharPtr("1.13.0"));
-  rb_define_const(mCore, "SVN_VER_NUMBER", SWIG_FromCharPtr("1.13.0"));
-  rb_define_const(mCore, "SVN_VERSION", SWIG_FromCharPtr("1.13.0 (r1867053)"));
+  rb_define_const(mCore, "SVN_VER_REVISION", SWIG_From_int((int)(1876290)));
+  rb_define_const(mCore, "SVN_VER_NUM", SWIG_FromCharPtr("1.14.0"));
+  rb_define_const(mCore, "SVN_VER_NUMBER", SWIG_FromCharPtr("1.14.0"));
+  rb_define_const(mCore, "SVN_VERSION", SWIG_FromCharPtr("1.14.0 (r1876290)"));
   
   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);
diff --git a/subversion/bindings/swig/ruby/svn/client.rb b/subversion/bindings/swig/ruby/svn/client.rb
index 50a0385..30d328b 100644
--- a/subversion/bindings/swig/ruby/svn/client.rb
+++ b/subversion/bindings/swig/ruby/svn/client.rb
@@ -637,25 +637,25 @@ module Svn
                        ignore_externals, allow_unver_obstruction, self)
       end
 
-      def set_log_msg_func(callback=Proc.new)
+      def set_log_msg_func(&callback)
         callback_wrapper = Proc.new do |items|
           items = items.collect do |item|
             item_wrapper = CommitItemWrapper.new(item)
           end
           callback.call(items)
         end
-        set_log_msg_func2(callback_wrapper)
+        set_log_msg_func2(&callback_wrapper)
       end
 
-      def set_log_msg_func2(callback=Proc.new)
+      def set_log_msg_func2(&callback)
         @log_msg_baton = Client.set_log_msg_func3(self, callback)
       end
 
-      def set_notify_func(callback=Proc.new)
+      def set_notify_func(&callback)
         @notify_baton = Client.set_notify_func2(self, callback)
       end
 
-      def set_cancel_func(callback=Proc.new)
+      def set_cancel_func(&callback)
         @cancel_baton = Client.set_cancel_func(self, callback)
       end
 
@@ -707,9 +707,9 @@ module Svn
 
       private
       def init_callbacks
-        set_log_msg_func(nil)
-        set_notify_func(nil)
-        set_cancel_func(nil)
+        set_log_msg_func
+        set_notify_func
+        set_cancel_func
       end
       %w(log_msg notify cancel).each do |type|
         private "#{type}_func", "#{type}_baton"
diff --git a/subversion/bindings/swig/ruby/svn/core.rb b/subversion/bindings/swig/ruby/svn/core.rb
index 15ebe13..26e5e84 100644
--- a/subversion/bindings/swig/ruby/svn/core.rb
+++ b/subversion/bindings/swig/ruby/svn/core.rb
@@ -249,31 +249,31 @@ module Svn
         end
       end
 
-      def add_simple_prompt_provider(retry_limit, prompt=Proc.new)
+      def add_simple_prompt_provider(retry_limit, &prompt)
         args = [retry_limit]
         klass = AuthCredSimple
         add_prompt_provider("simple", args, prompt, klass)
       end
 
-      def add_username_prompt_provider(retry_limit, prompt=Proc.new)
+      def add_username_prompt_provider(retry_limit, &prompt)
         args = [retry_limit]
         klass = AuthCredUsername
         add_prompt_provider("username", args, prompt, klass)
       end
 
-      def add_ssl_server_trust_prompt_provider(prompt=Proc.new)
+      def add_ssl_server_trust_prompt_provider(&prompt)
         args = []
         klass = AuthCredSSLServerTrust
         add_prompt_provider("ssl_server_trust", args, prompt, klass)
       end
 
-      def add_ssl_client_cert_prompt_provider(retry_limit, prompt=Proc.new)
+      def add_ssl_client_cert_prompt_provider(retry_limit, &prompt)
         args = [retry_limit]
         klass = AuthCredSSLClientCert
         add_prompt_provider("ssl_client_cert", args, prompt, klass)
       end
 
-      def add_ssl_client_cert_pw_prompt_provider(retry_limit, prompt=Proc.new)
+      def add_ssl_client_cert_pw_prompt_provider(retry_limit, &prompt)
         args = [retry_limit]
         klass = AuthCredSSLClientCertPw
         add_prompt_provider("ssl_client_cert_pw", args, prompt, klass)
diff --git a/subversion/bindings/swig/ruby/svn_client.c b/subversion/bindings/swig/ruby/svn_client.c
index 9592496..44dea2f 100644
--- a/subversion/bindings/swig/ruby/svn_client.c
+++ b/subversion/bindings/swig/ruby/svn_client.c
@@ -1841,160 +1841,152 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #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[35]
 #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[36]
 #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[37]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[40]
-#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[41]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[42]
-#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[43]
-#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[44]
-#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_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_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[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_hash_t swig_types[51]
-#define SWIGTYPE_p_p_char swig_types[52]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[53]
-#define SWIGTYPE_p_p_svn_client__shelf_t swig_types[54]
-#define SWIGTYPE_p_p_svn_client__shelf_version_t swig_types[55]
-#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[56]
-#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[57]
-#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[58]
-#define SWIGTYPE_p_p_svn_commit_info_t swig_types[59]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[60]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[61]
-#define SWIGTYPE_p_p_svn_string_t swig_types[62]
-#define SWIGTYPE_p_p_void swig_types[63]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[64]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[65]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[66]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[67]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[68]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[69]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[70]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[71]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[72]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[73]
-#define SWIGTYPE_p_svn_cache_config_t swig_types[74]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[75]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[76]
-#define SWIGTYPE_p_svn_checksum_t swig_types[77]
-#define SWIGTYPE_p_svn_client__shelf_info_t swig_types[78]
-#define SWIGTYPE_p_svn_client__shelf_t swig_types[79]
-#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[80]
-#define SWIGTYPE_p_svn_client_commit_info_t swig_types[81]
-#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[82]
-#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[83]
-#define SWIGTYPE_p_svn_client_commit_item_t swig_types[84]
-#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[85]
-#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[86]
-#define SWIGTYPE_p_svn_client_conflict_t swig_types[87]
-#define SWIGTYPE_p_svn_client_copy_source_t swig_types[88]
-#define SWIGTYPE_p_svn_client_ctx_t swig_types[89]
-#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[90]
-#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[91]
-#define SWIGTYPE_p_svn_client_info2_t swig_types[92]
-#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[93]
-#define SWIGTYPE_p_svn_client_status_t swig_types[94]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[95]
-#define SWIGTYPE_p_svn_config_t swig_types[96]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[97]
-#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[98]
-#define SWIGTYPE_p_svn_depth_t swig_types[99]
-#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[100]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[101]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[102]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[103]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[104]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[105]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[106]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[107]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[108]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[109]
-#define SWIGTYPE_p_svn_diff_t swig_types[110]
-#define SWIGTYPE_p_svn_dirent_t swig_types[111]
-#define SWIGTYPE_p_svn_errno_t swig_types[112]
-#define SWIGTYPE_p_svn_error_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_desc3_t swig_types[130]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[131]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[132]
-#define SWIGTYPE_p_svn_patch_t swig_types[133]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[134]
-#define SWIGTYPE_p_svn_prop_kind swig_types[135]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[136]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[137]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[138]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[139]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[140]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[141]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[142]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[143]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[144]
-#define SWIGTYPE_p_svn_stream_t swig_types[145]
-#define SWIGTYPE_p_svn_string_t swig_types[146]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[147]
-#define SWIGTYPE_p_svn_tristate_t swig_types[148]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[149]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[150]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[151]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[152]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[153]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[154]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[155]
-#define SWIGTYPE_p_svn_version_t swig_types[156]
-#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[157]
-#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[158]
-#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[159]
-#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[160]
-#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[161]
-#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[162]
-#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[163]
-#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[164]
-#define SWIGTYPE_p_svn_wc_context_t swig_types[165]
-#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[166]
-#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[167]
-#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[168]
-#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[169]
-#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[170]
-#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[171]
-#define SWIGTYPE_p_svn_wc_entry_t swig_types[172]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[173]
-#define SWIGTYPE_p_svn_wc_external_item_t swig_types[174]
-#define SWIGTYPE_p_svn_wc_info_t swig_types[175]
-#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[176]
-#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[177]
-#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[178]
-#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[179]
-#define SWIGTYPE_p_svn_wc_notify_t swig_types[180]
-#define SWIGTYPE_p_svn_wc_operation_t swig_types[181]
-#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[182]
-#define SWIGTYPE_p_svn_wc_schedule_t swig_types[183]
-#define SWIGTYPE_p_svn_wc_status2_t swig_types[184]
-#define SWIGTYPE_p_svn_wc_status3_t swig_types[185]
-#define SWIGTYPE_p_svn_wc_status_t swig_types[186]
-#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[187]
-#define SWIGTYPE_p_unsigned_long swig_types[188]
-#define SWIGTYPE_p_void swig_types[189]
-static swig_type_info *swig_types[191];
-static swig_module_info swig_module = {swig_types, 190, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[39]
+#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[40]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[41]
+#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[42]
+#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[43]
+#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_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_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[46]
+#define SWIGTYPE_p_int swig_types[47]
+#define SWIGTYPE_p_long swig_types[48]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[49]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[50]
+#define SWIGTYPE_p_p_char swig_types[51]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[52]
+#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[53]
+#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[54]
+#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[55]
+#define SWIGTYPE_p_p_svn_commit_info_t swig_types[56]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[57]
+#define SWIGTYPE_p_p_svn_string_t 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_cache_config_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_client_commit_info_t swig_types[73]
+#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[74]
+#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[75]
+#define SWIGTYPE_p_svn_client_commit_item_t swig_types[76]
+#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[77]
+#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[78]
+#define SWIGTYPE_p_svn_client_conflict_t swig_types[79]
+#define SWIGTYPE_p_svn_client_copy_source_t swig_types[80]
+#define SWIGTYPE_p_svn_client_ctx_t swig_types[81]
+#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[82]
+#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[83]
+#define SWIGTYPE_p_svn_client_info2_t swig_types[84]
+#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[85]
+#define SWIGTYPE_p_svn_client_status_t swig_types[86]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[87]
+#define SWIGTYPE_p_svn_config_t swig_types[88]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[89]
+#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[90]
+#define SWIGTYPE_p_svn_depth_t swig_types[91]
+#define SWIGTYPE_p_svn_diff_binary_patch_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_info_t swig_types[106]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[107]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[108]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[109]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[110]
+#define SWIGTYPE_p_svn_lock_t swig_types[111]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[112]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[113]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[114]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[115]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[116]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[117]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[118]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[119]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[120]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[121]
+#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[122]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[123]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[124]
+#define SWIGTYPE_p_svn_patch_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_prop_patch_t swig_types[128]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[129]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[130]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[131]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[132]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[133]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[134]
+#define SWIGTYPE_p_svn_ra_session_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_txdelta_op_t swig_types[141]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[142]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[143]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[144]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[145]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[146]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[147]
+#define SWIGTYPE_p_svn_version_t swig_types[148]
+#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[149]
+#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[150]
+#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[151]
+#define SWIGTYPE_p_svn_wc_conflict_choice_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_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 SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2082,7 +2074,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2187,7 +2179,7 @@ SWIG_From_int  (int value)
 }
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -20585,13 +20577,7 @@ _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(int argc
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_array_to_array_string(*arg1));
   }
   {
     VALUE target;
@@ -20681,13 +20667,7 @@ _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates(int argc,
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_array_to_array_string(*arg1));
   }
   {
     VALUE target;
@@ -20931,13 +20911,7 @@ _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates2(int argc, VALU
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates2 arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates2 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_array_to_array_string(*arg1));
   }
   {
     VALUE target;
@@ -21027,13 +21001,7 @@ _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates(int argc, VALUE
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_array_to_array_string(*arg1));
   }
   {
     VALUE target;
@@ -21323,13 +21291,7 @@ _wrap_svn_client_conflict_get(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_get arg 1 (svn_client_conflict_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_get is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_conflict_t, 0));
   }
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   {
@@ -21519,13 +21481,7 @@ _wrap_svn_client_conflict_get_conflicted(int argc, VALUE *argv, VALUE self) {
     vresult = SWIG_Ruby_AppendOutput(vresult, *arg1 ? Qtrue : Qfalse);
   }
   {
-    /* FIXME: Missing argout typemap: svn_client_conflict_get_conflicted arg 2 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client_conflict_get_conflicted is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_array_to_array_string(*arg2));
   }
   {
     vresult = SWIG_Ruby_AppendOutput(vresult, *arg3 ? Qtrue : Qfalse);
@@ -29589,2806 +29545,6 @@ fail:
 }
 
 
-static swig_class SwigClassSvn_client__shelf_t;
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_name_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","name", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_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 *","name", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->name) free((char *)arg1->name);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->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_client__shelf_t_name_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","name", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  result = (char *) ((arg1)->name);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_max_version_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","max_version", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","max_version", 2, argv[0] ));
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->max_version = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_max_version_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","max_version", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  result = (int) ((arg1)->max_version);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_wc_root_abspath_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","wc_root_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_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 *","wc_root_abspath", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->wc_root_abspath) free((char *)arg1->wc_root_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->wc_root_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_client__shelf_t_wc_root_abspath_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","wc_root_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  result = (char *) ((arg1)->wc_root_abspath);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_shelves_dir_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","shelves_dir", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_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 *","shelves_dir", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->shelves_dir) free((char *)arg1->shelves_dir);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->shelves_dir = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_shelves_dir_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","shelves_dir", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  result = (char *) ((arg1)->shelves_dir);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_revprops_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  apr_hash_t *arg2 = (apr_hash_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__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","revprops", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  {
-    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);
-    }
-    arg2 = svn_swig_rb_hash_to_apr_hash_svn_string(argv[0], _global_pool);
-    _global_pool = NULL;
-    if (!NIL_P(rb_pool)) {
-      if (NIL_P(arg2)) {
-        svn_swig_rb_destroy_pool(rb_pool);
-      } else {
-        svn_swig_rb_set_pool_for_no_swig_type(argv[0], rb_pool);
-      }
-      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
-    }
-  }
-  if (arg1) (arg1)->revprops = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_revprops_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  apr_hash_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","revprops", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  result = (apr_hash_t *) ((arg1)->revprops);
-  {
-    vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_hash_to_hash_svn_string(result));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_ctx_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  svn_client_ctx_t *arg2 = (svn_client_ctx_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","ctx", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client_ctx_t, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client_ctx_t *","ctx", 2, argv[0] )); 
-  }
-  arg2 = (svn_client_ctx_t *)(argp2);
-  if (arg1) (arg1)->ctx = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_ctx_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_client_ctx_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","ctx", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  result = (svn_client_ctx_t *) ((arg1)->ctx);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_t_pool_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_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 ;
-  
-  {
-    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 < 0) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","pool", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  if (argc > 0) {
-    
-  }
-  if (arg1) (arg1)->pool = arg2;
-  {
-    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_client__shelf_t_pool_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  apr_pool_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","pool", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_t *)(argp1);
-  result = (apr_pool_t *) ((arg1)->pool);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_pool_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-_wrap_svn_client__shelf_t_allocate(VALUE self)
-#else
-_wrap_svn_client__shelf_t_allocate(int argc, VALUE *argv, VALUE self)
-#endif
-{
-  VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_client__shelf_t);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-  rb_obj_call_init(vresult, argc, argv);
-#endif
-  return vresult;
-}
-
-
-SWIGINTERN VALUE
-_wrap_new_svn_client__shelf_t(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_t *result = 0 ;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  {
-    result = (struct svn_client__shelf_t *)calloc(1, sizeof(struct svn_client__shelf_t));
-    DATA_PTR(self) = result;
-    
-    
-    
-  }
-  return self;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN void
-free_svn_client__shelf_t(void *self) {
-    struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *)self;
-    free((char *) arg1);
-}
-
-static swig_class SwigClassSvn_client__shelf_version_t;
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_version_t_shelf_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","shelf", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_version_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","shelf", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_t *)(argp2);
-  if (arg1) (arg1)->shelf = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_version_t_shelf_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_client__shelf_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","shelf", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_version_t *)(argp1);
-  result = (svn_client__shelf_t *) ((arg1)->shelf);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_version_t_mtime_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  apr_time_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","mtime", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_version_t *)(argp1);
-  {
-    arg2 = (apr_time_t)NUM2LL(argv[0]);
-  }
-  if (arg1) (arg1)->mtime = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_version_t_mtime_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  apr_time_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__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","mtime", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_version_t *)(argp1);
-  result =  ((arg1)->mtime);
-  {
-    vresult = LL2NUM((apr_time_t)(result));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_version_t_files_dir_abspath_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","files_dir_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_version_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 *","files_dir_abspath", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->files_dir_abspath) free((char *)arg1->files_dir_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->files_dir_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_client__shelf_version_t_files_dir_abspath_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","files_dir_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_version_t *)(argp1);
-  result = (char *) ((arg1)->files_dir_abspath);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_version_t_version_number_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","version_number", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_version_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","version_number", 2, argv[0] ));
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->version_number = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_version_t_version_number_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","version_number", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_version_t *)(argp1);
-  result = (int) ((arg1)->version_number);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-_wrap_svn_client__shelf_version_t_allocate(VALUE self)
-#else
-_wrap_svn_client__shelf_version_t_allocate(int argc, VALUE *argv, VALUE self)
-#endif
-{
-  VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_client__shelf_version_t);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-  rb_obj_call_init(vresult, argc, argv);
-#endif
-  return vresult;
-}
-
-
-SWIGINTERN VALUE
-_wrap_new_svn_client__shelf_version_t(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_version_t *result = 0 ;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  {
-    result = (struct svn_client__shelf_version_t *)calloc(1, sizeof(struct svn_client__shelf_version_t));
-    DATA_PTR(self) = result;
-    
-    
-    
-  }
-  return self;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN void
-free_svn_client__shelf_version_t(void *self) {
-    struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *)self;
-    free((char *) arg1);
-}
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_open_or_create(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ;
-  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-  VALUE _global_svn_swig_rb_pool ;
-  apr_pool_t *_global_pool ;
-  svn_client__shelf_t *temp1 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 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);
-  }
-  arg1 = &temp1;
-  if ((argc < 3) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",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_client__shelf_open_or_create", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  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__shelf_open_or_create", 3, argv[1] ));
-  }
-  arg3 = (char *)(buf3);
-  res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_open_or_create", 4, argv[2] )); 
-  }
-  arg4 = (svn_client_ctx_t *)(argp4);
-  if (argc > 3) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_open_or_create(arg1,(char const *)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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_open_or_create arg 1 (svn_client__shelf_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_or_create is not implemented yet");
-    
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  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 (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  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__shelf_open_existing(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ;
-  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
-  VALUE _global_svn_swig_rb_pool ;
-  apr_pool_t *_global_pool ;
-  svn_client__shelf_t *temp1 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 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);
-  }
-  arg1 = &temp1;
-  if ((argc < 3) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",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_client__shelf_open_existing", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  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__shelf_open_existing", 3, argv[1] ));
-  }
-  arg3 = (char *)(buf3);
-  res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_open_existing", 4, argv[2] )); 
-  }
-  arg4 = (svn_client_ctx_t *)(argp4);
-  if (argc > 3) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_open_existing(arg1,(char const *)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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_open_existing arg 1 (svn_client__shelf_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_existing is not implemented yet");
-    
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  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 (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  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__shelf_close(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_t *arg1 = (svn_client__shelf_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 ;
-  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_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_close", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_t *)(argp1);
-  if (argc > 1) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_close(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_client__shelf_delete(int argc, VALUE *argv, VALUE self) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_boolean_t arg3 ;
-  svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 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 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 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_client__shelf_delete", 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_client__shelf_delete", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  arg3 = RTEST(argv[2]);
-  res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_delete", 4, argv[3] )); 
-  }
-  arg4 = (svn_client_ctx_t *)(argp4);
-  if (argc > 4) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_delete((char const *)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;
-  }
-  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_client__shelf_mods_editor(int argc, VALUE *argv, VALUE self) {
-  svn_delta_editor_t **arg1 = (svn_delta_editor_t **) 0 ;
-  void **arg2 = (void **) 0 ;
-  svn_client__shelf_version_t *arg3 = (svn_client__shelf_version_t *) 0 ;
-  svn_wc_notify_func2_t arg4 = (svn_wc_notify_func2_t) 0 ;
-  void *arg5 = (void *) 0 ;
-  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 ;
-  svn_delta_editor_t *temp1 ;
-  void *temp2 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 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);
-  }
-  arg1 = &temp1;
-  arg2 = &temp2;
-  if ((argc < 3) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res3 = SWIG_ConvertPtr(argv[0], &argp3,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_mods_editor", 3, argv[0] )); 
-  }
-  arg3 = (svn_client__shelf_version_t *)(argp3);
-  {
-    arg4 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
-    arg5 = (void *)svn_swig_rb_make_baton(argv[1], _global_svn_swig_rb_pool);
-  }
-  res6 = SWIG_ConvertPtr(argv[2], &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__shelf_mods_editor", 6, argv[2] )); 
-  }
-  arg6 = (svn_client_ctx_t *)(argp6);
-  if (argc > 3) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_mods_editor((struct svn_delta_editor_t const **)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;
-  }
-  {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t, 0));
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_mods_editor arg 2 (void **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_mods_editor 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);
-  }
-  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__shelf_save_new_version3(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  apr_array_header_t *arg3 = (apr_array_header_t *) 0 ;
-  svn_depth_t arg4 ;
-  apr_array_header_t *arg5 = (apr_array_header_t *) 0 ;
-  svn_client_status_func_t arg6 = (svn_client_status_func_t) 0 ;
-  void *arg7 = (void *) 0 ;
-  svn_client_status_func_t arg8 = (svn_client_status_func_t) 0 ;
-  void *arg9 = (void *) 0 ;
-  apr_pool_t *arg10 = (apr_pool_t *) 0 ;
-  VALUE _global_svn_swig_rb_pool ;
-  apr_pool_t *_global_pool ;
-  svn_client__shelf_version_t *temp1 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int res7 ;
-  int res9 ;
-  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);
-  }
-  arg1 = &temp1;
-  if ((argc < 8) || (argc > 9)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 8)",argc); SWIG_fail;
-  }
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_save_new_version3", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_t *)(argp2);
-  {
-    arg3 = svn_swig_rb_strings_to_apr_array(argv[1], _global_pool);
-  }
-  {
-    arg4 = svn_swig_rb_to_depth(argv[2]);
-  }
-  {
-    arg5 = (NIL_P(argv[3])) ? NULL :
-    svn_swig_rb_strings_to_apr_array(argv[3], _global_pool);
-  }
-  {
-    int res = SWIG_ConvertFunctionPtr(argv[4], (void**)(&arg6), 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__shelf_save_new_version3", 6, argv[4] )); 
-    }
-  }
-  res7 = SWIG_ConvertPtr(argv[5],SWIG_as_voidptrptr(&arg7), 0, 0);
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "void *","svn_client__shelf_save_new_version3", 7, argv[5] )); 
-  }
-  {
-    int res = SWIG_ConvertFunctionPtr(argv[6], (void**)(&arg8), 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__shelf_save_new_version3", 8, argv[6] )); 
-    }
-  }
-  res9 = SWIG_ConvertPtr(argv[7],SWIG_as_voidptrptr(&arg9), 0, 0);
-  if (!SWIG_IsOK(res9)) {
-    SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_client__shelf_save_new_version3", 9, argv[7] )); 
-  }
-  if (argc > 8) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_save_new_version3(arg1,arg2,(apr_array_header_t const *)arg3,arg4,(apr_array_header_t const *)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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_save_new_version3 arg 1 (svn_client__shelf_version_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_save_new_version3 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);
-  }
-  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__shelf_delete_newer_versions(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-  svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ;
-  apr_pool_t *arg3 = (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 ;
-  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;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_delete_newer_versions", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_delete_newer_versions", 2, argv[1] )); 
-  }
-  arg2 = (svn_client__shelf_version_t *)(argp2);
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_delete_newer_versions(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;
-  }
-  {
-    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__shelf_version_open(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  int 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_client__shelf_version_t *temp1 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int 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);
-  }
-  {
-    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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_version_open", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_t *)(argp2);
-  ecode3 = SWIG_AsVal_int(argv[1], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","svn_client__shelf_version_open", 3, argv[1] ));
-  } 
-  arg3 = (int)(val3);
-  if (argc > 2) {
-    
-  }
-  if (argc > 3) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_version_open(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_client__shelf_version_open arg 1 (svn_client__shelf_version_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_version_open 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_client__shelf_get_newest_version(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_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_client__shelf_version_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_get_newest_version", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_t *)(argp2);
-  if (argc > 1) {
-    
-  }
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_get_newest_version(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_client__shelf_get_newest_version arg 1 (svn_client__shelf_version_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_newest_version 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_client__shelf_get_all_versions(int argc, VALUE *argv, VALUE self) {
-  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_get_all_versions", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_t *)(argp2);
-  if (argc > 1) {
-    
-  }
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_get_all_versions(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_client__shelf_get_all_versions arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_all_versions 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_client__shelf_apply(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-  svn_boolean_t arg2 ;
-  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-  VALUE _global_svn_swig_rb_pool ;
-  apr_pool_t *_global_pool ;
-  void *argp1 = 0 ;
-  int res1 = 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);
-  }
-  if ((argc < 2) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_apply", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_version_t *)(argp1);
-  arg2 = RTEST(argv[1]);
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_apply(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;
-  }
-  {
-    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__shelf_test_apply_file(int argc, VALUE *argv, VALUE self) {
-  svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
-  svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_test_apply_file", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_version_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__shelf_test_apply_file", 3, argv[1] ));
-  }
-  arg3 = (char *)(buf3);
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_test_apply_file(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_client__shelf_unapply(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-  svn_boolean_t arg2 ;
-  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-  VALUE _global_svn_swig_rb_pool ;
-  apr_pool_t *_global_pool ;
-  void *argp1 = 0 ;
-  int res1 = 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);
-  }
-  if ((argc < 2) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_unapply", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_version_t *)(argp1);
-  arg2 = RTEST(argv[1]);
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_unapply(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;
-  }
-  {
-    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__shelf_replay(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ;
-  void *arg4 = (void *) 0 ;
-  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 < 4) || (argc > 5)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_replay", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_version_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_client__shelf_replay", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    if (RTEST(rb_obj_is_kind_of(argv[2],
-          svn_swig_rb_svn_delta_editor()))) {
-      arg3 = svn_swig_rb_to_swig_type(argv[2],
-        "svn_delta_editor_t *",
-        _global_pool);
-      arg4 = svn_swig_rb_to_swig_type(rb_funcall(argv[2], rb_intern("baton"), 0),
-        "void *", _global_pool);
-    } else {
-      svn_swig_rb_make_delta_editor(&arg3, &arg4, argv[2], _global_pool);
-    }
-  }
-  {
-    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) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_replay(arg1,(char const *)arg2,(struct svn_delta_editor_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_client__shelf_paths_changed(int argc, VALUE *argv, VALUE self) {
-  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-  svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_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_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_paths_changed", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_version_t *)(argp2);
-  if (argc > 1) {
-    
-  }
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_paths_changed(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_client__shelf_paths_changed arg 1 (apr_hash_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_paths_changed 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_client__shelf_revprop_set(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_string_t *arg3 = (svn_string_t *) 0 ;
-  apr_pool_t *arg4 = (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_string_t value3 ;
-  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_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_revprop_set", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_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_client__shelf_revprop_set", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    if (NIL_P(argv[2])) {
-      arg3 = NULL;
-    } else {
-      value3.data = StringValuePtr(argv[2]);
-      value3.len = RSTRING_LEN(argv[2]);
-      arg3 = &value3;
-    }
-  }
-  if (argc > 3) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_revprop_set(arg1,(char const *)arg2,(struct svn_string_t 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;
-  }
-  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__shelf_revprop_set_all(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
-  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-  VALUE _global_svn_swig_rb_pool ;
-  apr_pool_t *_global_pool ;
-  void *argp1 = 0 ;
-  int res1 = 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);
-  }
-  if ((argc < 2) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_revprop_set_all", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_t *)(argp1);
-  {
-    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);
-    }
-    arg2 = svn_swig_rb_hash_to_apr_hash_svn_string(argv[1], _global_pool);
-    _global_pool = NULL;
-    if (!NIL_P(rb_pool)) {
-      if (NIL_P(arg2)) {
-        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) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_revprop_set_all(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;
-  }
-  {
-    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__shelf_revprop_get(int argc, VALUE *argv, VALUE self) {
-  svn_string_t **arg1 = (svn_string_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_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_string_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_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_revprop_get", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_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__shelf_revprop_get", 3, argv[1] ));
-  }
-  arg3 = (char *)(buf3);
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_revprop_get(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;
-  }
-  {
-    if (*arg1) {
-      vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new((*arg1)->data, (*arg1)->len));
-    } else {
-      vresult = SWIG_Ruby_AppendOutput(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_client__shelf_revprop_list(int argc, VALUE *argv, VALUE self) {
-  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  apr_pool_t *arg3 = (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);
-  }
-  arg1 = &temp1;
-  if ((argc < 1) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_revprop_list", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_t *)(argp2);
-  if (argc > 1) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_revprop_list(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, svn_swig_rb_apr_hash_to_hash_svn_string(*arg1));
-  }
-  {
-    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__shelf_set_log_message(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  apr_pool_t *arg3 = (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, &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_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_set_log_message", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_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_client__shelf_set_log_message", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  if (argc > 2) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_set_log_message(arg1,(char 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;
-  }
-  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__shelf_get_log_message(int argc, VALUE *argv, VALUE self) {
-  char **arg1 = (char **) 0 ;
-  svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ;
-  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
-  VALUE _global_svn_swig_rb_pool ;
-  apr_pool_t *_global_pool ;
-  char *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);
-  }
-  arg1 = &temp1;
-  if ((argc < 1) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_get_log_message", 2, argv[0] )); 
-  }
-  arg2 = (svn_client__shelf_t *)(argp2);
-  if (argc > 1) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_get_log_message(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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_get_log_message arg 1 (char **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_log_message 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);
-  }
-  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;
-}
-
-
-static swig_class SwigClassSvn_client__shelf_info_t;
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_info_t_mtime_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ;
-  apr_time_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_client__shelf_info_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_info_t *","mtime", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_info_t *)(argp1);
-  {
-    arg2 = (apr_time_t)NUM2LL(argv[0]);
-  }
-  if (arg1) (arg1)->mtime = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_info_t_mtime_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  apr_time_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__shelf_info_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_info_t *","mtime", 1, self )); 
-  }
-  arg1 = (struct svn_client__shelf_info_t *)(argp1);
-  result =  ((arg1)->mtime);
-  {
-    vresult = LL2NUM((apr_time_t)(result));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-_wrap_svn_client__shelf_info_t_allocate(VALUE self)
-#else
-_wrap_svn_client__shelf_info_t_allocate(int argc, VALUE *argv, VALUE self)
-#endif
-{
-  VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_client__shelf_info_t);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-  rb_obj_call_init(vresult, argc, argv);
-#endif
-  return vresult;
-}
-
-
-SWIGINTERN VALUE
-_wrap_new_svn_client__shelf_info_t(int argc, VALUE *argv, VALUE self) {
-  struct svn_client__shelf_info_t *result = 0 ;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  {
-    result = (struct svn_client__shelf_info_t *)calloc(1, sizeof(struct svn_client__shelf_info_t));
-    DATA_PTR(self) = result;
-    
-    
-    
-  }
-  return self;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN void
-free_svn_client__shelf_info_t(void *self) {
-    struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *)self;
-    free((char *) arg1);
-}
-
-SWIGINTERN VALUE
-_wrap_svn_client__shelf_list(int argc, VALUE *argv, VALUE self) {
-  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_client_ctx_t *arg3 = (svn_client_ctx_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_hash_t *temp1 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 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_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_list", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_list", 3, argv[1] )); 
-  }
-  arg3 = (svn_client_ctx_t *)(argp3);
-  if (argc > 2) {
-    
-  }
-  if (argc > 3) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_list(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;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_client__shelf_list arg 1 (apr_hash_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_client__shelf_list is not implemented yet");
-    
-  }
-  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_client__shelf_version_status_walk(int argc, VALUE *argv, VALUE self) {
-  svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  svn_wc_status_func4_t arg3 = (svn_wc_status_func4_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  apr_pool_t *arg5 = (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 ;
-  int res4 ;
-  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_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_version_status_walk", 1, argv[0] )); 
-  }
-  arg1 = (svn_client__shelf_version_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_client__shelf_version_status_walk", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    int res = SWIG_ConvertFunctionPtr(argv[2], (void**)(&arg3), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_wc_status_func4_t","svn_client__shelf_version_status_walk", 3, argv[2] )); 
-    }
-  }
-  res4 = SWIG_ConvertPtr(argv[3],SWIG_as_voidptrptr(&arg4), 0, 0);
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "void *","svn_client__shelf_version_status_walk", 4, argv[3] )); 
-  }
-  if (argc > 4) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_client__shelf_version_status_walk(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;
-  }
-  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_add_to_changelist(int argc, VALUE *argv, VALUE self) {
   apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
@@ -39210,7 +36366,6 @@ static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_s
 static swig_type_info _swigt__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 = {"_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_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__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 = {"_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_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0};
@@ -39226,16 +36381,12 @@ static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t
 static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_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_svn_auth_provider_object_t = {"_p_p_svn_auth_provider_object_t", "struct svn_auth_provider_object_t **|svn_auth_provider_object_t **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_svn_client__shelf_t = {"_p_p_svn_client__shelf_t", "struct svn_client__shelf_t **|svn_client__shelf_t **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_svn_client__shelf_version_t = {"_p_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t **|svn_client__shelf_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_commit_info_t = {"_p_p_svn_client_commit_info_t", "struct svn_client_commit_info_t **|svn_client_commit_info_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_conflict_t = {"_p_p_svn_client_conflict_t", "struct svn_client_conflict_t **|svn_client_conflict_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_client_ctx_t = {"_p_p_svn_client_ctx_t", "struct svn_client_ctx_t **|svn_client_ctx_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_commit_info_t = {"_p_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_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_ra_session_t = {"_p_p_svn_ra_session_t", "struct svn_ra_session_t **|svn_ra_session_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_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};
 static swig_type_info _swigt__p_svn_auth_cred_ssl_client_cert_pw_t = {"_p_svn_auth_cred_ssl_client_cert_pw_t", "struct svn_auth_cred_ssl_client_cert_pw_t *|svn_auth_cred_ssl_client_cert_pw_t *", 0, 0, (void*)0, 0};
@@ -39250,9 +36401,6 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", "
 static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_info_t = {"_p_svn_client__shelf_info_t", "struct svn_client__shelf_info_t *|svn_client__shelf_info_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_t = {"_p_svn_client__shelf_t", "struct svn_client__shelf_t *|svn_client__shelf_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t *|svn_client__shelf_version_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_info_t = {"_p_svn_client_commit_info_t", "struct svn_client_commit_info_t *|svn_client_commit_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_item2_t = {"_p_svn_client_commit_item2_t", "struct svn_client_commit_item2_t *|svn_client_commit_item2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_client_commit_item3_t = {"_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t *|svn_client_commit_item3_t *", 0, 0, (void*)0, 0};
@@ -39402,7 +36550,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__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,
   &_swigt__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,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t,
-  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void,
   &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void,
   &_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t,
@@ -39418,16 +36565,12 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_apr_hash_t,
   &_swigt__p_p_char,
   &_swigt__p_p_svn_auth_provider_object_t,
-  &_swigt__p_p_svn_client__shelf_t,
-  &_swigt__p_p_svn_client__shelf_version_t,
   &_swigt__p_p_svn_client_commit_info_t,
   &_swigt__p_p_svn_client_conflict_t,
   &_swigt__p_p_svn_client_ctx_t,
   &_swigt__p_p_svn_commit_info_t,
-  &_swigt__p_p_svn_delta_editor_t,
   &_swigt__p_p_svn_ra_session_t,
   &_swigt__p_p_svn_string_t,
-  &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
   &_swigt__p_svn_auth_cred_ssl_client_cert_pw_t,
@@ -39442,9 +36585,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_checksum_ctx_t,
   &_swigt__p_svn_checksum_kind_t,
   &_swigt__p_svn_checksum_t,
-  &_swigt__p_svn_client__shelf_info_t,
-  &_swigt__p_svn_client__shelf_t,
-  &_swigt__p_svn_client__shelf_version_t,
   &_swigt__p_svn_client_commit_info_t,
   &_swigt__p_svn_client_commit_item2_t,
   &_swigt__p_svn_client_commit_item3_t,
@@ -39594,7 +36734,6 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_s
 static swig_cast_info _swigc__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[] = {  {&_swigt__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, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__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[] = {  {&_swigt__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, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_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_wc_status3_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_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_struct_svn_wc_status2_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -39610,16 +36749,12 @@ static swig_cast_info _swigc__p_p_apr_array_header_t[] = {  {&_swigt__p_p_apr_ar
 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_svn_auth_provider_object_t[] = {  {&_swigt__p_p_svn_auth_provider_object_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_svn_client__shelf_t[] = {  {&_swigt__p_p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_svn_client__shelf_version_t[] = {  {&_swigt__p_p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_commit_info_t[] = {  {&_swigt__p_p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_conflict_t[] = {  {&_swigt__p_p_svn_client_conflict_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_client_ctx_t[] = {  {&_swigt__p_p_svn_client_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_commit_info_t[] = {  {&_swigt__p_p_svn_commit_info_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}};
 static swig_cast_info _swigc__p_p_svn_ra_session_t[] = {  {&_swigt__p_p_svn_ra_session_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_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}};
 static swig_cast_info _swigc__p_svn_auth_cred_ssl_client_cert_pw_t[] = {  {&_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -39634,9 +36769,6 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = {  {&_swigt__p_svn_cache_
 static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = {  {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_kind_t[] = {  {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_client__shelf_info_t[] = {  {&_swigt__p_svn_client__shelf_info_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_client__shelf_t[] = {  {&_swigt__p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = {  {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client_commit_info_t[] = {  {&_swigt__p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client_commit_item2_t[] = {  {&_swigt__p_svn_client_commit_item2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_client_commit_item3_t[] = {  {&_swigt__p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -39786,7 +36918,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__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,
   _swigc__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,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t,
-  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void,
   _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void,
   _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t,
@@ -39802,16 +36933,12 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_apr_hash_t,
   _swigc__p_p_char,
   _swigc__p_p_svn_auth_provider_object_t,
-  _swigc__p_p_svn_client__shelf_t,
-  _swigc__p_p_svn_client__shelf_version_t,
   _swigc__p_p_svn_client_commit_info_t,
   _swigc__p_p_svn_client_conflict_t,
   _swigc__p_p_svn_client_ctx_t,
   _swigc__p_p_svn_commit_info_t,
-  _swigc__p_p_svn_delta_editor_t,
   _swigc__p_p_svn_ra_session_t,
   _swigc__p_p_svn_string_t,
-  _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
   _swigc__p_svn_auth_cred_ssl_client_cert_pw_t,
@@ -39826,9 +36953,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_checksum_ctx_t,
   _swigc__p_svn_checksum_kind_t,
   _swigc__p_svn_checksum_t,
-  _swigc__p_svn_client__shelf_info_t,
-  _swigc__p_svn_client__shelf_t,
-  _swigc__p_svn_client__shelf_version_t,
   _swigc__p_svn_client_commit_info_t,
   _swigc__p_svn_client_commit_item2_t,
   _swigc__p_svn_client_commit_item3_t,
@@ -40712,77 +37836,6 @@ SWIGEXPORT void Init_client(void) {
   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);
-  
-  SwigClassSvn_client__shelf_t.klass = rb_define_class_under(mClient, "Svn_client__shelf_t", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_svn_client__shelf_t, (void *) &SwigClassSvn_client__shelf_t);
-  rb_define_alloc_func(SwigClassSvn_client__shelf_t.klass, _wrap_svn_client__shelf_t_allocate);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "initialize", _wrap_new_svn_client__shelf_t, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "name=", _wrap_svn_client__shelf_t_name_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "name", _wrap_svn_client__shelf_t_name_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "max_version=", _wrap_svn_client__shelf_t_max_version_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "max_version", _wrap_svn_client__shelf_t_max_version_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "wc_root_abspath=", _wrap_svn_client__shelf_t_wc_root_abspath_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "wc_root_abspath", _wrap_svn_client__shelf_t_wc_root_abspath_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "shelves_dir=", _wrap_svn_client__shelf_t_shelves_dir_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "shelves_dir", _wrap_svn_client__shelf_t_shelves_dir_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "revprops=", _wrap_svn_client__shelf_t_revprops_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "revprops", _wrap_svn_client__shelf_t_revprops_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "ctx=", _wrap_svn_client__shelf_t_ctx_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "ctx", _wrap_svn_client__shelf_t_ctx_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "pool=", _wrap_svn_client__shelf_t_pool_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_t.klass, "pool", _wrap_svn_client__shelf_t_pool_get, -1);
-  SwigClassSvn_client__shelf_t.mark = 0;
-  SwigClassSvn_client__shelf_t.destroy = (void (*)(void *)) free_svn_client__shelf_t;
-  SwigClassSvn_client__shelf_t.trackObjects = 0;
-  
-  SwigClassSvn_client__shelf_version_t.klass = rb_define_class_under(mClient, "Svn_client__shelf_version_t", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_svn_client__shelf_version_t, (void *) &SwigClassSvn_client__shelf_version_t);
-  rb_define_alloc_func(SwigClassSvn_client__shelf_version_t.klass, _wrap_svn_client__shelf_version_t_allocate);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "initialize", _wrap_new_svn_client__shelf_version_t, -1);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "shelf=", _wrap_svn_client__shelf_version_t_shelf_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "shelf", _wrap_svn_client__shelf_version_t_shelf_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "mtime=", _wrap_svn_client__shelf_version_t_mtime_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "mtime", _wrap_svn_client__shelf_version_t_mtime_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "files_dir_abspath=", _wrap_svn_client__shelf_version_t_files_dir_abspath_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "files_dir_abspath", _wrap_svn_client__shelf_version_t_files_dir_abspath_get, -1);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "version_number=", _wrap_svn_client__shelf_version_t_version_number_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "version_number", _wrap_svn_client__shelf_version_t_version_number_get, -1);
-  SwigClassSvn_client__shelf_version_t.mark = 0;
-  SwigClassSvn_client__shelf_version_t.destroy = (void (*)(void *)) free_svn_client__shelf_version_t;
-  SwigClassSvn_client__shelf_version_t.trackObjects = 0;
-  rb_define_module_function(mClient, "svn_client__shelf_open_or_create", _wrap_svn_client__shelf_open_or_create, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_open_existing", _wrap_svn_client__shelf_open_existing, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_close", _wrap_svn_client__shelf_close, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_delete", _wrap_svn_client__shelf_delete, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_mods_editor", _wrap_svn_client__shelf_mods_editor, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_save_new_version3", _wrap_svn_client__shelf_save_new_version3, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_delete_newer_versions", _wrap_svn_client__shelf_delete_newer_versions, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_version_open", _wrap_svn_client__shelf_version_open, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_get_newest_version", _wrap_svn_client__shelf_get_newest_version, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_get_all_versions", _wrap_svn_client__shelf_get_all_versions, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_apply", _wrap_svn_client__shelf_apply, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_test_apply_file", _wrap_svn_client__shelf_test_apply_file, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_unapply", _wrap_svn_client__shelf_unapply, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_replay", _wrap_svn_client__shelf_replay, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_paths_changed", _wrap_svn_client__shelf_paths_changed, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_revprop_set", _wrap_svn_client__shelf_revprop_set, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_revprop_set_all", _wrap_svn_client__shelf_revprop_set_all, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_revprop_get", _wrap_svn_client__shelf_revprop_get, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_revprop_list", _wrap_svn_client__shelf_revprop_list, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_set_log_message", _wrap_svn_client__shelf_set_log_message, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_get_log_message", _wrap_svn_client__shelf_get_log_message, -1);
-  
-  SwigClassSvn_client__shelf_info_t.klass = rb_define_class_under(mClient, "Svn_client__shelf_info_t", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_svn_client__shelf_info_t, (void *) &SwigClassSvn_client__shelf_info_t);
-  rb_define_alloc_func(SwigClassSvn_client__shelf_info_t.klass, _wrap_svn_client__shelf_info_t_allocate);
-  rb_define_method(SwigClassSvn_client__shelf_info_t.klass, "initialize", _wrap_new_svn_client__shelf_info_t, -1);
-  rb_define_method(SwigClassSvn_client__shelf_info_t.klass, "mtime=", _wrap_svn_client__shelf_info_t_mtime_set, -1);
-  rb_define_method(SwigClassSvn_client__shelf_info_t.klass, "mtime", _wrap_svn_client__shelf_info_t_mtime_get, -1);
-  SwigClassSvn_client__shelf_info_t.mark = 0;
-  SwigClassSvn_client__shelf_info_t.destroy = (void (*)(void *)) free_svn_client__shelf_info_t;
-  SwigClassSvn_client__shelf_info_t.trackObjects = 0;
-  rb_define_module_function(mClient, "svn_client__shelf_list", _wrap_svn_client__shelf_list, -1);
-  rb_define_module_function(mClient, "svn_client__shelf_version_status_walk", _wrap_svn_client__shelf_version_status_walk, -1);
   rb_define_module_function(mClient, "svn_client_add_to_changelist", _wrap_svn_client_add_to_changelist, -1);
   rb_define_module_function(mClient, "svn_client_remove_from_changelists", _wrap_svn_client_remove_from_changelists, -1);
   rb_define_module_function(mClient, "svn_client_get_changelists", _wrap_svn_client_get_changelists, -1);
diff --git a/subversion/bindings/swig/ruby/svn_delta.c b/subversion/bindings/swig/ruby/svn_delta.c
index e549695..76210fb 100644
--- a/subversion/bindings/swig/ruby/svn_delta.c
+++ b/subversion/bindings/swig/ruby/svn_delta.c
@@ -2018,7 +2018,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2063,7 +2063,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -3286,13 +3286,7 @@ _wrap_svn_txdelta_run(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_txdelta_run arg 6 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_txdelta_run is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg6, SWIGTYPE_p_svn_checksum_t, 0));
   }
   {
     svn_swig_rb_set_baton(vresult, (VALUE)arg8);
diff --git a/subversion/bindings/swig/ruby/svn_fs.c b/subversion/bindings/swig/ruby/svn_fs.c
index 6d365d1..6e4f75d 100644
--- a/subversion/bindings/swig/ruby/svn_fs.c
+++ b/subversion/bindings/swig/ruby/svn_fs.c
@@ -2125,7 +2125,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2170,7 +2170,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -10640,13 +10640,7 @@ _wrap_svn_fs_file_checksum(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_fs_file_checksum arg 1 (svn_checksum_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_fs_file_checksum is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0));
   }
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
   {
diff --git a/subversion/bindings/swig/ruby/svn_ra.c b/subversion/bindings/swig/ruby/svn_ra.c
index 41349ab..81bccf1 100644
--- a/subversion/bindings/swig/ruby/svn_ra.c
+++ b/subversion/bindings/swig/ruby/svn_ra.c
@@ -2099,7 +2099,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2144,7 +2144,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -4639,6 +4639,125 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_ra_open5(int argc, VALUE *argv, VALUE self) {
+  svn_ra_session_t **arg1 = (svn_ra_session_t **) 0 ;
+  char **arg2 = (char **) 0 ;
+  char **arg3 = (char **) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  svn_ra_callbacks2_t *arg6 = (svn_ra_callbacks2_t *) 0 ;
+  void *arg7 = (void *) 0 ;
+  apr_hash_t *arg8 = (apr_hash_t *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_ra_session_t *temp1 ;
+  char *temp2 ;
+  char *temp3 ;
+  int res4 ;
+  char *buf4 = 0 ;
+  int alloc4 = 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, &arg9);
+    _global_pool = arg9;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  arg2 = &temp2;
+  arg3 = &temp3;
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res4 = SWIG_AsCharPtrAndSize(argv[0], &buf4, NULL, &alloc4);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_ra_open5", 4, argv[0] ));
+  }
+  arg4 = (char *)(buf4);
+  res5 = SWIG_AsCharPtrAndSize(argv[1], &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const *","svn_ra_open5", 5, argv[1] ));
+  }
+  arg5 = (char *)(buf5);
+  {
+    svn_swig_rb_setup_ra_callbacks(&arg6, &arg7, argv[2], _global_pool);
+  }
+  {
+    if (NIL_P(argv[3])) {
+      arg8 = NULL;
+    } else {
+      arg8 = svn_swig_rb_hash_to_apr_hash_swig_type(argv[3], "svn_config_t *", _global_pool);
+    }
+  }
+  if (argc > 4) {
+    
+  }
+  {
+    if (!arg6) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    result = (svn_error_t *)svn_ra_open5(arg1,(char const **)arg2,(char const **)arg3,(char const *)arg4,(char const *)arg5,(struct svn_ra_callbacks2_t const *)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, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_session_t, 0));
+  }
+  {
+    if (*arg2) {
+      vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2));
+    } else {
+      vresult = SWIG_Ruby_AppendOutput(vresult, Qnil);
+    }
+  }
+  {
+    if (*arg3) {
+      vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg3));
+    } else {
+      vresult = SWIG_Ruby_AppendOutput(vresult, Qnil);
+    }
+  }
+  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 (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_ra_open4(int argc, VALUE *argv, VALUE self) {
   svn_ra_session_t **arg1 = (svn_ra_session_t **) 0 ;
   char **arg2 = (char **) 0 ;
@@ -17146,6 +17265,7 @@ SWIGEXPORT void Init_ra(void) {
   SwigClassSvn_ra_callbacks_t.trackObjects = 0;
   rb_define_module_function(mRa, "svn_ra_initialize", _wrap_svn_ra_initialize, -1);
   rb_define_module_function(mRa, "svn_ra_create_callbacks", _wrap_svn_ra_create_callbacks, -1);
+  rb_define_module_function(mRa, "svn_ra_open5", _wrap_svn_ra_open5, -1);
   rb_define_module_function(mRa, "svn_ra_open4", _wrap_svn_ra_open4, -1);
   rb_define_module_function(mRa, "svn_ra_open3", _wrap_svn_ra_open3, -1);
   rb_define_module_function(mRa, "svn_ra_open2", _wrap_svn_ra_open2, -1);
diff --git a/subversion/bindings/swig/ruby/svn_repos.c b/subversion/bindings/swig/ruby/svn_repos.c
index 0c3bfcd..4d4b30a 100644
--- a/subversion/bindings/swig/ruby/svn_repos.c
+++ b/subversion/bindings/swig/ruby/svn_repos.c
@@ -2040,7 +2040,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2182,7 +2182,7 @@ SWIG_FromCharPtr(const char *cptr)
 }
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -4086,13 +4086,7 @@ _wrap_svn_repos_capabilities(int argc, VALUE *argv, VALUE self) {
     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");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_apr_hash_t, 0));
   }
   {
     VALUE target;
diff --git a/subversion/bindings/swig/ruby/svn_wc.c b/subversion/bindings/swig/ruby/svn_wc.c
index b1631b7..5bc3adf 100644
--- a/subversion/bindings/swig/ruby/svn_wc.c
+++ b/subversion/bindings/swig/ruby/svn_wc.c
@@ -2134,7 +2134,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2214,7 +2214,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:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svn-rel/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -32940,22 +32940,10 @@ _wrap_svn_wc_transmit_text_deltas3(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_wc_transmit_text_deltas3 arg 1 (svn_checksum_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_wc_transmit_text_deltas3 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_checksum_t, 0));
   }
   {
-    /* FIXME: Missing argout typemap: svn_wc_transmit_text_deltas3 arg 2 (svn_checksum_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_wc_transmit_text_deltas3 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_svn_checksum_t, 0));
   }
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
   {
diff --git a/subversion/bindings/swig/svn_client.i b/subversion/bindings/swig/svn_client.i
index 1b017c3..7f4dead 100644
--- a/subversion/bindings/swig/svn_client.i
+++ b/subversion/bindings/swig/svn_client.i
@@ -119,7 +119,7 @@
     ppitem = (svn_client_proplist_item_t **)(*$1)->elts;
     for (i = 0; i < nelts; ++i, ++ppitem) {
         PyObject *item = PyTuple_New(2);
-        PyObject *name = PyString_FromStringAndSize((*ppitem)->node_name->data,
+        PyObject *name = PyBytes_FromStringAndSize((*ppitem)->node_name->data,
                                                     (*ppitem)->node_name->len);
         PyObject *hash = svn_swig_py_prophash_to_dict((*ppitem)->prop_hash);
 
@@ -239,6 +239,33 @@ Callback: svn_client_diff_summarize_func_t
                   svn_swig_rb_changelist_receiver)
 #endif
 
+ /* -----------------------------------------------------------------------
+    Callback: svn_client_status_func_t
+    svn_client_status*()
+    svn_client__shelf_save_new_version3()
+ */
+
+#ifdef SWIGPYTHON
+%callback_typemap(svn_client_status_func_t status_func,
+                  void *status_baton,
+                  svn_swig_py_client_status_func,
+                  ,
+                  )
+
+%callback_typemap_maybenull(svn_client_status_func_t shelved_func,
+                            void *shelved_baton,
+                            svn_swig_py_client_status_func,
+                            ,
+                            )
+
+%callback_typemap_maybenull(svn_client_status_func_t not_shelved_func,
+                            void *not_shelved_baton,
+                            svn_swig_py_client_status_func,
+                            ,
+                            )
+#endif
+
+
 /* -----------------------------------------------------------------------
    We use 'svn_wc_status_t *' in some custom code, but it isn't in the
    API anywhere. Thus, SWIG doesn't generate a typemap entry for it. by
diff --git a/subversion/include/private/svn_branch.h b/subversion/include/private/svn_branch.h
index 3fbaeb7..df3a91c 100644
--- a/subversion/include/private/svn_branch.h
+++ b/subversion/include/private/svn_branch.h
@@ -98,7 +98,7 @@ extern "C" {
  *
  * An element may appear in any or all branches, and its EID is the same in
  * each branch in which the element appears.
- * 
+ *
  * By definition, an element keeps the same EID for its whole lifetime, even
  * if deleted from all branches and later 'resurrected'.
  *
diff --git a/subversion/include/private/svn_client_private.h b/subversion/include/private/svn_client_private.h
index d9e4a27..614405a 100644
--- a/subversion/include/private/svn_client_private.h
+++ b/subversion/include/private/svn_client_private.h
@@ -353,22 +353,6 @@ svn_client__get_diff_writer_svn(
                 svn_client_ctx_t *ctx,
                 apr_pool_t *pool);
 
-/** Output the subtree of @a shelf_version rooted at @a shelf_relpath
- * as a diff to @a diff_processor.
- *
- * ### depth and ignore_ancestry are currently ignored.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_diff(svn_client__shelf_version_t *shelf_version,
-                       const char *shelf_relpath,
-                       svn_depth_t depth,
-                       svn_boolean_t ignore_ancestry,
-                       const svn_diff_tree_processor_t *diff_processor,
-                       apr_pool_t *scratch_pool);
-
 /*** Editor for diff summary ***/
 
 /* Set *DIFF_PROCESSOR to a diff processor that will report a diff summary
diff --git a/subversion/include/private/svn_client_shelf.h b/subversion/include/private/svn_client_shelf.h
new file mode 100644
index 0000000..0d747cd
--- /dev/null
+++ b/subversion/include/private/svn_client_shelf.h
@@ -0,0 +1,498 @@
+/**
+ * @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 svn_client_shelf.h
+ * @brief Subversion's client library: experimental shelving v3
+ */
+
+#ifndef SVN_CLIENT_SHELF_H
+#define SVN_CLIENT_SHELF_H
+
+#include <apr.h>
+#include <apr_pools.h>
+#include <apr_hash.h>
+#include <apr_time.h>
+
+#include "svn_client.h"
+#include "svn_types.h"
+#include "svn_string.h"
+#include "svn_wc.h"
+#include "svn_diff.h"
+#include "private/svn_diff_tree.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+
+/** Shelving v3, with checkpoints
+ *
+ * @defgroup svn_client_shelves_checkpoints Shelves and checkpoints
+ * @{
+ */
+
+/** A shelf.
+ *
+ * @warning EXPERIMENTAL.
+ */
+typedef struct svn_client__shelf_t
+{
+    /* Public fields (read-only for public use) */
+    const char *name;
+    int max_version;  /**< @deprecated */
+
+    /* Private fields */
+    const char *wc_root_abspath;
+    const char *shelves_dir;
+    apr_hash_t *revprops;  /**< non-null; allocated in POOL */
+    svn_client_ctx_t *ctx;
+    apr_pool_t *pool;
+} svn_client__shelf_t;
+
+/** One version of a shelved change-set.
+ *
+ * @warning EXPERIMENTAL.
+ */
+typedef struct svn_client__shelf_version_t
+{
+  /* Public fields (read-only for public use) */
+  svn_client__shelf_t *shelf;
+  apr_time_t mtime;  /**< time-stamp of this version */
+
+  /* Private fields */
+  const char *files_dir_abspath;  /**< abspath of the storage area */
+  int version_number;  /**< version number starting from 1 */
+} svn_client__shelf_version_t;
+
+/** Open an existing shelf or create a new shelf.
+ *
+ * Create a new shelf (containing no versions) if a shelf named @a name
+ * is not found.
+ *
+ * The shelf should be closed after use by calling svn_client_shelf_close().
+ *
+ * @a local_abspath is any path in the WC and is used to find the WC root.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_open_or_create(svn_client__shelf_t **shelf_p,
+                                const char *name,
+                                const char *local_abspath,
+                                svn_client_ctx_t *ctx,
+                                apr_pool_t *result_pool);
+
+/** Open an existing shelf named @a name, or error if it doesn't exist.
+ *
+ * The shelf should be closed after use by calling svn_client_shelf_close().
+ *
+ * @a local_abspath is any path in the WC and is used to find the WC root.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_open_existing(svn_client__shelf_t **shelf_p,
+                               const char *name,
+                               const char *local_abspath,
+                               svn_client_ctx_t *ctx,
+                               apr_pool_t *result_pool);
+
+/** Close @a shelf.
+ *
+ * If @a shelf is NULL, do nothing; otherwise @a shelf must be an open shelf.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_close(svn_client__shelf_t *shelf,
+                       apr_pool_t *scratch_pool);
+
+/** Delete the shelf named @a name, or error if it doesn't exist.
+ *
+ * @a local_abspath is any path in the WC and is used to find the WC root.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_delete(const char *name,
+                        const char *local_abspath,
+                        svn_boolean_t dry_run,
+                        svn_client_ctx_t *ctx,
+                        apr_pool_t *scratch_pool);
+
+/** Get an editor that, when driven, will store changes in @a shelf_version.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_mods_editor(const svn_delta_editor_t **editor_p,
+                              void **edit_baton_p,
+                              svn_client__shelf_version_t *shelf_version,
+                              svn_wc_notify_func2_t notify_func,
+                              void *notify_baton,
+                              svn_client_ctx_t *ctx,
+                              apr_pool_t *result_pool);
+
+/** Save the local modifications found by @a paths, @a depth,
+ * @a changelists as a new version of @a shelf.
+ *
+ * If any paths are shelved, create a new shelf-version and return the new
+ * shelf-version in @a *new_version_p, else set @a *new_version_p to null.
+ * @a new_version_p may be null if that output is not wanted; a new shelf-
+ * version is still saved and may be found through @a shelf.
+ *
+ * @a paths are relative to the CWD, or absolute.
+ *
+ * For each successfully shelved path: call @a shelved_func (if not null)
+ * with @a shelved_baton.
+ *
+ * If any paths cannot be shelved: if @a not_shelved_func is given, call
+ * it with @a not_shelved_baton for each such path, and still create a new
+ * shelf-version if any paths are shelved.
+ *
+ * This function does not revert the changes from the WC; use
+ * svn_client_shelf_unapply() for that.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_save_new_version3(svn_client__shelf_version_t **new_version_p,
+                                   svn_client__shelf_t *shelf,
+                                   const apr_array_header_t *paths,
+                                   svn_depth_t depth,
+                                   const apr_array_header_t *changelists,
+                                   svn_client_status_func_t shelved_func,
+                                   void *shelved_baton,
+                                   svn_client_status_func_t not_shelved_func,
+                                   void *not_shelved_baton,
+                                   apr_pool_t *scratch_pool);
+
+/** Delete all newer versions of @a shelf newer than @a shelf_version.
+ *
+ * If @a shelf_version is null, delete all versions of @a shelf. (The
+ * shelf will still exist, with any log message and other revprops, but
+ * with no versions in it.)
+ *
+ * Leave the shelf's log message and other revprops unchanged.
+ *
+ * Any #svn_client__shelf_version_t object that refers to a deleted version
+ * will become invalid: attempting to use it will give undefined behaviour.
+ * The given @a shelf_version will remain valid.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_delete_newer_versions(svn_client__shelf_t *shelf,
+                                       svn_client__shelf_version_t *shelf_version,
+                                       apr_pool_t *scratch_pool);
+
+/** Return in @a shelf_version an existing version of @a shelf, given its
+ * @a version_number (starting from 1). Error if that version doesn't exist.
+ *
+ * There is no need to "close" it after use.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_version_open(svn_client__shelf_version_t **shelf_version_p,
+                              svn_client__shelf_t *shelf,
+                              int version_number,
+                              apr_pool_t *result_pool,
+                              apr_pool_t *scratch_pool);
+
+/** Return in @a shelf_version the newest version of @a shelf.
+ *
+ * Set @a shelf_version to null if no versions exist.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_get_newest_version(svn_client__shelf_version_t **shelf_version_p,
+                                    svn_client__shelf_t *shelf,
+                                    apr_pool_t *result_pool,
+                                    apr_pool_t *scratch_pool);
+
+/** Return in @a versions_p an array of (#svn_client__shelf_version_t *)
+ * containing all versions of @a shelf.
+ *
+ * The versions will be in chronological order, oldest to newest.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_get_all_versions(apr_array_header_t **versions_p,
+                                  svn_client__shelf_t *shelf,
+                                  apr_pool_t *result_pool,
+                                  apr_pool_t *scratch_pool);
+
+/** Apply @a shelf_version to the WC.
+ *
+ * If @a dry_run is true, try applying the shelf-version to the WC and
+ * report the full set of notifications about successes and conflicts,
+ * but leave the WC untouched.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_apply(svn_client__shelf_version_t *shelf_version,
+                       svn_boolean_t dry_run,
+                       apr_pool_t *scratch_pool);
+
+/** Test whether we can successfully apply the changes for @a file_relpath
+ * in @a shelf_version to the WC.
+ *
+ * Set @a *conflict_p to true if the changes conflict with the WC state,
+ * else to false.
+ *
+ * If @a file_relpath is not found in @a shelf_version, set @a *conflict_p
+ * to FALSE.
+ *
+ * @a file_relpath is relative to the WC root.
+ *
+ * A conflict means the shelf cannot be applied successfully to the WC
+ * because the change to be applied is not compatible with the current
+ * working state of the WC file. Examples are a text conflict, or the
+ * file does not exist or is a directory, or the shelf is trying to add
+ * the file but it already exists, or trying to delete it but it does not
+ * exist.
+ *
+ * Return an error only if something is broken, e.g. unable to read data
+ * from the specified shelf-version.
+ *
+ * Leave the WC untouched.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_test_apply_file(svn_boolean_t *conflict_p,
+                                 svn_client__shelf_version_t *shelf_version,
+                                 const char *file_relpath,
+                                 apr_pool_t *scratch_pool);
+
+/** Reverse-apply @a shelf_version to the WC.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_unapply(svn_client__shelf_version_t *shelf_version,
+                         svn_boolean_t dry_run,
+                         apr_pool_t *scratch_pool);
+
+/** Send committable changes found in a shelf to a delta-editor.
+ *
+ * Push changes from the @a shelf_version subtree at @a top_relpath
+ * to @a editor : @a edit_baton.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_replay(svn_client__shelf_version_t *shelf_version,
+                         const char *top_relpath,
+                         const svn_delta_editor_t *editor,
+                         void *edit_baton,
+                         svn_wc_notify_func2_t notify_func,
+                         void *notify_baton,
+                         apr_pool_t *scratch_pool);
+
+/** Set @a *affected_paths to a hash with one entry for each path affected
+ * by the @a shelf_version.
+ *
+ * The hash key is the path of the affected file, relative to the WC root.
+ *
+ * (Future possibility: When moves and copies are supported, the hash key
+ * is the old path and value is the new path.)
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_paths_changed(apr_hash_t **affected_paths,
+                               svn_client__shelf_version_t *shelf_version,
+                               apr_pool_t *result_pool,
+                               apr_pool_t *scratch_pool);
+
+/** Set @a shelf's revprop @a prop_name to @a prop_val.
+ *
+ * This can be used to set or change the shelf's log message
+ * (property name "svn:log" or #SVN_PROP_REVISION_LOG).
+ *
+ * If @a prop_val is NULL, delete the property (if present).
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_revprop_set(svn_client__shelf_t *shelf,
+                             const char *prop_name,
+                             const svn_string_t *prop_val,
+                             apr_pool_t *scratch_pool);
+
+/** Set @a shelf's revprops to @a revprop_table.
+ *
+ * This deletes all previous revprops.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_revprop_set_all(svn_client__shelf_t *shelf,
+                                 apr_hash_t *revprop_table,
+                                 apr_pool_t *scratch_pool);
+
+/** Get @a shelf's revprop @a prop_name into @a *prop_val.
+ *
+ * If the property is not present, set @a *prop_val to NULL.
+ *
+ * This can be used to get the shelf's log message
+ * (property name "svn:log" or #SVN_PROP_REVISION_LOG).
+ *
+ * The lifetime of the result is limited to that of @a shelf and/or
+ * of @a result_pool.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_revprop_get(svn_string_t **prop_val,
+                             svn_client__shelf_t *shelf,
+                             const char *prop_name,
+                             apr_pool_t *result_pool);
+
+/** Get @a shelf's revprops into @a props.
+ *
+ * The lifetime of the result is limited to that of @a shelf and/or
+ * of @a result_pool.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_revprop_list(apr_hash_t **props,
+                              svn_client__shelf_t *shelf,
+                              apr_pool_t *result_pool);
+
+/** Set the log message in @a shelf to @a log_message.
+ *
+ * If @a log_message is null, delete the log message.
+ *
+ * Similar to svn_client_shelf_revprop_set(... SVN_PROP_REVISION_LOG ...).
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_set_log_message(svn_client__shelf_t *shelf,
+                                 const char *log_message,
+                                 apr_pool_t *scratch_pool);
+
+/** Get the log message in @a shelf into @a *log_message.
+ *
+ * Set @a *log_message to NULL if there is no log message.
+ *
+ * Similar to svn_client_shelf_revprop_get(... SVN_PROP_REVISION_LOG ...).
+ *
+ * The result is allocated in @a result_pool.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_get_log_message(char **log_message,
+                                 svn_client__shelf_t *shelf,
+                                 apr_pool_t *result_pool);
+
+/** Information about a shelf.
+ *
+ * @warning EXPERIMENTAL.
+ */
+typedef struct svn_client__shelf_info_t
+{
+  apr_time_t mtime;  /**< mtime of the latest change */
+} svn_client__shelf_info_t;
+
+/** Set @a *shelf_infos to a hash, keyed by shelf name, of pointers to
+ * @c svn_client_shelf_info_t structures, one for each shelf in the
+ * given WC.
+ *
+ * @a local_abspath is any path in the WC and is used to find the WC root.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_list(apr_hash_t **shelf_infos,
+                      const char *local_abspath,
+                      svn_client_ctx_t *ctx,
+                      apr_pool_t *result_pool,
+                      apr_pool_t *scratch_pool);
+
+/** Report the shelved status of all the shelved paths in @a shelf_version
+ * via @a walk_func(@a walk_baton, ...).
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_version_status_walk(svn_client__shelf_version_t *shelf_version,
+                                     const char *wc_relpath,
+                                     svn_wc_status_func4_t walk_func,
+                                     void *walk_baton,
+                                     apr_pool_t *scratch_pool);
+
+/** Output the subtree of @a shelf_version rooted at @a shelf_relpath
+ * as a diff to @a diff_processor.
+ *
+ * ### depth and ignore_ancestry are currently ignored.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf_diff(svn_client__shelf_version_t *shelf_version,
+                       const char *shelf_relpath,
+                       svn_depth_t depth,
+                       svn_boolean_t ignore_ancestry,
+                       const svn_diff_tree_processor_t *diff_processor,
+                       apr_pool_t *scratch_pool);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif  /* SVN_CLIENT_SHELF_H */
diff --git a/subversion/include/private/svn_client_shelf2.h b/subversion/include/private/svn_client_shelf2.h
new file mode 100644
index 0000000..e265375
--- /dev/null
+++ b/subversion/include/private/svn_client_shelf2.h
@@ -0,0 +1,467 @@
+/**
+ * @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 svn_client_shelf2.h
+ * @brief Subversion's client library: experimental shelving v2
+ */
+
+#ifndef SVN_CLIENT_SHELF2_H
+#define SVN_CLIENT_SHELF2_H
+
+#include <apr.h>
+#include <apr_pools.h>
+#include <apr_hash.h>
+#include <apr_time.h>
+
+#include "svn_client.h"
+#include "svn_types.h"
+#include "svn_string.h"
+#include "svn_wc.h"
+#include "svn_diff.h"
+#include "private/svn_diff_tree.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+
+/** Shelving v2, with checkpoints
+ *
+ * @defgroup svn_client_shelves_checkpoints Shelves and checkpoints
+ * @{
+ */
+
+/** A shelf.
+ *
+ * @warning EXPERIMENTAL.
+ */
+typedef struct svn_client__shelf2_t
+{
+    /* Public fields (read-only for public use) */
+    const char *name;
+    int max_version;  /** @deprecated */
+
+    /* Private fields */
+    const char *wc_root_abspath;
+    const char *shelves_dir;
+    apr_hash_t *revprops;  /* non-null; allocated in POOL */
+    svn_client_ctx_t *ctx;
+    apr_pool_t *pool;
+} svn_client__shelf2_t;
+
+/** One version of a shelved change-set.
+ *
+ * @warning EXPERIMENTAL.
+ */
+typedef struct svn_client__shelf2_version_t
+{
+  /* Public fields (read-only for public use) */
+  svn_client__shelf2_t *shelf;
+  apr_time_t mtime;  /** time-stamp of this version */
+
+  /* Private fields */
+  const char *files_dir_abspath;  /** abspath of the storage area */
+  int version_number;  /** version number starting from 1 */
+} svn_client__shelf2_version_t;
+
+/** Open an existing shelf or create a new shelf.
+ *
+ * Create a new shelf (containing no versions) if a shelf named @a name
+ * is not found.
+ *
+ * The shelf should be closed after use by calling svn_client_shelf_close().
+ *
+ * @a local_abspath is any path in the WC and is used to find the WC root.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_open_or_create(svn_client__shelf2_t **shelf_p,
+                                  const char *name,
+                                  const char *local_abspath,
+                                  svn_client_ctx_t *ctx,
+                                  apr_pool_t *result_pool);
+
+/** Open an existing shelf named @a name, or error if it doesn't exist.
+ *
+ * The shelf should be closed after use by calling svn_client_shelf_close().
+ *
+ * @a local_abspath is any path in the WC and is used to find the WC root.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_open_existing(svn_client__shelf2_t **shelf_p,
+                                 const char *name,
+                                 const char *local_abspath,
+                                 svn_client_ctx_t *ctx,
+                                 apr_pool_t *result_pool);
+
+/** Close @a shelf.
+ *
+ * If @a shelf is NULL, do nothing; otherwise @a shelf must be an open shelf.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_close(svn_client__shelf2_t *shelf,
+                         apr_pool_t *scratch_pool);
+
+/** Delete the shelf named @a name, or error if it doesn't exist.
+ *
+ * @a local_abspath is any path in the WC and is used to find the WC root.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_delete(const char *name,
+                          const char *local_abspath,
+                          svn_boolean_t dry_run,
+                          svn_client_ctx_t *ctx,
+                          apr_pool_t *scratch_pool);
+
+/** Save the local modifications found by @a paths, @a depth,
+ * @a changelists as a new version of @a shelf.
+ *
+ * If any paths are shelved, create a new shelf-version and return the new
+ * shelf-version in @a *new_version_p, else set @a *new_version_p to null.
+ * @a new_version_p may be null if that output is not wanted; a new shelf-
+ * version is still saved and may be found through @a shelf.
+ *
+ * @a paths are relative to the CWD, or absolute.
+ *
+ * For each successfully shelved path: call @a shelved_func (if not null)
+ * with @a shelved_baton.
+ *
+ * If any paths cannot be shelved: if @a not_shelved_func is given, call
+ * it with @a not_shelved_baton for each such path, and still create a new
+ * shelf-version if any paths are shelved.
+ *
+ * This function does not revert the changes from the WC; use
+ * svn_client_shelf_unapply() for that.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_save_new_version3(svn_client__shelf2_version_t **new_version_p,
+                                     svn_client__shelf2_t *shelf,
+                                     const apr_array_header_t *paths,
+                                     svn_depth_t depth,
+                                     const apr_array_header_t *changelists,
+                                     svn_client_status_func_t shelved_func,
+                                     void *shelved_baton,
+                                     svn_client_status_func_t not_shelved_func,
+                                     void *not_shelved_baton,
+                                     apr_pool_t *scratch_pool);
+
+/** Delete all newer versions of @a shelf newer than @a shelf_version.
+ *
+ * If @a shelf_version is null, delete all versions of @a shelf. (The
+ * shelf will still exist, with any log message and other revprops, but
+ * with no versions in it.)
+ *
+ * Leave the shelf's log message and other revprops unchanged.
+ *
+ * Any #svn_client_shelf_version_t object that refers to a deleted version
+ * will become invalid: attempting to use it will give undefined behaviour.
+ * The given @a shelf_version will remain valid.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_delete_newer_versions(svn_client__shelf2_t *shelf,
+                                         svn_client__shelf2_version_t *shelf_version,
+                                         apr_pool_t *scratch_pool);
+
+/** Return in @a shelf_version an existing version of @a shelf, given its
+ * @a version_number. Error if that version doesn't exist.
+ *
+ * There is no need to "close" it after use.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_version_open(svn_client__shelf2_version_t **shelf_version_p,
+                                svn_client__shelf2_t *shelf,
+                                int version_number,
+                                apr_pool_t *result_pool,
+                                apr_pool_t *scratch_pool);
+
+/** Return in @a shelf_version the newest version of @a shelf.
+ *
+ * Set @a shelf_version to null if no versions exist.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_get_newest_version(svn_client__shelf2_version_t **shelf_version_p,
+                                      svn_client__shelf2_t *shelf,
+                                      apr_pool_t *result_pool,
+                                      apr_pool_t *scratch_pool);
+
+/** Return in @a versions_p an array of (#svn_client_shelf_version_t *)
+ * containing all versions of @a shelf.
+ *
+ * The versions will be in chronological order, oldest to newest.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_get_all_versions(apr_array_header_t **versions_p,
+                                    svn_client__shelf2_t *shelf,
+                                    apr_pool_t *result_pool,
+                                    apr_pool_t *scratch_pool);
+
+/** Apply @a shelf_version to the WC.
+ *
+ * If @a dry_run is true, try applying the shelf-version to the WC and
+ * report the full set of notifications about successes and conflicts,
+ * but leave the WC untouched.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_apply(svn_client__shelf2_version_t *shelf_version,
+                         svn_boolean_t dry_run,
+                         apr_pool_t *scratch_pool);
+
+/** Test whether we can successfully apply the changes for @a file_relpath
+ * in @a shelf_version to the WC.
+ *
+ * Set @a *conflict_p to true if the changes conflict with the WC state,
+ * else to false.
+ *
+ * If @a file_relpath is not found in @a shelf_version, set @a *conflict_p
+ * to FALSE.
+ *
+ * @a file_relpath is relative to the WC root.
+ *
+ * A conflict means the shelf cannot be applied successfully to the WC
+ * because the change to be applied is not compatible with the current
+ * working state of the WC file. Examples are a text conflict, or the
+ * file does not exist or is a directory, or the shelf is trying to add
+ * the file but it already exists, or trying to delete it but it does not
+ * exist.
+ *
+ * Return an error only if something is broken, e.g. unable to read data
+ * from the specified shelf-version.
+ *
+ * Leave the WC untouched.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_test_apply_file(svn_boolean_t *conflict_p,
+                                   svn_client__shelf2_version_t *shelf_version,
+                                   const char *file_relpath,
+                                   apr_pool_t *scratch_pool);
+
+/** Reverse-apply @a shelf_version to the WC.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_unapply(svn_client__shelf2_version_t *shelf_version,
+                           svn_boolean_t dry_run,
+                           apr_pool_t *scratch_pool);
+
+/** Set @a *affected_paths to a hash with one entry for each path affected
+ * by the @a shelf_version.
+ *
+ * The hash key is the path of the affected file, relative to the WC root.
+ *
+ * (Future possibility: When moves and copies are supported, the hash key
+ * is the old path and value is the new path.)
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_paths_changed(apr_hash_t **affected_paths,
+                                 svn_client__shelf2_version_t *shelf_version,
+                                 apr_pool_t *result_pool,
+                                 apr_pool_t *scratch_pool);
+
+/** Set @a shelf's revprop @a prop_name to @a prop_val.
+ *
+ * This can be used to set or change the shelf's log message
+ * (property name "svn:log" or #SVN_PROP_REVISION_LOG).
+ *
+ * If @a prop_val is NULL, delete the property (if present).
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_revprop_set(svn_client__shelf2_t *shelf,
+                               const char *prop_name,
+                               const svn_string_t *prop_val,
+                               apr_pool_t *scratch_pool);
+
+/** Set @a shelf's revprops to @a revprop_table.
+ *
+ * This deletes all previous revprops.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_revprop_set_all(svn_client__shelf2_t *shelf,
+                                   apr_hash_t *revprop_table,
+                                   apr_pool_t *scratch_pool);
+
+/** Get @a shelf's revprop @a prop_name into @a *prop_val.
+ *
+ * If the property is not present, set @a *prop_val to NULL.
+ *
+ * This can be used to get the shelf's log message
+ * (property name "svn:log" or #SVN_PROP_REVISION_LOG).
+ *
+ * The lifetime of the result is limited to that of @a shelf and/or
+ * of @a result_pool.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_revprop_get(svn_string_t **prop_val,
+                               svn_client__shelf2_t *shelf,
+                               const char *prop_name,
+                               apr_pool_t *result_pool);
+
+/** Get @a shelf's revprops into @a props.
+ *
+ * The lifetime of the result is limited to that of @a shelf and/or
+ * of @a result_pool.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_revprop_list(apr_hash_t **props,
+                                svn_client__shelf2_t *shelf,
+                                apr_pool_t *result_pool);
+
+/** Set the log message in @a shelf to @a log_message.
+ *
+ * If @a log_message is null, delete the log message.
+ *
+ * Similar to svn_client_shelf_revprop_set(... SVN_PROP_REVISION_LOG ...).
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_set_log_message(svn_client__shelf2_t *shelf,
+                                   const char *log_message,
+                                   apr_pool_t *scratch_pool);
+
+/** Get the log message in @a shelf into @a *log_message.
+ *
+ * Set @a *log_message to NULL if there is no log message.
+ *
+ * Similar to svn_client_shelf_revprop_get(... SVN_PROP_REVISION_LOG ...).
+ *
+ * The result is allocated in @a result_pool.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_get_log_message(char **log_message,
+                                   svn_client__shelf2_t *shelf,
+                                   apr_pool_t *result_pool);
+
+/** Information about a shelf.
+ *
+ * @warning EXPERIMENTAL.
+ */
+typedef struct svn_client__shelf2_info_t
+{
+  apr_time_t mtime;  /* mtime of the latest change */
+} svn_client__shelf2_info_t;
+
+/** Set @a *shelf_infos to a hash, keyed by shelf name, of pointers to
+ * @c svn_client_shelf_info_t structures, one for each shelf in the
+ * given WC.
+ *
+ * @a local_abspath is any path in the WC and is used to find the WC root.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_list(apr_hash_t **shelf_infos,
+                        const char *local_abspath,
+                        svn_client_ctx_t *ctx,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool);
+
+/* Report the shelved status of all the shelved paths in SHELF_VERSION
+ * via WALK_FUNC(WALK_BATON, ...).
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_version_status_walk(svn_client__shelf2_version_t *shelf_version,
+                                       const char *wc_relpath,
+                                       svn_wc_status_func4_t walk_func,
+                                       void *walk_baton,
+                                       apr_pool_t *scratch_pool);
+
+/** Output the subtree of @a shelf_version rooted at @a shelf_relpath
+ * as a diff to @a diff_processor.
+ *
+ * ### depth and ignore_ancestry are currently ignored.
+ *
+ * @warning EXPERIMENTAL.
+ */
+SVN_EXPERIMENTAL
+svn_error_t *
+svn_client__shelf2_diff(svn_client__shelf2_version_t *shelf_version,
+                        const char *shelf_relpath,
+                        svn_depth_t depth,
+                        svn_boolean_t ignore_ancestry,
+                        const svn_diff_tree_processor_t *diff_processor,
+                        apr_pool_t *scratch_pool);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif  /* SVN_CLIENT_SHELF2_H */
diff --git a/subversion/include/private/svn_dep_compat.h b/subversion/include/private/svn_dep_compat.h
index 6b381d2..7e66038 100644
--- a/subversion/include/private/svn_dep_compat.h
+++ b/subversion/include/private/svn_dep_compat.h
@@ -108,12 +108,6 @@ extern "C" {
 #define APR_OPENINFO  0x00100000
 #endif
 
-#if !APR_VERSION_AT_LEAST(1,4,0)
-#ifndef apr_time_from_msec
-#define apr_time_from_msec(msec) ((apr_time_t)(msec) * 1000)
-#endif
-#endif
-
 /**
  * APR 1 has volatile qualifier bugs in some atomic prototypes that
  * are fixed in APR 2:
diff --git a/subversion/include/private/svn_fs_fs_private.h b/subversion/include/private/svn_fs_fs_private.h
index de57558..2ca61e4 100644
--- a/subversion/include/private/svn_fs_fs_private.h
+++ b/subversion/include/private/svn_fs_fs_private.h
@@ -353,6 +353,17 @@ typedef struct svn_fs_fs__ioctl_revision_size_output_t
 /* See svn_fs_fs__revision_size(). */
 SVN_FS_DECLARE_IOCTL_CODE(SVN_FS_FS__IOCTL_REVISION_SIZE, SVN_FS_TYPE_FSFS, 1003);
 
+typedef struct svn_fs_fs__ioctl_build_rep_cache_input_t
+{
+  svn_revnum_t start_rev;
+  svn_revnum_t end_rev;
+  svn_fs_progress_notify_func_t progress_func;
+  void *progress_baton;
+} svn_fs_fs__ioctl_build_rep_cache_input_t;
+
+/* See svn_fs_fs__build_rep_cache(). */
+SVN_FS_DECLARE_IOCTL_CODE(SVN_FS_FS__IOCTL_BUILD_REP_CACHE, SVN_FS_TYPE_FSFS, 1004);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/subversion/include/private/svn_repos_private.h b/subversion/include/private/svn_repos_private.h
index 78e0829..1fd34e8 100644
--- a/subversion/include/private/svn_repos_private.h
+++ b/subversion/include/private/svn_repos_private.h
@@ -86,9 +86,11 @@ svn_repos__validate_prop(const char *name,
  *
  * NAME is used to check that VALUE should be normalized, and if this
  * is the case, VALUE is then normalized, allocated from RESULT_POOL.
- * If no normalization is required, VALUE will be copied to RESULT_POOL
- * unchanged.  If NORMALIZED_P is not NULL, and the normalization
- * happened, set *NORMALIZED_P to non-zero.  If the property is returned
+ * If no normalization happened, *RESULT_P will be set to VALUE, and
+ * no copying of the value will occur.
+ *
+ * If NORMALIZED_P is not NULL, and the normalization happened,
+ * set *NORMALIZED_P to non-zero.  If the property is returned
  * unchanged and NORMALIZED_P is not NULL, then *NORMALIZED_P will be
  * set to zero.  SCRATCH_POOL will be used for temporary allocations.
  */
diff --git a/subversion/include/private/svn_sorts_private.h b/subversion/include/private/svn_sorts_private.h
index cee84cd..d0fddc0 100644
--- a/subversion/include/private/svn_sorts_private.h
+++ b/subversion/include/private/svn_sorts_private.h
@@ -120,26 +120,29 @@ svn_sort__array_lookup(const apr_array_header_t *array,
  * @a insert_index, growing the array and shuffling existing elements along to
  * make room.
  *
+ * Raise an error if @a insert_index is less than 0 or greater than the length
+ * of the array.
+ *
  * @note Private. For use by Subversion's own code only.
  */
-void
-svn_sort__array_insert(apr_array_header_t *array,
-                       const void *new_element,
-                       int insert_index);
+svn_error_t *
+svn_sort__array_insert2(apr_array_header_t *array,
+                        const void *new_element,
+                        int insert_index);
 
 
 /* Remove @a elements_to_delete elements starting at @a delete_index from the
- * array @a arr. If @a delete_index is not a valid element of @a arr,
- * @a elements_to_delete is not greater than zero, or
- * @a delete_index + @a elements_to_delete is greater than @a arr->nelts,
- * then do nothing.
+ * array @a arr.
+ *
+ * Raise an error if the indexes to delete extends outside the array bounds
+ * or if @a elements_to_delete is not greater than zero.
  *
  * @note Private. For use by Subversion's own code only.
  */
-void
-svn_sort__array_delete(apr_array_header_t *arr,
-                       int delete_index,
-                       int elements_to_delete);
+svn_error_t *
+svn_sort__array_delete2(apr_array_header_t *arr,
+                        int delete_index,
+                        int elements_to_delete);
 
 /* Reverse the order of elements in @a array, in place.
  *
diff --git a/subversion/include/private/svn_wc_private.h b/subversion/include/private/svn_wc_private.h
index bd28b69..9e316cd 100644
--- a/subversion/include/private/svn_wc_private.h
+++ b/subversion/include/private/svn_wc_private.h
@@ -1800,7 +1800,7 @@ svn_wc__resolve_conflicts(svn_wc_context_t *wc_ctx,
                           void *notify_baton,
                           apr_pool_t *scratch_pool);
 
-/** 
+/**
  * Resolve the text conflict at LOCAL_ABSPATH as per CHOICE, and then
  * mark the conflict resolved.
  * The working copy must already be locked for resolving, e.g. by calling
@@ -1817,7 +1817,7 @@ svn_wc__conflict_text_mark_resolved(svn_wc_context_t *wc_ctx,
                                     void *notify_baton,
                                     apr_pool_t *scratch_pool);
 
-/** 
+/**
  * Resolve the conflicted property PROPNAME at LOCAL_ABSPATH as per CHOICE,
  * and then mark the conflict resolved.  If MERGED_VALUE is not NULL, this is
  * the new merged property, used when choosing #svn_wc_conflict_choose_merged.
@@ -1848,7 +1848,7 @@ svn_wc__conflict_prop_mark_resolved(svn_wc_context_t *wc_ctx,
  *
  * The tree conflict at LOCAL_ABSPATH must have the following properties or
  * SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE will be returned:
- * 
+ *
  * operation: svn_wc_operation_update or svn_wc_operation_switch
  * local change: svn_wc_conflict_reason_deleted or
  *               svn_wc_conflict_reason_replaced or
@@ -1885,7 +1885,7 @@ svn_wc__conflict_tree_update_break_moved_away(svn_wc_context_t *wc_ctx,
  *
  * The tree conflict at LOCAL_ABSPATH must have the following properties or
  * SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE will be returned:
- * 
+ *
  * operation: svn_wc_operation_update or svn_wc_operation_switch
  * local change: svn_wc_conflict_reason_deleted or
  *               svn_wc_conflict_reason_replaced
@@ -1921,7 +1921,7 @@ svn_wc__conflict_tree_update_raise_moved_away(svn_wc_context_t *wc_ctx,
  *
  * The tree conflict at LOCAL_ABSPATH must have the following properties or
  * SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE will be returned:
- * 
+ *
  * operation: svn_wc_operation_update or svn_wc_operation_switch
  * local change: svn_wc_conflict_reason_moved_away
  * incoming change: svn_wc_conflict_action_edit
diff --git a/subversion/include/svn_client.h b/subversion/include/svn_client.h
index 57a5208..c8bc74b 100644
--- a/subversion/include/svn_client.h
+++ b/subversion/include/svn_client.h
@@ -761,7 +761,7 @@ typedef svn_error_t *(*svn_client_get_commit_log_t)(
  * of the byte sequences LF ("\n"), CR ("\n"), CR LF ("\r\n") ends a line
  * and is not included in @a line. The @a line content can include all other
  * byte values including zero (ASCII NUL).
- * 
+ *
  * @note That is how line splitting is done on the final file content, from
  * which this callback is driven. It is not entirely clear whether the line
  * splitting used to calculate diffs between each revision and assign a
@@ -4479,6 +4479,10 @@ svn_client_relocate(const char *dir,
  * removed from the working copy. Otherwise, all items are reverted and
  * their on-disk state changed to match.
  *
+ * Consult the @c SVN_CONFIG_OPTION_USE_COMMIT_TIMES option in @a ctx to
+ * determine whether or not to revert timestamp to the time of last
+ * commit ('use-commit-times = yes').
+ *
  * If @a ctx->notify_func2 is non-NULL, then for each item reverted,
  * call @a ctx->notify_func2 with @a ctx->notify_baton2 and the path of
  * the reverted item.
@@ -4642,7 +4646,7 @@ typedef enum svn_client_conflict_option_id_t {
 
 /**
  * Set a merged property value on @a option to @a merged_propval.
- * 
+ *
  * Setting the merged value is required before resolving the property
  * conflict using an option with ID svn_client_conflict_option_merged_text.
  *
@@ -4711,7 +4715,7 @@ svn_client_conflict_option_get_moved_to_repos_relpath_candidates(
  *
  * @a preferred_move_target_idx must be a valid index into the list returned
  * by svn_client_conflict_option_get_moved_to_repos_relpath_candidates().
- * 
+ *
  * This function can be called multiple times.
  * It affects the output of svn_client_conflict_tree_get_description() and
  * svn_client_conflict_option_get_description(). Call these functions again
@@ -4752,7 +4756,7 @@ svn_client_conflict_option_set_moved_to_repos_relpath(
  * svn_client_conflict_option_get_moved_to_repos_relpath_candidates() before
  * calling this function to let the user select a repository path first.
  * Otherwise, one of the repository-side paths will be selected internally.
- * 
+ *
  * @a *possible_moved_to_abspaths is set to NULL if the @a option does not
  * support multiple move targets. API users may assume that only one option
  * among those which can be applied to a conflict supports move targets.
@@ -4794,10 +4798,10 @@ svn_client_conflict_option_get_moved_to_abspath_candidates(
 /**
  * Set the preferred moved target working copy path. If @a option is not
  * applicable to a moved target working copy path, do nothing.
- * 
+ *
  * @a preferred_move_target_idx must be a valid index into the list
  * returned by svn_client_conflict_option_get_moved_to_abspath_candidates2().
- * 
+ *
  * This function can be called multiple times.
  * It affects the output of svn_client_conflict_tree_get_description() and
  * svn_client_conflict_option_get_description(). Call these functions again
@@ -4843,7 +4847,7 @@ svn_client_conflict_option_find_by_id(
 
 /**
  * Return a conflict for the conflicted path @a local_abspath.
- * 
+ *
  * @since New in 1.10.
  */
 svn_error_t *
@@ -4858,7 +4862,7 @@ svn_client_conflict_get(svn_client_conflict_t **conflict,
  *
  * The lifetime of @a conflict is limited. Its allocation in
  * memory will not persist beyond this callback's execution.
- * 
+ *
  * @since New in 1.10.
  */
 typedef svn_error_t *(*svn_client_conflict_walk_func_t)(
@@ -4871,12 +4875,12 @@ typedef svn_error_t *(*svn_client_conflict_walk_func_t)(
  * Pass each conflict found during the walk to the @a conflict_walk_func
  * callback, along with @a conflict_walk_func_baton.
  * Use cancellation and notification support provided by client context @a ctx.
- * 
+ *
  * This callback may choose to resolve the conflict. If the act of resolving
  * a conflict creates new conflicts within the walked working copy (as might
  * be the case for some tree conflicts), the callback will be invoked for each
  * such new conflict as well.
- * 
+ *
  * @since New in 1.10.
  */
 svn_error_t *
@@ -4896,7 +4900,7 @@ svn_client_conflict_walk(const char *local_abspath,
 * It contains the names of conflicted properties. If no property conflict
 * exists, the array will contain no elements.
 *
-* @since New in 1.10. 
+* @since New in 1.10.
 */
 svn_error_t *
 svn_client_conflict_get_conflicted(svn_boolean_t *text_conflicted,
@@ -5079,7 +5083,7 @@ svn_client_conflict_option_get_description(svn_client_conflict_option_t *option,
  * Client implementations which aim to avoid excessive interactive prompting
  * may wish to try a recommended resolution option before falling back to
  * asking the user which option to use.
- * 
+ *
  * Conflict resolution with a recommended option is not guaranteed to succeed.
  * Clients should check for errors when trying to resolve a conflict and fall
  * back to other options and/or interactive prompting when the recommended
@@ -5097,7 +5101,7 @@ svn_client_conflict_get_recommended_option_id(svn_client_conflict_t *conflict);
  * Return the absolute path to the conflicted working copy node described
  * by @a conflict.
  *
- * @since New in 1.10. 
+ * @since New in 1.10.
  */
 const char *
 svn_client_conflict_get_local_abspath(svn_client_conflict_t *conflict);
@@ -5106,7 +5110,7 @@ svn_client_conflict_get_local_abspath(svn_client_conflict_t *conflict);
  * Return the operation during which the conflict described by @a
  * conflict was recorded.
  *
- * @since New in 1.10. 
+ * @since New in 1.10.
  */
 svn_wc_operation_t
 svn_client_conflict_get_operation(svn_client_conflict_t *conflict);
@@ -5114,8 +5118,8 @@ svn_client_conflict_get_operation(svn_client_conflict_t *conflict);
 /**
  * Return the action an update, switch, or merge operation attempted to
  * perform on the working copy node described by @a conflict.
- * 
- * @since New in 1.10. 
+ *
+ * @since New in 1.10.
  */
 svn_wc_conflict_action_t
 svn_client_conflict_get_incoming_change(svn_client_conflict_t *conflict);
@@ -5128,14 +5132,14 @@ svn_client_conflict_get_incoming_change(svn_client_conflict_t *conflict);
  * modifications in the working copy. During merge operations it may
  * additionally be part of the history of the merge target branch, anywhere
  * between the common ancestor revision and the working copy revision.
- * 
- * @since New in 1.10. 
+ *
+ * @since New in 1.10.
  */
 svn_wc_conflict_reason_t
 svn_client_conflict_get_local_change(svn_client_conflict_t *conflict);
 
 /**
- * Return information about the repository associated with @a conflict. 
+ * Return information about the repository associated with @a conflict.
  * In case of a foreign-repository merge this will differ from the
  * repository information associated with the merge target working copy.
  *
@@ -5153,11 +5157,11 @@ svn_client_conflict_get_repos_info(const char **repos_root_url,
  * old version of the conflicted node described by @a conflict.
  *
  * If the repository-relative path is not available, the @a
- * *incoming_old_repos_relpath will be set to @c NULL, 
+ * *incoming_old_repos_relpath will be set to @c NULL,
  *
  * If the peg revision is not available, @a *incoming_old_regrev will be
  * set to SVN_INVALID_REVNUM.
- * 
+ *
  * If the node kind is not available or if the node does not exist at the
  * specified path and revision, @a *incoming_old_node_kind will be set to
  * svn_node_none.
@@ -5272,7 +5276,7 @@ svn_client_conflict_prop_get_reject_abspath(svn_client_conflict_t *conflict);
  * Return the set of property values involved in the conflict of property
  * PROPNAME described by @a conflict. If a property value is unavailable the
  * corresponding output argument is set to @c NULL.
- *  
+ *
  * A 3-way diff of these property values can be generated with
  * svn_diff_mem_string_diff3(). A merged version with conflict
  * markers can be generated with svn_diff_mem_string_output_merge3().
@@ -5340,11 +5344,11 @@ const char *
 svn_client_conflict_text_get_mime_type(svn_client_conflict_t *conflict);
 
 /**
- * Return absolute paths to the versions of the text-conflicted file 
+ * Return absolute paths to the versions of the text-conflicted file
  * described by @a conflict.
  *
  * If a particular content is not available, it is set to @c NULL.
- * 
+ *
  * ### Should this be returning svn_stream_t instead of paths?
  * @since: New in 1.10.
  */
@@ -5615,7 +5619,7 @@ svn_client_copy7(const apr_array_header_t *sources,
 /**
  * Similar to svn_client_copy7(), but doesn't support meta_data_only
  * and cannot pin externals.
- * 
+ *
  *
  * @since New in 1.7.
  * @deprecated Provided for backward compatibility with the 1.8 API.
@@ -6999,436 +7003,6 @@ svn_client_cat(svn_stream_t *out,
 /** @} end group: cat */
 
 
-
-/** Shelving v2, with checkpoints
- *
- * @defgroup svn_client_shelves_checkpoints Shelves and checkpoints
- * @{
- */
-
-/** A shelf.
- *
- * @warning EXPERIMENTAL.
- */
-typedef struct svn_client__shelf_t
-{
-    /* Public fields (read-only for public use) */
-    const char *name;
-    int max_version;  /**< @deprecated */
-
-    /* Private fields */
-    const char *wc_root_abspath;
-    const char *shelves_dir;
-    apr_hash_t *revprops;  /**< non-null; allocated in POOL */
-    svn_client_ctx_t *ctx;
-    apr_pool_t *pool;
-} svn_client__shelf_t;
-
-/** One version of a shelved change-set.
- *
- * @warning EXPERIMENTAL.
- */
-typedef struct svn_client__shelf_version_t
-{
-  /* Public fields (read-only for public use) */
-  svn_client__shelf_t *shelf;
-  apr_time_t mtime;  /**< time-stamp of this version */
-
-  /* Private fields */
-  const char *files_dir_abspath;  /**< abspath of the storage area */
-  int version_number;  /**< version number starting from 1 */
-} svn_client__shelf_version_t;
-
-/** Open an existing shelf or create a new shelf.
- *
- * Create a new shelf (containing no versions) if a shelf named @a name
- * is not found.
- *
- * The shelf should be closed after use by calling svn_client_shelf_close().
- *
- * @a local_abspath is any path in the WC and is used to find the WC root.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_open_or_create(svn_client__shelf_t **shelf_p,
-                                const char *name,
-                                const char *local_abspath,
-                                svn_client_ctx_t *ctx,
-                                apr_pool_t *result_pool);
-
-/** Open an existing shelf named @a name, or error if it doesn't exist.
- *
- * The shelf should be closed after use by calling svn_client_shelf_close().
- *
- * @a local_abspath is any path in the WC and is used to find the WC root.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_open_existing(svn_client__shelf_t **shelf_p,
-                               const char *name,
-                               const char *local_abspath,
-                               svn_client_ctx_t *ctx,
-                               apr_pool_t *result_pool);
-
-/** Close @a shelf.
- *
- * If @a shelf is NULL, do nothing; otherwise @a shelf must be an open shelf.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_close(svn_client__shelf_t *shelf,
-                       apr_pool_t *scratch_pool);
-
-/** Delete the shelf named @a name, or error if it doesn't exist.
- *
- * @a local_abspath is any path in the WC and is used to find the WC root.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_delete(const char *name,
-                        const char *local_abspath,
-                        svn_boolean_t dry_run,
-                        svn_client_ctx_t *ctx,
-                        apr_pool_t *scratch_pool);
-
-/** Get an editor that, when driven, will store changes in @a shelf_version.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_mods_editor(const svn_delta_editor_t **editor_p,
-                              void **edit_baton_p,
-                              svn_client__shelf_version_t *shelf_version,
-                              svn_wc_notify_func2_t notify_func,
-                              void *notify_baton,
-                              svn_client_ctx_t *ctx,
-                              apr_pool_t *result_pool);
-
-/** Save the local modifications found by @a paths, @a depth,
- * @a changelists as a new version of @a shelf.
- *
- * If any paths are shelved, create a new shelf-version and return the new
- * shelf-version in @a *new_version_p, else set @a *new_version_p to null.
- * @a new_version_p may be null if that output is not wanted; a new shelf-
- * version is still saved and may be found through @a shelf.
- *
- * @a paths are relative to the CWD, or absolute.
- *
- * For each successfully shelved path: call @a shelved_func (if not null)
- * with @a shelved_baton.
- *
- * If any paths cannot be shelved: if @a not_shelved_func is given, call
- * it with @a not_shelved_baton for each such path, and still create a new
- * shelf-version if any paths are shelved.
- *
- * This function does not revert the changes from the WC; use
- * svn_client_shelf_unapply() for that.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_save_new_version3(svn_client__shelf_version_t **new_version_p,
-                                   svn_client__shelf_t *shelf,
-                                   const apr_array_header_t *paths,
-                                   svn_depth_t depth,
-                                   const apr_array_header_t *changelists,
-                                   svn_client_status_func_t shelved_func,
-                                   void *shelved_baton,
-                                   svn_client_status_func_t not_shelved_func,
-                                   void *not_shelved_baton,
-                                   apr_pool_t *scratch_pool);
-
-/** Delete all newer versions of @a shelf newer than @a shelf_version.
- *
- * If @a shelf_version is null, delete all versions of @a shelf. (The
- * shelf will still exist, with any log message and other revprops, but
- * with no versions in it.)
- *
- * Leave the shelf's log message and other revprops unchanged.
- *
- * Any #svn_client__shelf_version_t object that refers to a deleted version
- * will become invalid: attempting to use it will give undefined behaviour.
- * The given @a shelf_version will remain valid.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_delete_newer_versions(svn_client__shelf_t *shelf,
-                                       svn_client__shelf_version_t *shelf_version,
-                                       apr_pool_t *scratch_pool);
-
-/** Return in @a shelf_version an existing version of @a shelf, given its
- * @a version_number (starting from 1). Error if that version doesn't exist.
- *
- * There is no need to "close" it after use.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_version_open(svn_client__shelf_version_t **shelf_version_p,
-                              svn_client__shelf_t *shelf,
-                              int version_number,
-                              apr_pool_t *result_pool,
-                              apr_pool_t *scratch_pool);
-
-/** Return in @a shelf_version the newest version of @a shelf.
- *
- * Set @a shelf_version to null if no versions exist.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_get_newest_version(svn_client__shelf_version_t **shelf_version_p,
-                                    svn_client__shelf_t *shelf,
-                                    apr_pool_t *result_pool,
-                                    apr_pool_t *scratch_pool);
-
-/** Return in @a versions_p an array of (#svn_client__shelf_version_t *)
- * containing all versions of @a shelf.
- *
- * The versions will be in chronological order, oldest to newest.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_get_all_versions(apr_array_header_t **versions_p,
-                                  svn_client__shelf_t *shelf,
-                                  apr_pool_t *result_pool,
-                                  apr_pool_t *scratch_pool);
-
-/** Apply @a shelf_version to the WC.
- *
- * If @a dry_run is true, try applying the shelf-version to the WC and
- * report the full set of notifications about successes and conflicts,
- * but leave the WC untouched.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_apply(svn_client__shelf_version_t *shelf_version,
-                       svn_boolean_t dry_run,
-                       apr_pool_t *scratch_pool);
-
-/** Test whether we can successfully apply the changes for @a file_relpath
- * in @a shelf_version to the WC.
- *
- * Set @a *conflict_p to true if the changes conflict with the WC state,
- * else to false.
- *
- * If @a file_relpath is not found in @a shelf_version, set @a *conflict_p
- * to FALSE.
- *
- * @a file_relpath is relative to the WC root.
- *
- * A conflict means the shelf cannot be applied successfully to the WC
- * because the change to be applied is not compatible with the current
- * working state of the WC file. Examples are a text conflict, or the
- * file does not exist or is a directory, or the shelf is trying to add
- * the file but it already exists, or trying to delete it but it does not
- * exist.
- *
- * Return an error only if something is broken, e.g. unable to read data
- * from the specified shelf-version.
- *
- * Leave the WC untouched.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_test_apply_file(svn_boolean_t *conflict_p,
-                                 svn_client__shelf_version_t *shelf_version,
-                                 const char *file_relpath,
-                                 apr_pool_t *scratch_pool);
-
-/** Reverse-apply @a shelf_version to the WC.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_unapply(svn_client__shelf_version_t *shelf_version,
-                         svn_boolean_t dry_run,
-                         apr_pool_t *scratch_pool);
-
-/** Send committable changes found in a shelf to a delta-editor.
- *
- * Push changes from the @a shelf_version subtree at @a top_relpath
- * to @a editor : @a edit_baton.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_replay(svn_client__shelf_version_t *shelf_version,
-                         const char *top_relpath,
-                         const svn_delta_editor_t *editor,
-                         void *edit_baton,
-                         svn_wc_notify_func2_t notify_func,
-                         void *notify_baton,
-                         apr_pool_t *scratch_pool);
-
-/** Set @a *affected_paths to a hash with one entry for each path affected
- * by the @a shelf_version.
- *
- * The hash key is the path of the affected file, relative to the WC root.
- *
- * (Future possibility: When moves and copies are supported, the hash key
- * is the old path and value is the new path.)
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_paths_changed(apr_hash_t **affected_paths,
-                               svn_client__shelf_version_t *shelf_version,
-                               apr_pool_t *result_pool,
-                               apr_pool_t *scratch_pool);
-
-/** Set @a shelf's revprop @a prop_name to @a prop_val.
- *
- * This can be used to set or change the shelf's log message
- * (property name "svn:log" or #SVN_PROP_REVISION_LOG).
- *
- * If @a prop_val is NULL, delete the property (if present).
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_revprop_set(svn_client__shelf_t *shelf,
-                             const char *prop_name,
-                             const svn_string_t *prop_val,
-                             apr_pool_t *scratch_pool);
-
-/** Set @a shelf's revprops to @a revprop_table.
- *
- * This deletes all previous revprops.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_revprop_set_all(svn_client__shelf_t *shelf,
-                                 apr_hash_t *revprop_table,
-                                 apr_pool_t *scratch_pool);
-
-/** Get @a shelf's revprop @a prop_name into @a *prop_val.
- *
- * If the property is not present, set @a *prop_val to NULL.
- *
- * This can be used to get the shelf's log message
- * (property name "svn:log" or #SVN_PROP_REVISION_LOG).
- *
- * The lifetime of the result is limited to that of @a shelf and/or
- * of @a result_pool.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_revprop_get(svn_string_t **prop_val,
-                             svn_client__shelf_t *shelf,
-                             const char *prop_name,
-                             apr_pool_t *result_pool);
-
-/** Get @a shelf's revprops into @a props.
- *
- * The lifetime of the result is limited to that of @a shelf and/or
- * of @a result_pool.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_revprop_list(apr_hash_t **props,
-                              svn_client__shelf_t *shelf,
-                              apr_pool_t *result_pool);
-
-/** Set the log message in @a shelf to @a log_message.
- *
- * If @a log_message is null, delete the log message.
- *
- * Similar to svn_client_shelf_revprop_set(... SVN_PROP_REVISION_LOG ...).
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_set_log_message(svn_client__shelf_t *shelf,
-                                 const char *log_message,
-                                 apr_pool_t *scratch_pool);
-
-/** Get the log message in @a shelf into @a *log_message.
- *
- * Set @a *log_message to NULL if there is no log message.
- *
- * Similar to svn_client_shelf_revprop_get(... SVN_PROP_REVISION_LOG ...).
- *
- * The result is allocated in @a result_pool.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_get_log_message(char **log_message,
-                                 svn_client__shelf_t *shelf,
-                                 apr_pool_t *result_pool);
-
-/** Information about a shelf.
- *
- * @warning EXPERIMENTAL.
- */
-typedef struct svn_client__shelf_info_t
-{
-  apr_time_t mtime;  /**< mtime of the latest change */
-} svn_client__shelf_info_t;
-
-/** Set @a *shelf_infos to a hash, keyed by shelf name, of pointers to
- * @c svn_client_shelf_info_t structures, one for each shelf in the
- * given WC.
- *
- * @a local_abspath is any path in the WC and is used to find the WC root.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_list(apr_hash_t **shelf_infos,
-                      const char *local_abspath,
-                      svn_client_ctx_t *ctx,
-                      apr_pool_t *result_pool,
-                      apr_pool_t *scratch_pool);
-
-/** Report the shelved status of all the shelved paths in @a shelf_version
- * via @a walk_func(@a walk_baton, ...).
- *
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client__shelf_version_status_walk(svn_client__shelf_version_t *shelf_version,
-                                     const char *wc_relpath,
-                                     svn_wc_status_func4_t walk_func,
-                                     void *walk_baton,
-                                     apr_pool_t *scratch_pool);
-/** @} */
-
 /** Changelist commands
  *
  * @defgroup svn_client_changelist_funcs Client Changelist Functions
diff --git a/subversion/include/svn_config.h b/subversion/include/svn_config.h
index d194af0..5e2ae17 100644
--- a/subversion/include/svn_config.h
+++ b/subversion/include/svn_config.h
@@ -44,8 +44,8 @@ extern "C" {
 /**************************************************************************
  ***                                                                    ***
  ***  For a description of the SVN configuration file syntax, see       ***
- ***  your ~/.subversion/README, which is written out automatically by  ***
- ***  svn_config_ensure().                                              ***
+ ***  your ~/.subversion/README.txt, which is written out automatically ***
+ ***  by svn_config_ensure().                                           ***
  ***                                                                    ***
  **************************************************************************/
 
diff --git a/subversion/include/svn_diff.h b/subversion/include/svn_diff.h
index bd2c970..61f4b77 100644
--- a/subversion/include/svn_diff.h
+++ b/subversion/include/svn_diff.h
@@ -711,7 +711,7 @@ svn_diff_file_output_unified(svn_stream_t *output_stream,
  * @a conflict_latest to be displayed as conflict markers in the output.
  * If @a conflict_original, @a conflict_modified, @a conflict_latest and/or
  * @a conflict_separator is @c NULL, a default marker will be displayed.
- * @a conflict_style dictates how conflicts are displayed. 
+ * @a conflict_style dictates how conflicts are displayed.
  * Uses @a scratch_pool for temporary allocations.
  *
  * If not @c NULL, call @a cancel_func with @a cancel_baton once or multiple
diff --git a/subversion/include/svn_error_codes.h b/subversion/include/svn_error_codes.h
index ba63b6f..c00c0f5 100644
--- a/subversion/include/svn_error_codes.h
+++ b/subversion/include/svn_error_codes.h
@@ -893,6 +893,16 @@ SVN_ERROR_START
              SVN_ERR_FS_CATEGORY_START + 68,
              "Unrecognized filesystem I/O control code")
 
+  /** @since New in 1.14. */
+  SVN_ERRDEF(SVN_ERR_FS_REP_SHARING_NOT_ALLOWED,
+             SVN_ERR_FS_CATEGORY_START + 69,
+             "Rep-sharing is not allowed.")
+
+  /** @since New in 1.14. */
+  SVN_ERRDEF(SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED,
+             SVN_ERR_FS_CATEGORY_START + 70,
+             "Rep-sharing is not supported.")
+
   /* repos errors */
 
   SVN_ERRDEF(SVN_ERR_REPOS_LOCKED,
@@ -1779,7 +1789,7 @@ SVN_ERROR_START
 
   SVN_ERRDEF(SVN_ERR_X509_CERT_VERIFY_FAILED,
              SVN_ERR_X509_CATEGORY_START + 19,
-             "Certficate verification failed")
+             "Certificate verification failed")
 
 SVN_ERROR_END
 
diff --git a/subversion/include/svn_ra.h b/subversion/include/svn_ra.h
index d3b0550..4c71520 100644
--- a/subversion/include/svn_ra.h
+++ b/subversion/include/svn_ra.h
@@ -65,7 +65,7 @@ svn_ra_version(void);
  * @a close_baton as appropriate.
  *
  * @a path is relative to the "root" of the session, defined by the
- * @a repos_URL passed to svn_ra_open4() vtable call.
+ * @a repos_URL passed to svn_ra_open5() vtable call.
  *
  * @a name is the name of the property to fetch. If the property is present,
  * then it is returned in @a value. Otherwise, @a *value is set to @c NULL.
@@ -369,7 +369,7 @@ typedef struct svn_ra_reporter3_t
    * implementor should assume the directory has no entries or props.
    *
    * This will *override* any previous set_path() calls made on parent
-   * paths.  @a path is relative to the URL specified in svn_ra_open4().
+   * paths.  @a path is relative to the URL specified in svn_ra_open5().
    *
    * If @a lock_token is non-NULL, it is the lock token for @a path in the WC.
    *
@@ -520,7 +520,7 @@ typedef struct svn_ra_reporter_t
 /** A collection of callbacks implemented by libsvn_client which allows
  * an RA layer to "pull" information from the client application, or
  * possibly store information.  libsvn_client passes this vtable to
- * svn_ra_open4().
+ * svn_ra_open5().
  *
  * Each routine takes a @a callback_baton originally provided with the
  * vtable.
@@ -710,6 +710,14 @@ typedef struct svn_ra_session_t svn_ra_session_t;
  * within the new repository root URL that @a repos_URL pointed to within
  * the old repository root URL.
  *
+ * If @a redirect_url is not NULL and a @corrected_url is returned, then
+ * @a redirect_url contains a non-canonicalized version of @a corrected_url,
+ * as communicated in the network protocol used by the RA provider.
+ * THe @a redirect_url should be used for to detect redirection loops.
+ * Canonicalization may change the protocol-level URL in a way that
+ * makes detection of redirect loops impossible in some cases since URLs which
+ * are different at the protocol layer could map to the same canonicalized URL.
+ *
  * Return @c SVN_ERR_RA_UUID_MISMATCH if @a uuid is non-NULL and not equal
  * to the UUID of the repository at @c repos_URL.
  *
@@ -728,8 +736,26 @@ typedef struct svn_ra_session_t svn_ra_session_t;
  *
  * @see svn_client_open_ra_session().
  *
+ * @since New in 1.14.
+ */
+svn_error_t *
+svn_ra_open5(svn_ra_session_t **session_p,
+             const char **corrected_url,
+             const char **redirect_url,
+             const char *repos_URL,
+             const char *uuid,
+             const svn_ra_callbacks2_t *callbacks,
+             void *callback_baton,
+             apr_hash_t *config,
+             apr_pool_t *pool);
+
+/** Similar to svn_ra_open5(), but with @a redirect_url always passed
+ * as @c NULL.
+ *
  * @since New in 1.7.
+ * @deprecated Provided for backward compatibility with the 1.13 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_open4(svn_ra_session_t **session_p,
              const char **corrected_url,
diff --git a/subversion/include/svn_ra_svn.h b/subversion/include/svn_ra_svn.h
index 6293255..0bcd40b 100644
--- a/subversion/include/svn_ra_svn.h
+++ b/subversion/include/svn_ra_svn.h
@@ -201,7 +201,7 @@ typedef svn_error_t *(*svn_ra_svn_edit_callback)(void *baton);
  * If @a max_out is not 0, error out and close the connection whenever more
  * than @a max_out bytes have been send as response to some command.
  *
- * @note The limits enforced may vary slightly by +/- the I/O buffer size. 
+ * @note The limits enforced may vary slightly by +/- the I/O buffer size.
  *
  * @note If @a out_stream is an wrapped apr_file_t* the backing file will be
  * used for some operations.
diff --git a/subversion/include/svn_repos.h b/subversion/include/svn_repos.h
index 1df4452..35ff000 100644
--- a/subversion/include/svn_repos.h
+++ b/subversion/include/svn_repos.h
@@ -679,7 +679,7 @@ svn_repos_fs_type(svn_repos_t *repos,
  * The optional @a cancel_func callback will be invoked with
  * @a cancel_baton as usual to allow the user to preempt this potentially
  * lengthy operation.
- * 
+ *
  * Use @a scratch_pool for temporary allocations.
  *
  * @since New in 1.9.
@@ -3360,7 +3360,7 @@ svn_repos_dump_fs4(svn_repos_t *repos,
                    apr_pool_t *pool);
 
 /**
- * Similar to svn_repos_dump_fs4(), but with @a include_revprops and 
+ * Similar to svn_repos_dump_fs4(), but with @a include_revprops and
  * @a include_changes both set to @c TRUE and @a filter_func and
  * @a filter_baton set to @c NULL.
  *
diff --git a/subversion/include/svn_types.h b/subversion/include/svn_types.h
index d9f98f2..418d6ac 100644
--- a/subversion/include/svn_types.h
+++ b/subversion/include/svn_types.h
@@ -249,35 +249,6 @@ typedef struct svn_version_t svn_version_t;
 
 
 
-/** @defgroup apr_hash_utilities APR Hash Table Helpers
- * These functions enable the caller to dereference an APR hash table index
- * without type casts or temporary variables.
- *
- * These functions are provided by APR itself from version 1.5.
- * Definitions are provided here for when using older versions of APR.
- * @{
- */
-
-#if !APR_VERSION_AT_LEAST(1, 5, 0)
-
-/** Return the key of the hash table entry indexed by @a hi. */
-const void *
-apr_hash_this_key(apr_hash_index_t *hi);
-
-/** Return the key length of the hash table entry indexed by @a hi. */
-apr_ssize_t
-apr_hash_this_key_len(apr_hash_index_t *hi);
-
-/** Return the value of the hash table entry indexed by @a hi. */
-void *
-apr_hash_this_val(apr_hash_index_t *hi);
-
-#endif
-
-/** @} */
-
-
-
 /** On Windows, APR_STATUS_IS_ENOTDIR includes several kinds of
  * invalid-pathname error but not ERROR_INVALID_NAME, so we include it.
  * We also include ERROR_DIRECTORY as that was not included in apr versions
diff --git a/subversion/include/svn_version.h b/subversion/include/svn_version.h
index c43f483..25bbe54 100644
--- a/subversion/include/svn_version.h
+++ b/subversion/include/svn_version.h
@@ -61,7 +61,7 @@ extern "C" {
  * Modify when new functionality is added or new interfaces are
  * defined, but all changes are backward compatible.
  */
-#define SVN_VER_MINOR      13
+#define SVN_VER_MINOR      14
 
 /**
  * Patch number.
@@ -93,7 +93,7 @@ extern "C" {
  *
  * Always change this at the same time as SVN_VER_NUMTAG.
  */
-#define SVN_VER_TAG        " (r1867053)"
+#define SVN_VER_TAG        " (r1876290)"
 
 
 /** Number tag: a string describing the version.
@@ -117,7 +117,7 @@ extern "C" {
  * file version. Its value remains 0 in the repository except in release
  * tags where it is the revision from which the tag was created.
  */
-#define SVN_VER_REVISION   1867053
+#define SVN_VER_REVISION   1876290
 
 
 /* Version strings composed from the above definitions. */
diff --git a/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c b/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
index 7926960..a871a93 100644
--- a/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
+++ b/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
@@ -120,10 +120,10 @@ password_get_gnome_keyring(svn_boolean_t *done,
   gchar *gpassword;
 
   *done = FALSE;
-  
+
   if (!available_collection(non_interactive, pool))
     return SVN_NO_ERROR;
-  
+
   gpassword = secret_password_lookup_sync(SECRET_SCHEMA_COMPAT_NETWORK, NULL,
                                           &gerror,
                                           "domain", realmstring,
@@ -140,7 +140,7 @@ password_get_gnome_keyring(svn_boolean_t *done,
       g_free(gpassword);
       *done = TRUE;
     }
-  
+
   return SVN_NO_ERROR;
 }
 
@@ -158,7 +158,7 @@ password_set_gnome_keyring(svn_boolean_t *done,
 {
   GError *gerror = NULL;
   gboolean gstatus;
-  
+
   *done = FALSE;
 
   if (!available_collection(non_interactive, pool))
@@ -182,7 +182,7 @@ password_set_gnome_keyring(svn_boolean_t *done,
     {
       *done = TRUE;
     }
-  
+
   return SVN_NO_ERROR;
 }
 
diff --git a/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp
index f59e047..c64caab 100644
--- a/subversion/libsvn_auth_kwallet/kwallet.cpp
+++ b/subversion/libsvn_auth_kwallet/kwallet.cpp
@@ -227,10 +227,10 @@ kwallet_password_get(svn_boolean_t *done,
   KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
 
   /* componentName appears in KDE GUI prompts */
-  KAboutData aboutData(QStringLiteral("subversion"),     /* componentName */
+  KAboutData aboutData(QString("subversion"),            /* componentName */
                        i18n(get_application_name(parameters,
                                                  pool)), /* displayName */
-                       QStringLiteral(SVN_VER_NUMBER));
+                       QString(SVN_VER_NUMBER));
   KAboutData::setApplicationData(aboutData);
 #else
   KCmdLineArgs::init(q_argc, q_argv,
@@ -309,10 +309,10 @@ kwallet_password_set(svn_boolean_t *done,
   KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
 
   /* componentName appears in KDE GUI prompts */
-  KAboutData aboutData(QStringLiteral("subversion"),     /* componentName */
+  KAboutData aboutData(QString("subversion"),            /* componentName */
                        i18n(get_application_name(parameters,
                                                  pool)), /* displayName */
-                       QStringLiteral(SVN_VER_NUMBER));
+                       QString(SVN_VER_NUMBER));
   KAboutData::setApplicationData(aboutData);
 #else
   KCmdLineArgs::init(q_argc, q_argv,
diff --git a/subversion/libsvn_client/blame.c b/subversion/libsvn_client/blame.c
index ab48d40..f78b304 100644
--- a/subversion/libsvn_client/blame.c
+++ b/subversion/libsvn_client/blame.c
@@ -456,7 +456,7 @@ file_rev_handler(void *baton, const char *path, svn_revnum_t revnum,
               SVN_ERR_CLIENT_IS_BINARY_FILE, NULL,
               _("Cannot calculate blame information for binary file '%s'"),
                (svn_path_is_url(frb->target)
-                      ? frb->target 
+                      ? frb->target
                       : svn_dirent_local_style(frb->target, pool)));
         }
     }
@@ -553,7 +553,7 @@ file_rev_handler(void *baton, const char *path, svn_revnum_t revnum,
                      || frb->include_merged_revisions);
 
       /* The file existed before start_rev; generate no blame info for
-         lines from this revision (or before). 
+         lines from this revision (or before).
 
          This revision specifies the state as it was at the start revision */
 
@@ -739,7 +739,7 @@ svn_client_blame6(svn_revnum_t *start_revnum_p,
 
           mime_type = svn_prop_get_value(props, SVN_PROP_MIME_TYPE);
         }
-      else 
+      else
         {
           const svn_string_t *value;
 
diff --git a/subversion/libsvn_client/conflicts.c b/subversion/libsvn_client/conflicts.c
index 920c55e..9a58703 100644
--- a/subversion/libsvn_client/conflicts.c
+++ b/subversion/libsvn_client/conflicts.c
@@ -383,7 +383,7 @@ add_new_move(struct repos_move_info **new_move,
              const char *author,
              apr_hash_t *moved_paths,
              svn_ra_session_t *ra_session,
-             const char *repos_root_url, 
+             const char *repos_root_url,
              apr_pool_t *result_pool,
              apr_pool_t *scratch_pool)
 {
@@ -661,7 +661,7 @@ match_copies_to_deletion(const char *deleted_repos_relpath,
                                           TRUE, iterpool));
               if (!related)
                 continue;
-              
+
               /* Remember details of this move. */
               SVN_ERR(add_new_move(&move, deleted_repos_relpath,
                                    copy->copyto_path, copy->copyfrom_rev,
@@ -669,7 +669,7 @@ match_copies_to_deletion(const char *deleted_repos_relpath,
                                    moved_paths, ra_session, repos_root_url,
                                    result_pool, iterpool));
               push_move(move, moves_table, result_pool);
-            } 
+            }
         }
       else
         {
@@ -782,7 +782,7 @@ map_deleted_path_to_move(const char *deleted_relpath,
     {
       const char *relpath;
       struct repos_move_info *move;
-          
+
       move = APR_ARRAY_IDX(moves, i, struct repos_move_info *);
       if (strcmp(move->moved_from_repos_relpath, deleted_relpath) == 0)
         return move;
@@ -806,7 +806,7 @@ map_deleted_path_to_move(const char *deleted_relpath,
   if (closest_move)
     {
       const char *relpath;
-      
+
       /* See if we can find an even closer move for this moved-along path. */
       relpath = svn_relpath_skip_ancestor(closest_move->moved_to_repos_relpath,
                                           deleted_relpath);
@@ -967,7 +967,7 @@ cache_copied_item(apr_hash_t *copies, const char *changed_path,
  * This function answers the same question as svn_ra_get_deleted_rev() but
  * works in cases where we do not already know a revision in which the deleted
  * node once used to exist.
- * 
+ *
  * If the node was moved, rather than deleted, return move information
  * in BATON->MOVE.
  */
@@ -1098,7 +1098,7 @@ find_deleted_rev(void *baton,
         b->deleted_rev_author = apr_pstrdup(b->result_pool, author->data);
       else
         b->deleted_rev_author = _("unknown author");
-          
+
       b->replacing_node_kind = replacing_node_kind;
 
       /* We're done. Abort the log operation. */
@@ -1173,7 +1173,7 @@ describe_local_file_node_change(const char **description,
           const char *moved_to_abspath;
           svn_error_t *err;
 
-          err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL, 
+          err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
                                             ctx->wc_ctx,
                                             conflict->local_abspath,
                                             scratch_pool,
@@ -1257,7 +1257,7 @@ describe_local_file_node_change(const char **description,
         {
           const char *moved_from_abspath;
 
-          SVN_ERR(svn_wc__node_was_moved_here(&moved_from_abspath, NULL, 
+          SVN_ERR(svn_wc__node_was_moved_here(&moved_from_abspath, NULL,
                                               ctx->wc_ctx,
                                               conflict->local_abspath,
                                               scratch_pool,
@@ -1398,7 +1398,7 @@ describe_local_dir_node_change(const char **description,
           const char *moved_to_abspath;
           svn_error_t *err;
 
-          err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL, 
+          err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
                                             ctx->wc_ctx,
                                             conflict->local_abspath,
                                             scratch_pool,
@@ -1483,7 +1483,7 @@ describe_local_dir_node_change(const char **description,
         {
           const char *moved_from_abspath;
 
-          SVN_ERR(svn_wc__node_was_moved_here(&moved_from_abspath, NULL, 
+          SVN_ERR(svn_wc__node_was_moved_here(&moved_from_abspath, NULL,
                                               ctx->wc_ctx,
                                               conflict->local_abspath,
                                               scratch_pool,
@@ -1581,7 +1581,7 @@ struct find_moves_baton
    *   rB: mv b->c
    *   rC: mv c->d
    * we map each revision number to all the moves which happened in the
-   * revision, which looks as follows: 
+   * revision, which looks as follows:
    *   rA : [(x->z), (a->b)]
    *   rB : [(b->c)]
    *   rC : [(c->d)]
@@ -2628,7 +2628,7 @@ collect_sibling_move_candidates(apr_array_header_t *candidates,
                                 svn_client_ctx_t *ctx,
                                 apr_pool_t *result_pool,
                                 apr_pool_t *scratch_pool)
-{ 
+{
   const char *basename;
   apr_array_header_t *abspaths;
   int i;
@@ -2774,7 +2774,7 @@ follow_move_chains(apr_hash_t *wc_move_targets,
                                      ctx, victim_abspath, victim_node_kind,
                                      victim_repos_relpath, victim_revision,
                                      result_pool, iterpool));
-                                        
+
         }
       svn_pool_destroy(iterpool);
     }
@@ -2840,7 +2840,7 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict,
 
   /* Pick the younger incoming node as our 'related node' which helps
    * pin-pointing the deleted conflict victim in history. */
-  related_repos_relpath = 
+  related_repos_relpath =
             (old_rev < new_rev ? new_repos_relpath : old_repos_relpath);
   related_peg_rev = (old_rev < new_rev ? new_rev : old_rev);
 
@@ -3012,7 +3012,7 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict,
   if (deleted_rev != SVN_INVALID_REVNUM)
     details->deleted_repos_relpath = svn_relpath_join(parent_repos_relpath,
                                                       deleted_basename,
-                                                      conflict->pool); 
+                                                      conflict->pool);
   details->moves = moves;
   if (details->moves != NULL)
     {
@@ -3058,7 +3058,7 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict,
           details->wc_move_target_idx = 0;
         }
     }
-                                         
+
   details->sibling_moves = sibling_moves;
   details->wc_siblings = wc_siblings;
   if (details->wc_move_targets && apr_hash_count(details->wc_move_targets) == 1)
@@ -3244,7 +3244,7 @@ conflict_tree_get_description_local_missing(const char **description,
   if (details->moves || details->sibling_moves)
     {
       struct repos_move_info *move;
-      
+
       *description = _("No such file or directory was found in the "
                        "merge target working copy.\n");
 
@@ -3924,7 +3924,7 @@ describe_incoming_deletion_upon_update(
               struct repos_move_info *move;
 
               move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
-              description = 
+              description =
                 apr_psprintf(result_pool,
                              _("Item updated from r%ld to r%ld was moved "
                                "to '^/%s' by %s in r%ld."), old_rev, new_rev,
@@ -4062,7 +4062,7 @@ describe_incoming_deletion_upon_switch(
                                                        result_pool,
                                                        scratch_pool);
             }
-          return description;    
+          return description;
         }
       else if (victim_node_kind == svn_node_file ||
                victim_node_kind == svn_node_symlink)
@@ -4215,7 +4215,7 @@ describe_incoming_deletion_upon_switch(
             {
               struct repos_move_info *move;
               const char *description;
-              
+
               move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
               description =
                 apr_psprintf(result_pool,
@@ -4846,7 +4846,7 @@ conflict_tree_get_description_incoming_delete(
           action = describe_incoming_reverse_addition_upon_switch(
                      details, victim_node_kind, old_repos_relpath, old_rev,
                      new_repos_relpath, new_rev, result_pool);
-            
+
         }
       }
   else if (conflict_operation == svn_wc_operation_merge)
@@ -6190,7 +6190,7 @@ describe_incoming_edit_list_modified_revs(apr_array_header_t *edits,
                                details->rev, details->author,
                                i < edits->nelts - 1 ? "," : "");
             }
-        } 
+        }
       else
         s = apr_psprintf(result_pool, _("%s r%ld by %s%s"), s,
                          details->rev, details->author,
@@ -6339,7 +6339,7 @@ conflict_tree_get_description_incoming_edit(
                                         "during reverse-merge of\n"
                                         "'^/%s:%ld-%ld'"),
                                       new_repos_relpath, new_rev + 1, old_rev);
-                
+
               else
                 action = apr_psprintf(scratch_pool,
                                       _("Changes from the following revisions "
@@ -6374,7 +6374,7 @@ svn_client_conflict_tree_get_description(
   SVN_ERR(conflict->tree_conflict_get_local_description_func(
             local_change_description,
             conflict, ctx, result_pool, scratch_pool));
-  
+
   return SVN_NO_ERROR;
 }
 
@@ -6989,7 +6989,7 @@ unlock_wc:
                                                             scratch_pool));
   svn_io_sleep_for_timestamps(local_abspath, scratch_pool);
   SVN_ERR(err);
-  
+
   if (ctx->notify_func2)
     {
       svn_wc_notify_t *notify;
@@ -8190,7 +8190,7 @@ ensure_local_edit_vs_incoming_deletion_copied_state(
 
   SVN_ERR_ASSERT(operation == svn_wc_operation_update ||
                  operation == svn_wc_operation_switch);
-  
+
   SVN_ERR(svn_wc__node_get_origin(&is_copy, &copyfrom_rev,
                                   &copyfrom_repos_relpath,
                                   NULL, NULL, NULL, NULL,
@@ -8533,7 +8533,7 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option,
                  svn_client_conflict_option_incoming_move_file_text_merge ||
                  option_id ==
                  svn_client_conflict_option_both_moved_file_move_merge);
-                  
+
   SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
                                              conflict, scratch_pool,
                                              scratch_pool));
@@ -8741,7 +8741,7 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option,
         goto unlock_wc;
       incoming_abspath = NULL;
     }
-  
+
   if (ctx->notify_func2)
     {
       svn_wc_notify_t *notify;
@@ -8862,7 +8862,7 @@ resolve_both_moved_file_text_merge(svn_client_conflict_option_t *option,
 
   option_id = svn_client_conflict_option_get_id(option);
   SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_file_merge);
-                  
+
   SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
                                              conflict, scratch_pool,
                                              scratch_pool));
@@ -9061,7 +9061,7 @@ resolve_both_moved_dir_merge(svn_client_conflict_option_t *option,
 
   option_id = svn_client_conflict_option_get_id(option);
   SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_dir_merge);
-                  
+
   SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
                                              conflict, scratch_pool,
                                              scratch_pool));
@@ -9210,7 +9210,7 @@ resolve_both_moved_dir_move_merge(svn_client_conflict_option_t *option,
   option_id = svn_client_conflict_option_get_id(option);
   SVN_ERR_ASSERT(option_id ==
                  svn_client_conflict_option_both_moved_dir_move_merge);
-                  
+
   SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
                                              conflict, scratch_pool,
                                              scratch_pool));
@@ -9364,7 +9364,7 @@ resolve_incoming_move_dir_merge(svn_client_conflict_option_t *option,
   option_id = svn_client_conflict_option_get_id(option);
   SVN_ERR_ASSERT(option_id ==
                  svn_client_conflict_option_incoming_move_dir_merge);
-                  
+
   SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, &repos_uuid,
                                              conflict, scratch_pool,
                                              scratch_pool));
@@ -11160,7 +11160,7 @@ resolve_both_moved_file_update_keep_local_move(
 
   option_id = svn_client_conflict_option_get_id(option);
   SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_file_merge);
-                  
+
   SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
                                              conflict, scratch_pool,
                                              scratch_pool));
@@ -11371,7 +11371,7 @@ resolve_both_moved_file_update_keep_incoming_move(
   option_id = svn_client_conflict_option_get_id(option);
   SVN_ERR_ASSERT(option_id ==
                  svn_client_conflict_option_both_moved_file_move_merge);
-                  
+
   SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL,
                                              conflict, scratch_pool,
                                              scratch_pool));
@@ -11537,7 +11537,7 @@ conflict_tree_get_details_update_local_moved_away(
 
   details->wc_move_targets = apr_array_make(conflict->pool, 1,
                                             sizeof(const char *));
-  
+
   /* Search the WC for copies of the conflict victim. */
   SVN_ERR(svn_wc__find_copies_of_repos_path(&details->wc_move_targets,
                                             conflict->local_abspath,
@@ -12114,7 +12114,7 @@ svn_client_conflict_option_set_moved_to_repos_relpath2(
   operation = svn_client_conflict_get_operation(conflict);
   incoming_change = svn_client_conflict_get_incoming_change(conflict);
   local_change = svn_client_conflict_get_local_change(conflict);
-  
+
   if (operation == svn_wc_operation_merge &&
       incoming_change == svn_wc_conflict_action_edit &&
       local_change == svn_wc_conflict_reason_missing)
@@ -12732,7 +12732,7 @@ svn_client_conflict_get_recommended_option_id(svn_client_conflict_t *conflict)
 {
   return conflict->recommended_option_id;
 }
-                                    
+
 svn_error_t *
 svn_client_conflict_text_resolve(svn_client_conflict_t *conflict,
                                  svn_client_conflict_option_t *option,
@@ -12755,7 +12755,7 @@ svn_client_conflict_option_find_by_id(apr_array_header_t *options,
     {
       svn_client_conflict_option_t *this_option;
       svn_client_conflict_option_id_t this_option_id;
-      
+
       this_option = APR_ARRAY_IDX(options, i, svn_client_conflict_option_t *);
       this_option_id = svn_client_conflict_option_get_id(this_option);
 
@@ -13316,7 +13316,7 @@ tree_conflict_collector(void *baton,
         {
           const char *tc_abspath;
           apr_pool_t *hash_pool;
- 
+
           hash_pool = apr_hash_pool_get(cswb->unresolved_tree_conflicts);
           tc_abspath = apr_pstrdup(hash_pool, notify->path);
           svn_hash_sets(cswb->unresolved_tree_conflicts, tc_abspath, "");
@@ -13324,7 +13324,7 @@ tree_conflict_collector(void *baton,
     }
 }
 
-/* 
+/*
  * Record a tree conflict resolution failure due to error condition ERR
  * in the RESOLVE_LATER hash table. If the hash table is not available
  * (meaning the caller does not wish to retry resolution later), or if
@@ -13487,7 +13487,7 @@ svn_client_conflict_walk(const char *local_abspath,
           if (err)
             break;
         }
-  
+
       if (!err && !cswb.resolved_a_tree_conflict && tc_abspath &&
           apr_hash_count(cswb.unresolved_tree_conflicts))
         {
diff --git a/subversion/libsvn_client/diff.c b/subversion/libsvn_client/diff.c
index 30d00b0..f019294 100644
--- a/subversion/libsvn_client/diff.c
+++ b/subversion/libsvn_client/diff.c
@@ -51,6 +51,7 @@
 #include "svn_subst.h"
 #include "client.h"
 
+#include "private/svn_client_shelf.h"
 #include "private/svn_wc_private.h"
 #include "private/svn_diff_private.h"
 #include "private/svn_subr_private.h"
diff --git a/subversion/libsvn_client/info.c b/subversion/libsvn_client/info.c
index 0f03c67..2aa4c91 100644
--- a/subversion/libsvn_client/info.c
+++ b/subversion/libsvn_client/info.c
@@ -268,6 +268,7 @@ same_resource_in_head(svn_boolean_t *same_p,
                                     ctx, pool);
   if (err &&
       ((err->apr_err == SVN_ERR_CLIENT_UNRELATED_RESOURCES) ||
+       (err->apr_err == SVN_ERR_FS_NOT_DIRECTORY) ||
        (err->apr_err == SVN_ERR_FS_NOT_FOUND)))
     {
       svn_error_clear(err);
diff --git a/subversion/libsvn_client/merge.c b/subversion/libsvn_client/merge.c
index 72e5c5a..9d9a1c3 100644
--- a/subversion/libsvn_client/merge.c
+++ b/subversion/libsvn_client/merge.c
@@ -5597,7 +5597,7 @@ svn_client__make_merge_conflict_error(svn_client__conflict_report_t *report,
    defined in get_mergeinfo_paths().  Remove any paths absent from disk
    or scheduled for deletion from CHILDREN_WITH_MERGEINFO which are equal to
    or are descendants of TARGET_WCPATH by setting those children to NULL. */
-static void
+static svn_error_t *
 remove_absent_children(const char *target_wcpath,
                        apr_array_header_t *children_with_mergeinfo)
 {
@@ -5612,9 +5612,10 @@ remove_absent_children(const char *target_wcpath,
       if ((child->absent || child->scheduled_for_deletion)
           && svn_dirent_is_ancestor(target_wcpath, child->abspath))
         {
-          svn_sort__array_delete(children_with_mergeinfo, i--, 1);
+          SVN_ERR(svn_sort__array_delete2(children_with_mergeinfo, i--, 1));
         }
     }
+  return SVN_NO_ERROR;
 }
 
 /* Helper for do_directory_merge() to handle the case where a merge editor
@@ -5629,14 +5630,14 @@ remove_absent_children(const char *target_wcpath,
    MERGE_B->target->abspath, this must always be present in
    CHILDREN_WITH_MERGEINFO so this is never removed by this
    function. */
-static void
+static svn_error_t *
 remove_children_with_deleted_mergeinfo(merge_cmd_baton_t *merge_b,
                                        apr_array_header_t *children_with_mergeinfo)
 {
   int i;
 
   if (!merge_b->paths_with_deleted_mergeinfo)
-    return;
+    return SVN_NO_ERROR;
 
   /* CHILDREN_WITH_MERGEINFO[0] is the always the merge target
      so start at the first child. */
@@ -5647,9 +5648,10 @@ remove_children_with_deleted_mergeinfo(merge_cmd_baton_t *merge_b,
 
       if (svn_hash_gets(merge_b->paths_with_deleted_mergeinfo, child->abspath))
         {
-          svn_sort__array_delete(children_with_mergeinfo, i--, 1);
+          SVN_ERR(svn_sort__array_delete2(children_with_mergeinfo, i--, 1));
         }
     }
+  return SVN_NO_ERROR;
 }
 
 /* Helper for do_directory_merge().
@@ -5975,7 +5977,7 @@ get_most_inclusive_rev(const apr_array_header_t *children_with_mergeinfo,
    remaining_ranges is inclusive of END_REV, Slice the first range in
    to two at END_REV. All the allocations are persistent and allocated
    from POOL. */
-static void
+static svn_error_t *
 slice_remaining_ranges(apr_array_header_t *children_with_mergeinfo,
                        svn_boolean_t is_rollback, svn_revnum_t end_rev,
                        apr_pool_t *pool)
@@ -6005,10 +6007,12 @@ slice_remaining_ranges(apr_array_header_t *children_with_mergeinfo,
               split_range2->start = end_rev;
               APR_ARRAY_IDX(child->remaining_ranges, 0,
                             svn_merge_range_t *) = split_range1;
-              svn_sort__array_insert(child->remaining_ranges, &split_range2, 1);
+              SVN_ERR(svn_sort__array_insert2(child->remaining_ranges,
+                                              &split_range2, 1));
             }
         }
     }
+  return SVN_NO_ERROR;
 }
 
 /* Helper for do_directory_merge().
@@ -6020,7 +6024,7 @@ slice_remaining_ranges(apr_array_header_t *children_with_mergeinfo,
    If a range is removed from a child's remaining_ranges array, allocate the
    new remaining_ranges array in POOL.
  */
-static void
+static svn_error_t *
 remove_first_range_from_remaining_ranges(svn_revnum_t revision,
                                          apr_array_header_t
                                            *children_with_mergeinfo,
@@ -6041,10 +6045,11 @@ remove_first_range_from_remaining_ranges(svn_revnum_t revision,
             APR_ARRAY_IDX(child->remaining_ranges, 0, svn_merge_range_t *);
           if (first_range->end == revision)
             {
-              svn_sort__array_delete(child->remaining_ranges, 0, 1);
+              SVN_ERR(svn_sort__array_delete2(child->remaining_ranges, 0, 1));
             }
         }
     }
+  return SVN_NO_ERROR;
 }
 
 /* Get a file's content and properties from the repository.
@@ -6130,7 +6135,7 @@ get_child_with_mergeinfo(const apr_array_header_t *children_with_mergeinfo,
        out of order and then sort afterwards. (One caller is doing a qsort
        after calling this anyway.)
  */
-static void
+static svn_error_t *
 insert_child_to_merge(apr_array_header_t *children_with_mergeinfo,
                       const svn_client__merge_path_t *insert_element,
                       apr_pool_t *pool)
@@ -6144,7 +6149,9 @@ insert_child_to_merge(apr_array_header_t *children_with_mergeinfo,
                                   compare_merge_path_t_as_paths);
 
   new_element = svn_client__merge_path_dup(insert_element, pool);
-  svn_sort__array_insert(children_with_mergeinfo, &new_element, insert_index);
+  SVN_ERR(svn_sort__array_insert2(children_with_mergeinfo,
+                                  &new_element, insert_index));
+  return SVN_NO_ERROR;
 }
 
 /* Helper for get_mergeinfo_paths().
@@ -6205,7 +6212,7 @@ insert_parent_and_sibs_of_sw_absent_del_subtree(
       parent->missing_child = child->absent;
       parent->switched_child = child->switched;
       /* Insert PARENT into CHILDREN_WITH_MERGEINFO. */
-      insert_child_to_merge(children_with_mergeinfo, parent, pool);
+      SVN_ERR(insert_child_to_merge(children_with_mergeinfo, parent, pool));
       /* Increment for loop index so we don't process the inserted element. */
       (*curr_index)++;
     } /*(parent == NULL) */
@@ -6242,8 +6249,8 @@ insert_parent_and_sibs_of_sw_absent_del_subtree(
 
           sibling_of_missing = svn_client__merge_path_create(child_abspath,
                                                              pool);
-          insert_child_to_merge(children_with_mergeinfo, sibling_of_missing,
-                                pool);
+          SVN_ERR(insert_child_to_merge(children_with_mergeinfo,
+                                        sibling_of_missing, pool));
         }
     }
 
@@ -6584,8 +6591,8 @@ get_mergeinfo_paths(apr_array_header_t *children_with_mergeinfo,
                svn_client__merge_path_t *switched_child =
                  svn_client__merge_path_create(wc_path, result_pool);
                switched_child->switched = TRUE;
-               insert_child_to_merge(children_with_mergeinfo, switched_child,
-                                     result_pool);
+               SVN_ERR(insert_child_to_merge(children_with_mergeinfo,
+                                             switched_child, result_pool));
              }
         }
     }
@@ -6637,8 +6644,8 @@ get_mergeinfo_paths(apr_array_header_t *children_with_mergeinfo,
             }
 
           if (new_shallow_child)
-            insert_child_to_merge(children_with_mergeinfo, shallow_child,
-                                  result_pool);
+            SVN_ERR(insert_child_to_merge(children_with_mergeinfo,
+                                          shallow_child, result_pool));
        }
     }
 
@@ -6667,8 +6674,8 @@ get_mergeinfo_paths(apr_array_header_t *children_with_mergeinfo,
                svn_client__merge_path_t *absent_child =
                  svn_client__merge_path_create(wc_path, result_pool);
                absent_child->absent = TRUE;
-               insert_child_to_merge(children_with_mergeinfo, absent_child,
-                                     result_pool);
+               SVN_ERR(insert_child_to_merge(children_with_mergeinfo,
+                                             absent_child, result_pool));
              }
         }
     }
@@ -6681,8 +6688,8 @@ get_mergeinfo_paths(apr_array_header_t *children_with_mergeinfo,
       svn_client__merge_path_t *target_child =
         svn_client__merge_path_create(target->abspath,
                                       result_pool);
-      insert_child_to_merge(children_with_mergeinfo, target_child,
-                            result_pool);
+      SVN_ERR(insert_child_to_merge(children_with_mergeinfo, target_child,
+                                    result_pool));
     }
 
   /* Case 8: Path is an immediate *directory* child of
@@ -6725,8 +6732,8 @@ get_mergeinfo_paths(apr_array_header_t *children_with_mergeinfo,
                       && depth == svn_depth_immediates)
                     immediate_child->immediate_child_dir = TRUE;
 
-                  insert_child_to_merge(children_with_mergeinfo,
-                                        immediate_child, result_pool);
+                  SVN_ERR(insert_child_to_merge(children_with_mergeinfo,
+                                                immediate_child, result_pool));
                 }
             }
         }
@@ -6818,9 +6825,9 @@ get_mergeinfo_paths(apr_array_header_t *children_with_mergeinfo,
                   child_of_noninheritable =
                     svn_client__merge_path_create(child_abspath, result_pool);
                   child_of_noninheritable->child_of_noninheritable = TRUE;
-                  insert_child_to_merge(children_with_mergeinfo,
-                                        child_of_noninheritable,
-                                        result_pool);
+                  SVN_ERR(insert_child_to_merge(children_with_mergeinfo,
+                                                child_of_noninheritable,
+                                                result_pool));
                   if (!dry_run && same_repos)
                     {
                       svn_mergeinfo_t mergeinfo;
@@ -7244,7 +7251,7 @@ normalize_merge_sources_internal(apr_array_header_t **merge_sources_p,
                   new_segment->path = original_repos_relpath;
                   new_segment->range_start = original_revision;
                   new_segment->range_end = original_revision;
-                  svn_sort__array_insert(segments, &new_segment, 0);
+                  SVN_ERR(svn_sort__array_insert2(segments, &new_segment, 0));
                 }
             }
         }
@@ -7791,7 +7798,7 @@ do_file_merge(svn_mergeinfo_catalog_t result_catalog,
              (This list is used from notify_merge_begin)
 
             Directory merges use remove_first_range_from_remaining_ranges() */
-          svn_sort__array_delete(ranges_to_merge, 0, 1);
+          SVN_ERR(svn_sort__array_delete2(ranges_to_merge, 0, 1));
         }
       merge_b->notify_begin.last_abspath = NULL;
     } /* !merge_b->record_only */
@@ -7978,7 +7985,8 @@ process_children_with_new_mergeinfo(merge_cmd_baton_t *merge_b,
               /* Set the path's remaining_ranges equal to its parent's. */
               new_child->remaining_ranges = svn_rangelist_dup(
                  parent->remaining_ranges, pool);
-              insert_child_to_merge(children_with_mergeinfo, new_child, pool);
+              SVN_ERR(insert_child_to_merge(children_with_mergeinfo,
+                                            new_child, pool));
             }
         }
     }
@@ -8543,8 +8551,8 @@ record_mergeinfo_for_dir_merge(svn_mergeinfo_catalog_t result_catalog,
   /* Remove absent children at or under MERGE_B->target->abspath from
      CHILDREN_WITH_MERGEINFO
      before we calculate the merges performed. */
-  remove_absent_children(merge_b->target->abspath,
-                         children_with_mergeinfo);
+  SVN_ERR(remove_absent_children(merge_b->target->abspath,
+                                 children_with_mergeinfo));
 
   /* Determine which subtrees of interest need mergeinfo recorded... */
   SVN_ERR(flag_subtrees_needing_mergeinfo(operative_merge, &range,
@@ -9510,8 +9518,9 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog,
 
               svn_pool_clear(iterpool);
 
-              slice_remaining_ranges(children_with_mergeinfo,
-                                     is_rollback, end_rev, scratch_pool);
+              SVN_ERR(slice_remaining_ranges(children_with_mergeinfo,
+                                             is_rollback, end_rev,
+                                             scratch_pool));
 
               /* Reset variables that must be reset for every drive */
               merge_b->notify_begin.last_abspath = NULL;
@@ -9540,12 +9549,12 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog,
                  to consider these subtrees for subsequent editor drives
                  nor do we want to record mergeinfo on them describing
                  the merge itself. */
-              remove_children_with_deleted_mergeinfo(
-                merge_b, children_with_mergeinfo);
+              SVN_ERR(remove_children_with_deleted_mergeinfo(
+                        merge_b, children_with_mergeinfo));
 
               /* Prepare for the next iteration (if any). */
-              remove_first_range_from_remaining_ranges(
-                end_rev, children_with_mergeinfo, scratch_pool);
+              SVN_ERR(remove_first_range_from_remaining_ranges(
+                        end_rev, children_with_mergeinfo, scratch_pool));
 
               /* If we raised any conflicts, break out and report how much
                  we have merged. */
diff --git a/subversion/libsvn_client/mtcc.c b/subversion/libsvn_client/mtcc.c
index 75889ca..48ddccc 100644
--- a/subversion/libsvn_client/mtcc.c
+++ b/subversion/libsvn_client/mtcc.c
@@ -604,7 +604,7 @@ mtcc_op_contains_non_delete(const mtcc_op_t *op)
 static svn_error_t *
 mtcc_add_delete(const char *relpath,
                 svn_boolean_t for_move,
-                svn_client__mtcc_t *mtcc,                
+                svn_client__mtcc_t *mtcc,
                 apr_pool_t *scratch_pool)
 {
   mtcc_op_t *op;
@@ -636,7 +636,7 @@ mtcc_add_delete(const char *relpath,
         {
           /* Allow deleting directories, that are unmodified except for
               one or more deleted descendants */
-          
+
           SVN_ERR(mtcc_op_find(&op, &created, relpath, mtcc->root_op, TRUE,
                   FALSE, FALSE, mtcc->pool, scratch_pool));
 
diff --git a/subversion/libsvn_client/ra.c b/subversion/libsvn_client/ra.c
index d50e720..c1b71e6 100644
--- a/subversion/libsvn_client/ra.c
+++ b/subversion/libsvn_client/ra.c
@@ -402,8 +402,7 @@ svn_client__open_ra_session_internal(svn_ra_session_t **ra_session,
         }
     }
 
-  /* If the caller allows for auto-following redirections, and the
-     RA->open() call above reveals a CORRECTED_URL, try the new URL.
+  /* If the caller allows for auto-following redirections, try the new URL.
      We'll do this in a loop up to some maximum number follow-and-retry
      attempts.  */
   if (corrected_url)
@@ -414,12 +413,14 @@ svn_client__open_ra_session_internal(svn_ra_session_t **ra_session,
       *corrected_url = NULL;
       while (attempts_left--)
         {
-          const char *corrected = NULL;
+          const char *corrected = NULL; /* canonicalized version */
+          const char *redirect_url = NULL; /* non-canonicalized version */
 
           /* Try to open the RA session.  If this is our last attempt,
              don't accept corrected URLs from the RA provider. */
-          SVN_ERR(svn_ra_open4(ra_session,
+          SVN_ERR(svn_ra_open5(ra_session,
                                attempts_left == 0 ? NULL : &corrected,
+                               attempts_left == 0 ? NULL : &redirect_url,
                                base_url, uuid, cbtable, cb, ctx->config,
                                result_pool));
 
@@ -441,19 +442,28 @@ svn_client__open_ra_session_internal(svn_ra_session_t **ra_session,
           *corrected_url = corrected;
 
           /* Make sure we've not attempted this URL before. */
-          if (svn_hash_gets(attempted, corrected))
+          if (svn_hash_gets(attempted, redirect_url))
             return svn_error_createf(SVN_ERR_CLIENT_CYCLE_DETECTED, NULL,
                                      _("Redirect cycle detected for URL '%s'"),
-                                     corrected);
+                                     redirect_url);
+
+          /*
+           * Remember this redirect URL so we don't wind up in a loop.
+           *
+           * Store the non-canonicalized version of the URL. The canonicalized
+           * version is insufficient for loop detection because we might not get
+           * an exact match against URLs used by the RA protocol-layer (the URL
+           * used by the protocol may contain trailing slashes, for example,
+           * which are stripped during canonicalization).
+           */
+          svn_hash_sets(attempted, redirect_url, (void *)1);
 
-          /* Remember this CORRECTED_URL so we don't wind up in a loop. */
-          svn_hash_sets(attempted, corrected, (void *)1);
           base_url = corrected;
         }
     }
   else
     {
-      SVN_ERR(svn_ra_open4(ra_session, NULL, base_url,
+      SVN_ERR(svn_ra_open5(ra_session, NULL, NULL, base_url,
                            uuid, cbtable, cb, ctx->config, result_pool));
     }
 
diff --git a/subversion/libsvn_client/repos_diff.c b/subversion/libsvn_client/repos_diff.c
index 17b537c..885b5eb 100644
--- a/subversion/libsvn_client/repos_diff.c
+++ b/subversion/libsvn_client/repos_diff.c
@@ -384,7 +384,7 @@ get_file_from_ra(struct file_baton *fb,
      See https://issues.apache.org/jira/browse/SVN-3657#desc9 and
      http://svn.haxx.se/dev/archive-2010-08/0351.shtml for more details.
  */
-static void
+static svn_error_t *
 remove_non_prop_changes(apr_hash_t *pristine_props,
                         apr_array_header_t *changes)
 {
@@ -392,7 +392,7 @@ remove_non_prop_changes(apr_hash_t *pristine_props,
 
   /* For added nodes, there is nothing to filter. */
   if (apr_hash_count(pristine_props) == 0)
-    return;
+    return SVN_NO_ERROR;
 
   for (i = 0; i < changes->nelts; i++)
     {
@@ -406,11 +406,12 @@ remove_non_prop_changes(apr_hash_t *pristine_props,
           if (old_val && svn_string_compare(old_val, change->value))
             {
               /* Remove the matching change and re-check the current index */
-              svn_sort__array_delete(changes, i, 1);
+              SVN_ERR(svn_sort__array_delete2(changes, i, 1));
               i--;
             }
         }
     }
+  return SVN_NO_ERROR;
 }
 
 /* Get the empty file associated with the edit baton. This is cached so
@@ -1010,7 +1011,7 @@ close_file(void *file_baton,
         }
 
       if (fb->pristine_props)
-        remove_non_prop_changes(fb->pristine_props, fb->propchanges);
+        SVN_ERR(remove_non_prop_changes(fb->pristine_props, fb->propchanges));
 
       right_props = svn_prop__patch(fb->pristine_props, fb->propchanges,
                                     fb->pool);
@@ -1083,7 +1084,7 @@ close_directory(void *dir_baton,
 
       if (db->propchanges->nelts > 0)
         {
-          remove_non_prop_changes(pristine_props, db->propchanges);
+          SVN_ERR(remove_non_prop_changes(pristine_props, db->propchanges));
         }
 
       if (db->propchanges->nelts > 0 || db->added)
diff --git a/subversion/libsvn_client/revert.c b/subversion/libsvn_client/revert.c
index cec28f2..96495f1 100644
--- a/subversion/libsvn_client/revert.c
+++ b/subversion/libsvn_client/revert.c
@@ -57,24 +57,12 @@ struct revert_with_write_lock_baton {
 
 /* (Note: All arguments are in the baton above.)
 
-   Attempt to revert LOCAL_ABSPATH.
+   Attempt to revert LOCAL_ABSPATH by calling svn_wc_revert6(), which
+   see for further details.
 
-   If DEPTH is svn_depth_empty, revert just the properties on the
-   directory; else if svn_depth_files, revert the properties and any
-   files immediately under the directory; else if
-   svn_depth_immediates, revert all of the preceding plus properties
-   on immediate subdirectories; else if svn_depth_infinity, revert
-   path and everything under it fully recursively.
-
-   CHANGELISTS is an array of const char * changelist names, used as a
-   restrictive filter on items reverted; that is, don't revert any
-   item unless it's a member of one of those changelists.  If
-   CHANGELISTS is empty (or altogether NULL), no changelist filtering occurs.
-
-   Consult CTX to determine whether or not to revert timestamp to the
-   time of last commit ('use-commit-times = yes').
-
-   If PATH is unversioned, return SVN_ERR_UNVERSIONED_RESOURCE. */
+   If the target isn't versioned, send a 'skip' notification and return
+   no error.
+ */
 static svn_error_t *
 revert(void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
 {
diff --git a/subversion/libsvn_client/shelf.c b/subversion/libsvn_client/shelf.c
index a666efc..2bba193 100644
--- a/subversion/libsvn_client/shelf.c
+++ b/subversion/libsvn_client/shelf.c
@@ -38,6 +38,7 @@
 #include "svn_props.h"
 
 #include "client.h"
+#include "private/svn_client_shelf.h"
 #include "private/svn_client_private.h"
 #include "private/svn_wc_private.h"
 #include "private/svn_sorts_private.h"
diff --git a/subversion/libsvn_client/shelf2.c b/subversion/libsvn_client/shelf2.c
new file mode 100644
index 0000000..533a961
--- /dev/null
+++ b/subversion/libsvn_client/shelf2.c
@@ -0,0 +1,2124 @@
+/*
+ * shelf2.c:  implementation of shelving v2
+ *
+ * ====================================================================
+ *    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.
+ * ====================================================================
+ */
+
+/* ==================================================================== */
+
+/* We define this here to remove any further warnings about the usage of
+   experimental functions in this file. */
+#define SVN_EXPERIMENTAL
+
+#include "svn_client.h"
+#include "svn_wc.h"
+#include "svn_pools.h"
+#include "svn_dirent_uri.h"
+#include "svn_path.h"
+#include "svn_hash.h"
+#include "svn_utf.h"
+#include "svn_ctype.h"
+#include "svn_props.h"
+
+#include "client.h"
+#include "private/svn_client_shelf2.h"
+#include "private/svn_client_private.h"
+#include "private/svn_wc_private.h"
+#include "private/svn_sorts_private.h"
+#include "svn_private_config.h"
+
+
+static svn_error_t *
+shelf_name_encode(char **encoded_name_p,
+                  const char *name,
+                  apr_pool_t *result_pool)
+{
+  char *encoded_name
+    = apr_palloc(result_pool, strlen(name) * 2 + 1);
+  char *out_pos = encoded_name;
+
+  if (name[0] == '\0')
+    return svn_error_create(SVN_ERR_BAD_CHANGELIST_NAME, NULL,
+                            _("Shelf name cannot be the empty string"));
+
+  while (*name)
+    {
+      apr_snprintf(out_pos, 3, "%02x", (unsigned char)(*name++));
+      out_pos += 2;
+    }
+  *encoded_name_p = encoded_name;
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+shelf_name_decode(char **decoded_name_p,
+                  const char *codename,
+                  apr_pool_t *result_pool)
+{
+  svn_stringbuf_t *sb
+    = svn_stringbuf_create_ensure(strlen(codename) / 2, result_pool);
+  const char *input = codename;
+
+  while (*input)
+    {
+      int c;
+      int nchars;
+      int nitems = sscanf(input, "%02x%n", &c, &nchars);
+
+      if (nitems != 1 || nchars != 2)
+        return svn_error_createf(SVN_ERR_BAD_CHANGELIST_NAME, NULL,
+                                 _("Shelve: Bad encoded name '%s'"), codename);
+      svn_stringbuf_appendbyte(sb, c);
+      input += 2;
+    }
+  *decoded_name_p = sb->data;
+  return SVN_NO_ERROR;
+}
+
+/* Set *NAME to the shelf name from FILENAME, if FILENAME names a '.current'
+ * file, else to NULL. */
+static svn_error_t *
+shelf_name_from_filename(char **name,
+                         const char *filename,
+                         apr_pool_t *result_pool)
+{
+  size_t len = strlen(filename);
+  static const char suffix[] = ".current";
+  int suffix_len = sizeof(suffix) - 1;
+
+  if (len > suffix_len && strcmp(filename + len - suffix_len, suffix) == 0)
+    {
+      char *codename = apr_pstrndup(result_pool, filename, len - suffix_len);
+      SVN_ERR(shelf_name_decode(name, codename, result_pool));
+    }
+  else
+    {
+      *name = NULL;
+    }
+  return SVN_NO_ERROR;
+}
+
+/* Set *DIR to the shelf storage directory inside the WC's administrative
+ * area. Ensure the directory exists. */
+static svn_error_t *
+get_shelves_dir(char **dir,
+                svn_wc_context_t *wc_ctx,
+                const char *local_abspath,
+                apr_pool_t *result_pool,
+                apr_pool_t *scratch_pool)
+{
+  char *experimental_abspath;
+
+  SVN_ERR(svn_wc__get_experimental_dir(&experimental_abspath,
+                                       wc_ctx, local_abspath,
+                                       scratch_pool, scratch_pool));
+  *dir = svn_dirent_join(experimental_abspath, "shelves/v2", result_pool);
+
+  /* Ensure the directory exists. (Other versions of svn don't create it.) */
+  SVN_ERR(svn_io_make_dir_recursively(*dir, scratch_pool));
+
+  return SVN_NO_ERROR;
+}
+
+/* Set *ABSPATH to the abspath of the file storage dir for SHELF
+ * version VERSION, no matter whether it exists.
+ */
+static svn_error_t *
+shelf_version_files_dir_abspath(const char **abspath,
+                                svn_client__shelf2_t *shelf,
+                                int version,
+                                apr_pool_t *result_pool,
+                                apr_pool_t *scratch_pool)
+{
+  char *codename;
+  char *filename;
+
+  SVN_ERR(shelf_name_encode(&codename, shelf->name, result_pool));
+  filename = apr_psprintf(scratch_pool, "%s-%03d.d", codename, version);
+  *abspath = svn_dirent_join(shelf->shelves_dir, filename, result_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Create a shelf-version object for a version that may or may not already
+ * exist on disk.
+ */
+static svn_error_t *
+shelf_version_create(svn_client__shelf2_version_t **new_version_p,
+                     svn_client__shelf2_t *shelf,
+                     int version_number,
+                     apr_pool_t *result_pool)
+{
+  svn_client__shelf2_version_t *shelf_version
+    = apr_pcalloc(result_pool, sizeof(*shelf_version));
+
+  shelf_version->shelf = shelf;
+  shelf_version->version_number = version_number;
+  SVN_ERR(shelf_version_files_dir_abspath(&shelf_version->files_dir_abspath,
+                                          shelf, version_number,
+                                          result_pool, result_pool));
+  *new_version_p = shelf_version;
+  return SVN_NO_ERROR;
+}
+
+/* Set *ABSPATH to the abspath of the metadata file for SHELF_VERSION
+ * node at RELPATH, no matter whether it exists.
+ */
+static svn_error_t *
+get_metadata_abspath(char **abspath,
+                     svn_client__shelf2_version_t *shelf_version,
+                     const char *wc_relpath,
+                     apr_pool_t *result_pool,
+                     apr_pool_t *scratch_pool)
+{
+  wc_relpath = apr_psprintf(scratch_pool, "%s.meta", wc_relpath);
+  *abspath = svn_dirent_join(shelf_version->files_dir_abspath, wc_relpath,
+                             result_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Set *ABSPATH to the abspath of the base text file for SHELF_VERSION
+ * node at RELPATH, no matter whether it exists.
+ */
+static svn_error_t *
+get_base_file_abspath(char **base_abspath,
+                      svn_client__shelf2_version_t *shelf_version,
+                      const char *wc_relpath,
+                      apr_pool_t *result_pool,
+                      apr_pool_t *scratch_pool)
+{
+  wc_relpath = apr_psprintf(scratch_pool, "%s.base", wc_relpath);
+  *base_abspath = svn_dirent_join(shelf_version->files_dir_abspath, wc_relpath,
+                                  result_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Set *ABSPATH to the abspath of the working text file for SHELF_VERSION
+ * node at RELPATH, no matter whether it exists.
+ */
+static svn_error_t *
+get_working_file_abspath(char **work_abspath,
+                         svn_client__shelf2_version_t *shelf_version,
+                         const char *wc_relpath,
+                         apr_pool_t *result_pool,
+                         apr_pool_t *scratch_pool)
+{
+  wc_relpath = apr_psprintf(scratch_pool, "%s.work", wc_relpath);
+  *work_abspath = svn_dirent_join(shelf_version->files_dir_abspath, wc_relpath,
+                                  result_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Set *ABSPATH to the abspath of the base props file for SHELF_VERSION
+ * node at RELPATH, no matter whether it exists.
+ */
+static svn_error_t *
+get_base_props_abspath(char **base_abspath,
+                       svn_client__shelf2_version_t *shelf_version,
+                       const char *wc_relpath,
+                       apr_pool_t *result_pool,
+                       apr_pool_t *scratch_pool)
+{
+  wc_relpath = apr_psprintf(scratch_pool, "%s.base-props", wc_relpath);
+  *base_abspath = svn_dirent_join(shelf_version->files_dir_abspath, wc_relpath,
+                                  result_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Set *ABSPATH to the abspath of the working props file for SHELF_VERSION
+ * node at RELPATH, no matter whether it exists.
+ */
+static svn_error_t *
+get_working_props_abspath(char **work_abspath,
+                          svn_client__shelf2_version_t *shelf_version,
+                          const char *wc_relpath,
+                          apr_pool_t *result_pool,
+                          apr_pool_t *scratch_pool)
+{
+  wc_relpath = apr_psprintf(scratch_pool, "%s.work-props", wc_relpath);
+  *work_abspath = svn_dirent_join(shelf_version->files_dir_abspath, wc_relpath,
+                                  result_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Delete the storage for SHELF:VERSION. */
+static svn_error_t *
+shelf_version_delete(svn_client__shelf2_t *shelf,
+                     int version,
+                     apr_pool_t *scratch_pool)
+{
+  const char *files_dir_abspath;
+
+  SVN_ERR(shelf_version_files_dir_abspath(&files_dir_abspath,
+                                          shelf, version,
+                                          scratch_pool, scratch_pool));
+  SVN_ERR(svn_io_remove_dir2(files_dir_abspath, TRUE /*ignore_enoent*/,
+                             NULL, NULL, /*cancel*/
+                             scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/*  */
+static svn_error_t *
+get_log_abspath(char **log_abspath,
+                svn_client__shelf2_t *shelf,
+                apr_pool_t *result_pool,
+                apr_pool_t *scratch_pool)
+{
+  char *codename;
+  const char *filename;
+
+  SVN_ERR(shelf_name_encode(&codename, shelf->name, result_pool));
+  filename = apr_pstrcat(scratch_pool, codename, ".log", SVN_VA_NULL);
+  *log_abspath = svn_dirent_join(shelf->shelves_dir, filename, result_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Set SHELF->revprops by reading from its storage (the '.log' file).
+ * Set SHELF->revprops to empty if the storage file does not exist; this
+ * is not an error.
+ */
+static svn_error_t *
+shelf_read_revprops(svn_client__shelf2_t *shelf,
+                    apr_pool_t *scratch_pool)
+{
+  char *log_abspath;
+  svn_error_t *err;
+  svn_stream_t *stream;
+
+  SVN_ERR(get_log_abspath(&log_abspath, shelf, scratch_pool, scratch_pool));
+
+  shelf->revprops = apr_hash_make(shelf->pool);
+  err = svn_stream_open_readonly(&stream, log_abspath,
+                                 scratch_pool, scratch_pool);
+  if (err && APR_STATUS_IS_ENOENT(err->apr_err))
+    {
+      svn_error_clear(err);
+      return SVN_NO_ERROR;
+    }
+  else
+    SVN_ERR(err);
+  SVN_ERR(svn_hash_read2(shelf->revprops, stream, "PROPS-END", shelf->pool));
+  SVN_ERR(svn_stream_close(stream));
+  return SVN_NO_ERROR;
+}
+
+/* Write SHELF's revprops to its file storage.
+ */
+static svn_error_t *
+shelf_write_revprops(svn_client__shelf2_t *shelf,
+                     apr_pool_t *scratch_pool)
+{
+  char *log_abspath;
+  apr_file_t *file;
+  svn_stream_t *stream;
+
+  SVN_ERR(get_log_abspath(&log_abspath, shelf, scratch_pool, scratch_pool));
+
+  SVN_ERR(svn_io_file_open(&file, log_abspath,
+                           APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE,
+                           APR_FPROT_OS_DEFAULT, scratch_pool));
+  stream = svn_stream_from_aprfile2(file, FALSE /*disown*/, scratch_pool);
+
+  SVN_ERR(svn_hash_write2(shelf->revprops, stream, "PROPS-END", scratch_pool));
+  SVN_ERR(svn_stream_close(stream));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_revprop_set(svn_client__shelf2_t *shelf,
+                               const char *prop_name,
+                               const svn_string_t *prop_val,
+                               apr_pool_t *scratch_pool)
+{
+  svn_hash_sets(shelf->revprops, apr_pstrdup(shelf->pool, prop_name),
+                svn_string_dup(prop_val, shelf->pool));
+  SVN_ERR(shelf_write_revprops(shelf, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_revprop_set_all(svn_client__shelf2_t *shelf,
+                                   apr_hash_t *revprop_table,
+                                   apr_pool_t *scratch_pool)
+{
+  if (revprop_table)
+    shelf->revprops = svn_prop_hash_dup(revprop_table, shelf->pool);
+  else
+    shelf->revprops = apr_hash_make(shelf->pool);
+
+  SVN_ERR(shelf_write_revprops(shelf, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_revprop_get(svn_string_t **prop_val,
+                               svn_client__shelf2_t *shelf,
+                               const char *prop_name,
+                               apr_pool_t *result_pool)
+{
+  *prop_val = svn_hash_gets(shelf->revprops, prop_name);
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_revprop_list(apr_hash_t **props,
+                                svn_client__shelf2_t *shelf,
+                                apr_pool_t *result_pool)
+{
+  *props = shelf->revprops;
+  return SVN_NO_ERROR;
+}
+
+/*  */
+static svn_error_t *
+get_current_abspath(char **current_abspath,
+                    svn_client__shelf2_t *shelf,
+                    apr_pool_t *result_pool)
+{
+  char *codename;
+  char *filename;
+
+  SVN_ERR(shelf_name_encode(&codename, shelf->name, result_pool));
+  filename = apr_psprintf(result_pool, "%s.current", codename);
+  *current_abspath = svn_dirent_join(shelf->shelves_dir, filename, result_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Read SHELF->max_version from its storage (the '.current' file).
+ * Set SHELF->max_version to -1 if that file does not exist.
+ */
+static svn_error_t *
+shelf_read_current(svn_client__shelf2_t *shelf,
+                   apr_pool_t *scratch_pool)
+{
+  char *current_abspath;
+  svn_error_t *err;
+
+  SVN_ERR(get_current_abspath(&current_abspath, shelf, scratch_pool));
+  err = svn_io_read_version_file(&shelf->max_version,
+                                 current_abspath, scratch_pool);
+  if (err)
+    {
+      shelf->max_version = -1;
+      svn_error_clear(err);
+      return SVN_NO_ERROR;
+    }
+  return SVN_NO_ERROR;
+}
+
+/*  */
+static svn_error_t *
+shelf_write_current(svn_client__shelf2_t *shelf,
+                    apr_pool_t *scratch_pool)
+{
+  char *current_abspath;
+
+  SVN_ERR(get_current_abspath(&current_abspath, shelf, scratch_pool));
+  SVN_ERR(svn_io_write_version_file(current_abspath, shelf->max_version,
+                                    scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/*-------------------------------------------------------------------------*/
+/* Status Reporting */
+
+/* Create a status struct with all fields initialized to valid values
+ * representing 'uninteresting' or 'unknown' status.
+ */
+static svn_wc_status3_t *
+status_create(apr_pool_t *result_pool)
+{
+  svn_wc_status3_t *s = apr_pcalloc(result_pool, sizeof(*s));
+
+  s->filesize = SVN_INVALID_FILESIZE;
+  s->versioned = TRUE;
+  s->node_status = svn_wc_status_none;
+  s->text_status = svn_wc_status_none;
+  s->prop_status = svn_wc_status_none;
+  s->revision = SVN_INVALID_REVNUM;
+  s->changed_rev = SVN_INVALID_REVNUM;
+  s->repos_node_status = svn_wc_status_none;
+  s->repos_text_status = svn_wc_status_none;
+  s->repos_prop_status = svn_wc_status_none;
+  s->ood_changed_rev = SVN_INVALID_REVNUM;
+  return s;
+}
+
+/* Convert from svn_node_kind_t to a single character representation. */
+static char
+kind_to_char(svn_node_kind_t kind)
+{
+  return (kind == svn_node_dir ? 'd'
+            : kind == svn_node_file ? 'f'
+                : kind == svn_node_symlink ? 'l'
+                    : '?');
+}
+
+/* Convert to svn_node_kind_t from a single character representation. */
+static svn_node_kind_t
+char_to_kind(char kind)
+{
+  return (kind == 'd' ? svn_node_dir
+            : kind == 'f' ? svn_node_file
+                : kind == 'l' ? svn_node_symlink
+                    : svn_node_unknown);
+}
+
+/* Return the single character representation of STATUS.
+ * (Similar to subversion/svn/status.c:generate_status_code()
+ * and subversion/tests/libsvn_client/client-test.c:status_to_char().) */
+static char
+status_to_char(enum svn_wc_status_kind status)
+{
+  switch (status)
+    {
+    case svn_wc_status_none:        return '.';
+    case svn_wc_status_unversioned: return '?';
+    case svn_wc_status_normal:      return ' ';
+    case svn_wc_status_added:       return 'A';
+    case svn_wc_status_missing:     return '!';
+    case svn_wc_status_deleted:     return 'D';
+    case svn_wc_status_replaced:    return 'R';
+    case svn_wc_status_modified:    return 'M';
+    case svn_wc_status_merged:      return 'G';
+    case svn_wc_status_conflicted:  return 'C';
+    case svn_wc_status_ignored:     return 'I';
+    case svn_wc_status_obstructed:  return '~';
+    case svn_wc_status_external:    return 'X';
+    case svn_wc_status_incomplete:  return ':';
+    default:                        return '*';
+    }
+}
+
+static enum svn_wc_status_kind
+char_to_status(char status)
+{
+  switch (status)
+    {
+    case '.': return svn_wc_status_none;
+    case '?': return svn_wc_status_unversioned;
+    case ' ': return svn_wc_status_normal;
+    case 'A': return svn_wc_status_added;
+    case '!': return svn_wc_status_missing;
+    case 'D': return svn_wc_status_deleted;
+    case 'R': return svn_wc_status_replaced;
+    case 'M': return svn_wc_status_modified;
+    case 'G': return svn_wc_status_merged;
+    case 'C': return svn_wc_status_conflicted;
+    case 'I': return svn_wc_status_ignored;
+    case '~': return svn_wc_status_obstructed;
+    case 'X': return svn_wc_status_external;
+    case ':': return svn_wc_status_incomplete;
+    default:  return (enum svn_wc_status_kind)0;
+    }
+}
+
+/* Write a serial representation of (some fields of) STATUS to STREAM.
+ */
+static svn_error_t *
+wc_status_serialize(svn_stream_t *stream,
+                    const svn_wc_status3_t *status,
+                    apr_pool_t *scratch_pool)
+{
+  SVN_ERR(svn_stream_printf(stream, scratch_pool, "%c %c%c%c %ld",
+                            kind_to_char(status->kind),
+                            status_to_char(status->node_status),
+                            status_to_char(status->text_status),
+                            status_to_char(status->prop_status),
+                            status->revision));
+  return SVN_NO_ERROR;
+}
+
+/* Read a serial representation of (some fields of) STATUS from STREAM.
+ */
+static svn_error_t *
+wc_status_unserialize(svn_wc_status3_t *status,
+                      svn_stream_t *stream,
+                      apr_pool_t *result_pool)
+{
+  svn_stringbuf_t *sb;
+  char *string;
+
+  SVN_ERR(svn_stringbuf_from_stream(&sb, stream, 100, result_pool));
+  string = sb->data;
+  status->kind = char_to_kind(string[0]);
+  status->node_status = char_to_status(string[2]);
+  status->text_status = char_to_status(string[3]);
+  status->prop_status = char_to_status(string[4]);
+  sscanf(string + 6, "%ld", &status->revision);
+  return SVN_NO_ERROR;
+}
+
+/* Write status to shelf storage.
+ */
+static svn_error_t *
+status_write(svn_client__shelf2_version_t *shelf_version,
+             const char *relpath,
+             const svn_wc_status3_t *status,
+             apr_pool_t *scratch_pool)
+{
+  char *file_abspath;
+  svn_stream_t *stream;
+
+  SVN_ERR(get_metadata_abspath(&file_abspath, shelf_version, relpath,
+                               scratch_pool, scratch_pool));
+  SVN_ERR(svn_stream_open_writable(&stream, file_abspath,
+                                   scratch_pool, scratch_pool));
+  SVN_ERR(wc_status_serialize(stream, status, scratch_pool));
+  SVN_ERR(svn_stream_close(stream));
+  return SVN_NO_ERROR;
+}
+
+/* Read status from shelf storage.
+ */
+static svn_error_t *
+status_read(svn_wc_status3_t **status,
+            svn_client__shelf2_version_t *shelf_version,
+            const char *relpath,
+            apr_pool_t *result_pool,
+            apr_pool_t *scratch_pool)
+{
+  svn_wc_status3_t *s = status_create(result_pool);
+  char *file_abspath;
+  svn_stream_t *stream;
+
+  SVN_ERR(get_metadata_abspath(&file_abspath, shelf_version, relpath,
+                               scratch_pool, scratch_pool));
+  SVN_ERR(svn_stream_open_readonly(&stream, file_abspath,
+                                   scratch_pool, scratch_pool));
+  SVN_ERR(wc_status_unserialize(s, stream, result_pool));
+  SVN_ERR(svn_stream_close(stream));
+
+  s->changelist = apr_psprintf(result_pool, "svn:shelf:%s",
+                               shelf_version->shelf->name);
+  *status = s;
+  return SVN_NO_ERROR;
+}
+
+/* A visitor function type for use with shelf_status_walk().
+ * The same as svn_wc_status_func4_t except relpath instead of abspath.
+ * Only some fields in STATUS are available.
+ */
+typedef svn_error_t *(*shelf_status_visitor_t)(void *baton,
+                                               const char *relpath,
+                                               svn_wc_status3_t *status,
+                                               apr_pool_t *scratch_pool);
+
+/* Baton for shelved_files_walk_visitor(). */
+struct shelf_status_baton_t
+{
+  svn_client__shelf2_version_t *shelf_version;
+  const char *top_relpath;
+  const char *walk_root_abspath;
+  shelf_status_visitor_t walk_func;
+  void *walk_baton;
+};
+
+/* Call BATON->walk_func(BATON->walk_baton, relpath, ...) for the shelved
+ * 'binary' file stored at ABSPATH.
+ * Implements svn_io_walk_func_t. */
+static svn_error_t *
+shelf_status_visitor(void *baton,
+                     const char *abspath,
+                     const apr_finfo_t *finfo,
+                     apr_pool_t *scratch_pool)
+{
+  struct shelf_status_baton_t *b = baton;
+  const char *relpath;
+
+  relpath = svn_dirent_skip_ancestor(b->walk_root_abspath, abspath);
+  if (finfo->filetype == APR_REG
+      && (strlen(relpath) >= 5 && strcmp(relpath+strlen(relpath)-5, ".meta") == 0))
+    {
+      svn_wc_status3_t *s;
+
+      relpath = apr_pstrndup(scratch_pool, relpath, strlen(relpath) - 5);
+      if (!svn_relpath_skip_ancestor(b->top_relpath, relpath))
+        return SVN_NO_ERROR;
+
+      SVN_ERR(status_read(&s, b->shelf_version, relpath,
+                          scratch_pool, scratch_pool));
+      SVN_ERR(b->walk_func(b->walk_baton, relpath, s, scratch_pool));
+    }
+  return SVN_NO_ERROR;
+}
+
+/* Report the shelved status of the path SHELF_VERSION:WC_RELPATH
+ * via WALK_FUNC(WALK_BATON, ...).
+ */
+static svn_error_t *
+shelf_status_visit_path(svn_client__shelf2_version_t *shelf_version,
+                        const char *wc_relpath,
+                        shelf_status_visitor_t walk_func,
+                        void *walk_baton,
+                        apr_pool_t *scratch_pool)
+{
+  struct shelf_status_baton_t baton;
+  char *abspath;
+  apr_finfo_t finfo;
+
+  baton.shelf_version = shelf_version;
+  baton.top_relpath = wc_relpath;
+  baton.walk_root_abspath = shelf_version->files_dir_abspath;
+  baton.walk_func = walk_func;
+  baton.walk_baton = walk_baton;
+  SVN_ERR(get_metadata_abspath(&abspath, shelf_version, wc_relpath,
+                               scratch_pool, scratch_pool));
+  SVN_ERR(svn_io_stat(&finfo, abspath, APR_FINFO_TYPE, scratch_pool));
+  SVN_ERR(shelf_status_visitor(&baton, abspath, &finfo, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* Report the shelved status of all the shelved paths in SHELF_VERSION
+ * via WALK_FUNC(WALK_BATON, ...).
+ */
+static svn_error_t *
+shelf_status_walk(svn_client__shelf2_version_t *shelf_version,
+                  const char *wc_relpath,
+                  shelf_status_visitor_t walk_func,
+                  void *walk_baton,
+                  apr_pool_t *scratch_pool)
+{
+  struct shelf_status_baton_t baton;
+  svn_error_t *err;
+
+  baton.shelf_version = shelf_version;
+  baton.top_relpath = wc_relpath;
+  baton.walk_root_abspath = shelf_version->files_dir_abspath;
+  baton.walk_func = walk_func;
+  baton.walk_baton = walk_baton;
+  err = svn_io_dir_walk2(baton.walk_root_abspath, 0 /*wanted*/,
+                         shelf_status_visitor, &baton,
+                         scratch_pool);
+  if (err && APR_STATUS_IS_ENOENT(err->apr_err))
+    svn_error_clear(err);
+  else
+    SVN_ERR(err);
+
+  return SVN_NO_ERROR;
+}
+
+typedef struct wc_status_baton_t
+{
+  svn_client__shelf2_version_t *shelf_version;
+  svn_wc_status_func4_t walk_func;
+  void *walk_baton;
+} wc_status_baton_t;
+
+static svn_error_t *
+wc_status_visitor(void *baton,
+                      const char *relpath,
+                      svn_wc_status3_t *status,
+                      apr_pool_t *scratch_pool)
+{
+  struct wc_status_baton_t *b = baton;
+  svn_client__shelf2_t *shelf = b->shelf_version->shelf;
+  const char *abspath = svn_dirent_join(shelf->wc_root_abspath, relpath,
+                                        scratch_pool);
+  SVN_ERR(b->walk_func(b->walk_baton, abspath, status, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_version_status_walk(svn_client__shelf2_version_t *shelf_version,
+                                       const char *wc_relpath,
+                                       svn_wc_status_func4_t walk_func,
+                                       void *walk_baton,
+                                       apr_pool_t *scratch_pool)
+{
+  wc_status_baton_t baton;
+
+  baton.shelf_version = shelf_version;
+  baton.walk_func = walk_func;
+  baton.walk_baton = walk_baton;
+  SVN_ERR(shelf_status_walk(shelf_version, wc_relpath,
+                            wc_status_visitor, &baton,
+                            scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/*-------------------------------------------------------------------------*/
+/* Shelf Storage */
+
+/* A baton for use with write_changes_visitor(). */
+typedef struct write_changes_baton_t {
+  const char *wc_root_abspath;
+  svn_client__shelf2_version_t *shelf_version;
+  svn_client_ctx_t *ctx;
+  svn_boolean_t any_shelved;  /* were any paths successfully shelved? */
+  svn_client_status_func_t was_shelved_func;
+  void *was_shelved_baton;
+  svn_client_status_func_t was_not_shelved_func;
+  void *was_not_shelved_baton;
+  apr_pool_t *pool;  /* pool for data in 'unshelvable', etc. */
+} write_changes_baton_t;
+
+/*  */
+static svn_error_t *
+notify_shelved(write_changes_baton_t *wb,
+               const char *wc_relpath,
+               const char *local_abspath,
+               const svn_wc_status3_t *wc_status,
+               apr_pool_t *scratch_pool)
+{
+  if (wb->was_shelved_func)
+    {
+      svn_client_status_t *cst;
+
+      SVN_ERR(svn_client__create_status(&cst, wb->ctx->wc_ctx, local_abspath,
+                                        wc_status,
+                                        scratch_pool, scratch_pool));
+      SVN_ERR(wb->was_shelved_func(wb->was_shelved_baton,
+                                   wc_relpath, cst, scratch_pool));
+    }
+
+  wb->any_shelved = TRUE;
+  return SVN_NO_ERROR;
+}
+
+/*  */
+static svn_error_t *
+notify_not_shelved(write_changes_baton_t *wb,
+                   const char *wc_relpath,
+                   const char *local_abspath,
+                   const svn_wc_status3_t *wc_status,
+                   apr_pool_t *scratch_pool)
+{
+  if (wb->was_not_shelved_func)
+    {
+      svn_client_status_t *cst;
+
+      SVN_ERR(svn_client__create_status(&cst, wb->ctx->wc_ctx, local_abspath,
+                                        wc_status,
+                                        scratch_pool, scratch_pool));
+      SVN_ERR(wb->was_not_shelved_func(wb->was_not_shelved_baton,
+                                       wc_relpath, cst, scratch_pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Read BASE_PROPS and WORK_PROPS from the WC, setting each to null if
+ * the node has no base or working version (respectively).
+ */
+static svn_error_t *
+read_props_from_wc(apr_hash_t **base_props,
+                   apr_hash_t **work_props,
+                   enum svn_wc_status_kind node_status,
+                   const char *from_wc_abspath,
+                   svn_client_ctx_t *ctx,
+                   apr_pool_t *result_pool,
+                   apr_pool_t *scratch_pool)
+{
+  if (node_status != svn_wc_status_added)
+    SVN_ERR(svn_wc_get_pristine_props(base_props, ctx->wc_ctx, from_wc_abspath,
+                                      result_pool, scratch_pool));
+  else
+    *base_props = NULL;
+  if (node_status != svn_wc_status_deleted)
+    SVN_ERR(svn_wc_prop_list2(work_props, ctx->wc_ctx, from_wc_abspath,
+                              result_pool, scratch_pool));
+  else
+    *work_props = NULL;
+  return SVN_NO_ERROR;
+}
+
+/* Write BASE_PROPS and WORK_PROPS to storage in SHELF_VERSION:WC_RELPATH.
+ */
+static svn_error_t *
+write_props_to_shelf(svn_client__shelf2_version_t *shelf_version,
+                     const char *wc_relpath,
+                     apr_hash_t *base_props,
+                     apr_hash_t *work_props,
+                     apr_pool_t *scratch_pool)
+{
+  char *stored_props_abspath;
+  svn_stream_t *stream;
+
+  if (base_props)
+    {
+      SVN_ERR(get_base_props_abspath(&stored_props_abspath,
+                                     shelf_version, wc_relpath,
+                                     scratch_pool, scratch_pool));
+      SVN_ERR(svn_stream_open_writable(&stream, stored_props_abspath,
+                                       scratch_pool, scratch_pool));
+      SVN_ERR(svn_hash_write2(base_props, stream, NULL, scratch_pool));
+      SVN_ERR(svn_stream_close(stream));
+    }
+
+  if (work_props)
+    {
+      SVN_ERR(get_working_props_abspath(&stored_props_abspath,
+                                        shelf_version, wc_relpath,
+                                        scratch_pool, scratch_pool));
+      SVN_ERR(svn_stream_open_writable(&stream, stored_props_abspath,
+                                       scratch_pool, scratch_pool));
+      SVN_ERR(svn_hash_write2(work_props, stream, NULL, scratch_pool));
+      SVN_ERR(svn_stream_close(stream));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Read BASE_PROPS and WORK_PROPS from storage in SHELF_VERSION:WC_RELPATH.
+ */
+static svn_error_t *
+read_props_from_shelf(apr_hash_t **base_props,
+                      apr_hash_t **work_props,
+                      enum svn_wc_status_kind node_status,
+                      svn_client__shelf2_version_t *shelf_version,
+                      const char *wc_relpath,
+                      apr_pool_t *result_pool,
+                      apr_pool_t *scratch_pool)
+{
+  char *stored_props_abspath;
+  svn_stream_t *stream;
+
+  if (node_status != svn_wc_status_added)
+    {
+      *base_props = apr_hash_make(result_pool);
+      SVN_ERR(get_base_props_abspath(&stored_props_abspath,
+                                     shelf_version, wc_relpath,
+                                     scratch_pool, scratch_pool));
+      SVN_ERR(svn_stream_open_readonly(&stream, stored_props_abspath,
+                                       scratch_pool, scratch_pool));
+      SVN_ERR(svn_hash_read2(*base_props, stream, NULL, scratch_pool));
+      SVN_ERR(svn_stream_close(stream));
+    }
+  else
+    *base_props = NULL;
+
+  if (node_status != svn_wc_status_deleted)
+    {
+      *work_props = apr_hash_make(result_pool);
+      SVN_ERR(get_working_props_abspath(&stored_props_abspath,
+                                        shelf_version, wc_relpath,
+                                        scratch_pool, scratch_pool));
+      SVN_ERR(svn_stream_open_readonly(&stream, stored_props_abspath,
+                                       scratch_pool, scratch_pool));
+      SVN_ERR(svn_hash_read2(*work_props, stream, NULL, scratch_pool));
+      SVN_ERR(svn_stream_close(stream));
+    }
+  else
+    *work_props = NULL;
+
+  return SVN_NO_ERROR;
+}
+
+/* Store metadata for any node, and base and working files if it's a file.
+ *
+ * Copy the WC base and working files at FROM_WC_ABSPATH to the storage
+ * area in SHELF_VERSION.
+ */
+static svn_error_t *
+store_file(const char *from_wc_abspath,
+           const char *wc_relpath,
+           svn_client__shelf2_version_t *shelf_version,
+           const svn_wc_status3_t *status,
+           svn_client_ctx_t *ctx,
+           apr_pool_t *scratch_pool)
+{
+  char *stored_abspath;
+  apr_hash_t *base_props, *work_props;
+
+  SVN_ERR(get_working_file_abspath(&stored_abspath,
+                                   shelf_version, wc_relpath,
+                                   scratch_pool, scratch_pool));
+  SVN_ERR(svn_io_make_dir_recursively(svn_dirent_dirname(stored_abspath,
+                                                         scratch_pool),
+                                      scratch_pool));
+  SVN_ERR(status_write(shelf_version, wc_relpath,
+                       status, scratch_pool));
+
+  /* properties */
+  SVN_ERR(read_props_from_wc(&base_props, &work_props,
+                             status->node_status,
+                             from_wc_abspath, ctx,
+                             scratch_pool, scratch_pool));
+  SVN_ERR(write_props_to_shelf(shelf_version, wc_relpath,
+                               base_props, work_props,
+                               scratch_pool));
+
+  /* file text */
+  if (status->kind == svn_node_file)
+    {
+      svn_stream_t *wc_base_stream;
+      svn_node_kind_t work_kind;
+
+      /* Copy the base file (copy-from base, if copied/moved), if present */
+      SVN_ERR(svn_wc_get_pristine_contents2(&wc_base_stream,
+                                            ctx->wc_ctx, from_wc_abspath,
+                                            scratch_pool, scratch_pool));
+      if (wc_base_stream)
+        {
+          char *stored_base_abspath;
+          svn_stream_t *stored_base_stream;
+
+          SVN_ERR(get_base_file_abspath(&stored_base_abspath,
+                                        shelf_version, wc_relpath,
+                                        scratch_pool, scratch_pool));
+          SVN_ERR(svn_stream_open_writable(&stored_base_stream,
+                                           stored_base_abspath,
+                                           scratch_pool, scratch_pool));
+          SVN_ERR(svn_stream_copy3(wc_base_stream, stored_base_stream,
+                                   NULL, NULL, scratch_pool));
+        }
+
+      /* Copy the working file, if present */
+      SVN_ERR(svn_io_check_path(from_wc_abspath, &work_kind, scratch_pool));
+      if (work_kind == svn_node_file)
+        {
+          SVN_ERR(svn_io_copy_file(from_wc_abspath, stored_abspath,
+                                   TRUE /*copy_perms*/, scratch_pool));
+        }
+    }
+  return SVN_NO_ERROR;
+}
+
+/* An implementation of svn_wc_status_func4_t. */
+static svn_error_t *
+write_changes_visitor(void *baton,
+                      const char *local_abspath,
+                      const svn_wc_status3_t *status,
+                      apr_pool_t *scratch_pool)
+{
+  write_changes_baton_t *wb = baton;
+  const char *wc_relpath = svn_dirent_skip_ancestor(wb->wc_root_abspath,
+                                                    local_abspath);
+
+  /* Catch any conflict, even a tree conflict on a path that has
+     node-status 'unversioned'. */
+  if (status->conflicted)
+    {
+      SVN_ERR(notify_not_shelved(wb, wc_relpath, local_abspath,
+                                 status, scratch_pool));
+    }
+  else switch (status->node_status)
+    {
+      case svn_wc_status_deleted:
+      case svn_wc_status_added:
+      case svn_wc_status_replaced:
+        if (status->kind != svn_node_file
+            || status->copied)
+          {
+            SVN_ERR(notify_not_shelved(wb, wc_relpath, local_abspath,
+                                       status, scratch_pool));
+            break;
+          }
+        /* fall through */
+      case svn_wc_status_modified:
+      {
+        /* Store metadata, and base and working versions if it's a file */
+        SVN_ERR(store_file(local_abspath, wc_relpath, wb->shelf_version,
+                           status, wb->ctx, scratch_pool));
+        SVN_ERR(notify_shelved(wb, wc_relpath, local_abspath,
+                               status, scratch_pool));
+        break;
+      }
+
+      case svn_wc_status_incomplete:
+        if ((status->text_status != svn_wc_status_normal
+             && status->text_status != svn_wc_status_none)
+            || (status->prop_status != svn_wc_status_normal
+                && status->prop_status != svn_wc_status_none))
+          {
+            /* Incomplete, but local modifications */
+            SVN_ERR(notify_not_shelved(wb, wc_relpath, local_abspath,
+                                       status, scratch_pool));
+          }
+        break;
+
+      case svn_wc_status_conflicted:
+      case svn_wc_status_missing:
+      case svn_wc_status_obstructed:
+        SVN_ERR(notify_not_shelved(wb, wc_relpath, local_abspath,
+                                   status, scratch_pool));
+        break;
+
+      case svn_wc_status_normal:
+      case svn_wc_status_ignored:
+      case svn_wc_status_none:
+      case svn_wc_status_external:
+      case svn_wc_status_unversioned:
+      default:
+        break;
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* A baton for use with changelist_filter_func(). */
+struct changelist_filter_baton_t {
+  apr_hash_t *changelist_hash;
+  svn_wc_status_func4_t status_func;
+  void *status_baton;
+};
+
+/* Filter out paths that are not in the requested changelist(s).
+ * Implements svn_wc_status_func4_t. */
+static svn_error_t *
+changelist_filter_func(void *baton,
+                       const char *local_abspath,
+                       const svn_wc_status3_t *status,
+                       apr_pool_t *scratch_pool)
+{
+  struct changelist_filter_baton_t *b = baton;
+
+  if (b->changelist_hash
+      && (! status->changelist
+          || ! svn_hash_gets(b->changelist_hash, status->changelist)))
+    {
+      return SVN_NO_ERROR;
+    }
+
+  SVN_ERR(b->status_func(b->status_baton, local_abspath, status,
+                         scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/*
+ * Walk the WC tree(s) rooted at PATHS, to depth DEPTH, omitting paths that
+ * are not in one of the CHANGELISTS (if not null).
+ *
+ * Call STATUS_FUNC(STATUS_BATON, ...) for each visited path.
+ *
+ * PATHS are absolute, or relative to CWD.
+ */
+static svn_error_t *
+wc_walk_status_multi(const apr_array_header_t *paths,
+                     svn_depth_t depth,
+                     const apr_array_header_t *changelists,
+                     svn_wc_status_func4_t status_func,
+                     void *status_baton,
+                     svn_client_ctx_t *ctx,
+                     apr_pool_t *scratch_pool)
+{
+  struct changelist_filter_baton_t cb = {0};
+  int i;
+
+  if (changelists && changelists->nelts)
+    SVN_ERR(svn_hash_from_cstring_keys(&cb.changelist_hash,
+                                       changelists, scratch_pool));
+  cb.status_func = status_func;
+  cb.status_baton = status_baton;
+
+  for (i = 0; i < paths->nelts; i++)
+    {
+      const char *path = APR_ARRAY_IDX(paths, i, const char *);
+
+      if (svn_path_is_url(path))
+        return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                                 _("'%s' is not a local path"), path);
+      SVN_ERR(svn_dirent_get_absolute(&path, path, scratch_pool));
+
+      SVN_ERR(svn_wc_walk_status(ctx->wc_ctx, path, depth,
+                                 FALSE /*get_all*/, FALSE /*no_ignore*/,
+                                 FALSE /*ignore_text_mods*/,
+                                 NULL /*ignore_patterns*/,
+                                 changelist_filter_func, &cb,
+                                 ctx->cancel_func, ctx->cancel_baton,
+                                 scratch_pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/** Write local changes to the shelf storage.
+ *
+ * @a paths, @a depth, @a changelists: The selection of local paths to diff.
+ *
+ * @a paths are relative to CWD (or absolute).
+ */
+static svn_error_t *
+shelf_write_changes(svn_boolean_t *any_shelved,
+                    svn_client__shelf2_version_t *shelf_version,
+                    const apr_array_header_t *paths,
+                    svn_depth_t depth,
+                    const apr_array_header_t *changelists,
+                    svn_client_status_func_t shelved_func,
+                    void *shelved_baton,
+                    svn_client_status_func_t not_shelved_func,
+                    void *not_shelved_baton,
+                    const char *wc_root_abspath,
+                    svn_client_ctx_t *ctx,
+                    apr_pool_t *result_pool,
+                    apr_pool_t *scratch_pool)
+{
+  write_changes_baton_t wb = { 0 };
+
+  wb.wc_root_abspath = wc_root_abspath;
+  wb.shelf_version = shelf_version;
+  wb.ctx = ctx;
+  wb.any_shelved = FALSE;
+  wb.was_shelved_func = shelved_func;
+  wb.was_shelved_baton = shelved_baton;
+  wb.was_not_shelved_func = not_shelved_func;
+  wb.was_not_shelved_baton = not_shelved_baton;
+  wb.pool = result_pool;
+
+  /* Walk the WC */
+  SVN_ERR(wc_walk_status_multi(paths, depth, changelists,
+                               write_changes_visitor, &wb,
+                               ctx, scratch_pool));
+
+  *any_shelved = wb.any_shelved;
+  return SVN_NO_ERROR;
+}
+
+/* Construct a shelf object representing an empty shelf: no versions,
+ * no revprops, no looking to see if such a shelf exists on disk.
+ */
+static svn_error_t *
+shelf_construct(svn_client__shelf2_t **shelf_p,
+                const char *name,
+                const char *local_abspath,
+                svn_client_ctx_t *ctx,
+                apr_pool_t *result_pool)
+{
+  svn_client__shelf2_t *shelf = apr_palloc(result_pool, sizeof(*shelf));
+  char *shelves_dir;
+
+  SVN_ERR(svn_client_get_wc_root(&shelf->wc_root_abspath,
+                                 local_abspath, ctx,
+                                 result_pool, result_pool));
+  SVN_ERR(get_shelves_dir(&shelves_dir,
+                          ctx->wc_ctx, local_abspath,
+                          result_pool, result_pool));
+  shelf->shelves_dir = shelves_dir;
+  shelf->ctx = ctx;
+  shelf->pool = result_pool;
+
+  shelf->name = apr_pstrdup(result_pool, name);
+  shelf->revprops = apr_hash_make(result_pool);
+  shelf->max_version = 0;
+
+  *shelf_p = shelf;
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_open_existing(svn_client__shelf2_t **shelf_p,
+                                 const char *name,
+                                 const char *local_abspath,
+                                 svn_client_ctx_t *ctx,
+                                 apr_pool_t *result_pool)
+{
+  SVN_ERR(shelf_construct(shelf_p, name,
+                          local_abspath, ctx, result_pool));
+  SVN_ERR(shelf_read_revprops(*shelf_p, result_pool));
+  SVN_ERR(shelf_read_current(*shelf_p, result_pool));
+  if ((*shelf_p)->max_version < 0)
+    {
+      return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                               _("Shelf '%s' not found"),
+                               name);
+    }
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_open_or_create(svn_client__shelf2_t **shelf_p,
+                                  const char *name,
+                                  const char *local_abspath,
+                                  svn_client_ctx_t *ctx,
+                                  apr_pool_t *result_pool)
+{
+  svn_client__shelf2_t *shelf;
+
+  SVN_ERR(shelf_construct(&shelf, name,
+                          local_abspath, ctx, result_pool));
+  SVN_ERR(shelf_read_revprops(shelf, result_pool));
+  SVN_ERR(shelf_read_current(shelf, result_pool));
+  if (shelf->max_version < 0)
+    {
+      shelf->max_version = 0;
+      SVN_ERR(shelf_write_current(shelf, result_pool));
+    }
+  *shelf_p = shelf;
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_close(svn_client__shelf2_t *shelf,
+                         apr_pool_t *scratch_pool)
+{
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_delete(const char *name,
+                          const char *local_abspath,
+                          svn_boolean_t dry_run,
+                          svn_client_ctx_t *ctx,
+                          apr_pool_t *scratch_pool)
+{
+  svn_client__shelf2_t *shelf;
+  int i;
+  char *abspath;
+
+  SVN_ERR(svn_client__shelf2_open_existing(&shelf, name,
+                                           local_abspath, ctx, scratch_pool));
+
+  /* Remove the versions. */
+  for (i = shelf->max_version; i > 0; i--)
+    {
+      SVN_ERR(shelf_version_delete(shelf, i, scratch_pool));
+    }
+
+  /* Remove the other files */
+  SVN_ERR(get_log_abspath(&abspath, shelf, scratch_pool, scratch_pool));
+  SVN_ERR(svn_io_remove_file2(abspath, TRUE /*ignore_enoent*/, scratch_pool));
+  SVN_ERR(get_current_abspath(&abspath, shelf, scratch_pool));
+  SVN_ERR(svn_io_remove_file2(abspath, TRUE /*ignore_enoent*/, scratch_pool));
+
+  SVN_ERR(svn_client__shelf2_close(shelf, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* Baton for paths_changed_visitor(). */
+struct paths_changed_walk_baton_t
+{
+  apr_hash_t *paths_hash;
+  svn_boolean_t as_abspath;
+  const char *wc_root_abspath;
+  apr_pool_t *pool;
+};
+
+/* Add to the list(s) in BATON, the RELPATH of a shelved 'binary' file.
+ * Implements shelved_files_walk_func_t. */
+static svn_error_t *
+paths_changed_visitor(void *baton,
+                      const char *relpath,
+                      svn_wc_status3_t *s,
+                      apr_pool_t *scratch_pool)
+{
+  struct paths_changed_walk_baton_t *b = baton;
+
+  relpath = (b->as_abspath
+             ? svn_dirent_join(b->wc_root_abspath, relpath, b->pool)
+             : apr_pstrdup(b->pool, relpath));
+  svn_hash_sets(b->paths_hash, relpath, relpath);
+  return SVN_NO_ERROR;
+}
+
+/* Get the paths changed, relative to WC root or as abspaths, as a hash
+ * and/or an array (in no particular order).
+ */
+static svn_error_t *
+shelf_paths_changed(apr_hash_t **paths_hash_p,
+                    apr_array_header_t **paths_array_p,
+                    svn_client__shelf2_version_t *shelf_version,
+                    svn_boolean_t as_abspath,
+                    apr_pool_t *result_pool,
+                    apr_pool_t *scratch_pool)
+{
+  svn_client__shelf2_t *shelf = shelf_version->shelf;
+  apr_hash_t *paths_hash = apr_hash_make(result_pool);
+  struct paths_changed_walk_baton_t baton;
+
+  baton.paths_hash = paths_hash;
+  baton.as_abspath = as_abspath;
+  baton.wc_root_abspath = shelf->wc_root_abspath;
+  baton.pool = result_pool;
+  SVN_ERR(shelf_status_walk(shelf_version, "",
+                            paths_changed_visitor, &baton,
+                            scratch_pool));
+
+  if (paths_hash_p)
+    *paths_hash_p = paths_hash;
+  if (paths_array_p)
+    SVN_ERR(svn_hash_keys(paths_array_p, paths_hash, result_pool));
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_paths_changed(apr_hash_t **affected_paths,
+                                 svn_client__shelf2_version_t *shelf_version,
+                                 apr_pool_t *result_pool,
+                                 apr_pool_t *scratch_pool)
+{
+  SVN_ERR(shelf_paths_changed(affected_paths, NULL, shelf_version,
+                              FALSE /*as_abspath*/,
+                              result_pool, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* Send a notification */
+static svn_error_t *
+send_notification(const char *local_abspath,
+                  svn_wc_notify_action_t action,
+                  svn_node_kind_t kind,
+                  svn_wc_notify_state_t content_state,
+                  svn_wc_notify_state_t prop_state,
+                  svn_wc_notify_func2_t notify_func,
+                  void *notify_baton,
+                  apr_pool_t *scratch_pool)
+{
+  if (notify_func)
+    {
+      svn_wc_notify_t *notify
+        = svn_wc_create_notify(local_abspath, action, scratch_pool);
+
+      notify->kind = kind;
+      notify->content_state = content_state;
+      notify->prop_state = prop_state;
+      notify_func(notify_baton, notify, scratch_pool);
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Merge a shelved change into WC_ABSPATH.
+ */
+static svn_error_t *
+wc_file_merge(const char *wc_abspath,
+              const char *left_file,
+              const char *right_file,
+              /*const*/ apr_hash_t *left_props,
+              /*const*/ apr_hash_t *right_props,
+              svn_client_ctx_t *ctx,
+              apr_pool_t *scratch_pool)
+{
+  svn_wc_notify_state_t property_state;
+  svn_boolean_t has_local_mods;
+  enum svn_wc_merge_outcome_t content_outcome;
+  const char *target_label, *left_label, *right_label;
+  apr_array_header_t *prop_changes;
+
+  /* xgettext: the '.working', '.merge-left' and '.merge-right' strings
+     are used to tag onto a file name in case of a merge conflict */
+  target_label = apr_psprintf(scratch_pool, _(".working"));
+  left_label = apr_psprintf(scratch_pool, _(".merge-left"));
+  right_label = apr_psprintf(scratch_pool, _(".merge-right"));
+
+  SVN_ERR(svn_prop_diffs(&prop_changes, right_props, left_props, scratch_pool));
+  SVN_ERR(svn_wc_text_modified_p2(&has_local_mods, ctx->wc_ctx,
+                                  wc_abspath, FALSE, scratch_pool));
+
+  /* Do property merge and text merge in one step so that keyword expansion
+     takes into account the new property values. */
+  SVN_WC__CALL_WITH_WRITE_LOCK(
+    svn_wc_merge5(&content_outcome, &property_state, ctx->wc_ctx,
+                  left_file, right_file, wc_abspath,
+                  left_label, right_label, target_label,
+                  NULL, NULL, /*left, right conflict-versions*/
+                  FALSE /*dry_run*/, NULL /*diff3_cmd*/,
+                  NULL /*merge_options*/,
+                  left_props, prop_changes,
+                  NULL, NULL,
+                  ctx->cancel_func, ctx->cancel_baton,
+                  scratch_pool),
+    ctx->wc_ctx, wc_abspath,
+    FALSE /*lock_anchor*/, scratch_pool);
+
+  return SVN_NO_ERROR;
+}
+
+/* Merge a shelved change (of properties) into the dir at WC_ABSPATH.
+ */
+static svn_error_t *
+wc_dir_props_merge(const char *wc_abspath,
+                   /*const*/ apr_hash_t *left_props,
+                   /*const*/ apr_hash_t *right_props,
+                   svn_client_ctx_t *ctx,
+                   apr_pool_t *result_pool,
+                   apr_pool_t *scratch_pool)
+{
+  apr_array_header_t *prop_changes;
+  svn_wc_notify_state_t property_state;
+
+  SVN_ERR(svn_prop_diffs(&prop_changes, right_props, left_props, scratch_pool));
+  SVN_WC__CALL_WITH_WRITE_LOCK(
+    svn_wc_merge_props3(&property_state, ctx->wc_ctx,
+                        wc_abspath,
+                        NULL, NULL, /*left, right conflict-versions*/
+                        left_props, prop_changes,
+                        FALSE /*dry_run*/,
+                        NULL, NULL,
+                        ctx->cancel_func, ctx->cancel_baton,
+                        scratch_pool),
+    ctx->wc_ctx, wc_abspath,
+    FALSE /*lock_anchor*/, scratch_pool);
+
+  return SVN_NO_ERROR;
+}
+
+/* Apply a shelved "delete" to TO_WC_ABSPATH.
+ */
+static svn_error_t *
+wc_node_delete(const char *to_wc_abspath,
+               svn_client_ctx_t *ctx,
+               apr_pool_t *scratch_pool)
+{
+  SVN_WC__CALL_WITH_WRITE_LOCK(
+    svn_wc_delete4(ctx->wc_ctx,
+                   to_wc_abspath,
+                   FALSE /*keep_local*/,
+                   TRUE /*delete_unversioned_target*/,
+                   NULL, NULL, NULL, NULL, /*cancel, notify*/
+                   scratch_pool),
+    ctx->wc_ctx, to_wc_abspath,
+    TRUE /*lock_anchor*/, scratch_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Apply a shelved "add" to TO_WC_ABSPATH.
+ * The node must already exist on disk, in a versioned parent dir.
+ */
+static svn_error_t *
+wc_node_add(const char *to_wc_abspath,
+            apr_hash_t *work_props,
+            svn_client_ctx_t *ctx,
+            apr_pool_t *scratch_pool)
+{
+  /* If it was not already versioned, schedule the node for addition.
+     (Do not apply autoprops, because this isn't a user-facing "add" but
+     restoring a previously saved state.) */
+  SVN_WC__CALL_WITH_WRITE_LOCK(
+    svn_wc_add_from_disk3(ctx->wc_ctx,
+                          to_wc_abspath, work_props,
+                          FALSE /* skip checks */,
+                          NULL, NULL, scratch_pool),
+    ctx->wc_ctx, to_wc_abspath,
+    TRUE /*lock_anchor*/, scratch_pool);
+  return SVN_NO_ERROR;
+}
+
+/* Baton for apply_file_visitor(). */
+struct apply_files_baton_t
+{
+  svn_client__shelf2_version_t *shelf_version;
+  svn_boolean_t test_only;  /* only check whether it would conflict */
+  svn_boolean_t conflict;  /* would it conflict? */
+  svn_client_ctx_t *ctx;
+};
+
+/* Copy the file RELPATH from shelf binary file storage to the WC.
+ *
+ * If it is not already versioned, schedule the file for addition.
+ *
+ * Make any missing parent directories.
+ *
+ * In test mode (BATON->test_only): set BATON->conflict if we can't apply
+ * the change to WC at RELPATH without conflict. But in fact, just check
+ * if WC at RELPATH is locally modified.
+ *
+ * Implements shelved_files_walk_func_t. */
+static svn_error_t *
+apply_file_visitor(void *baton,
+                   const char *relpath,
+                   svn_wc_status3_t *s,
+                   apr_pool_t *scratch_pool)
+{
+  struct apply_files_baton_t *b = baton;
+  const char *wc_root_abspath = b->shelf_version->shelf->wc_root_abspath;
+  char *stored_base_abspath, *stored_work_abspath;
+  apr_hash_t *base_props, *work_props;
+  const char *to_wc_abspath = svn_dirent_join(wc_root_abspath, relpath,
+                                              scratch_pool);
+  const char *to_dir_abspath = svn_dirent_dirname(to_wc_abspath, scratch_pool);
+
+  SVN_ERR(get_base_file_abspath(&stored_base_abspath,
+                                b->shelf_version, relpath,
+                                scratch_pool, scratch_pool));
+  SVN_ERR(get_working_file_abspath(&stored_work_abspath,
+                                   b->shelf_version, relpath,
+                                   scratch_pool, scratch_pool));
+  SVN_ERR(read_props_from_shelf(&base_props, &work_props,
+                                s->node_status,
+                                b->shelf_version, relpath,
+                                scratch_pool, scratch_pool));
+
+  if (b->test_only)
+    {
+      svn_wc_status3_t *status;
+
+      SVN_ERR(svn_wc_status3(&status, b->ctx->wc_ctx, to_wc_abspath,
+                             scratch_pool, scratch_pool));
+      switch (status->node_status)
+        {
+        case svn_wc_status_normal:
+        case svn_wc_status_none:
+          break;
+        default:
+          b->conflict = TRUE;
+        }
+
+      return SVN_NO_ERROR;
+    }
+
+  /* Handle 'delete' and the delete half of 'replace' */
+  if (s->node_status == svn_wc_status_deleted
+      || s->node_status == svn_wc_status_replaced)
+    {
+      SVN_ERR(wc_node_delete(to_wc_abspath, b->ctx, scratch_pool));
+      if (s->node_status != svn_wc_status_replaced)
+        {
+          SVN_ERR(send_notification(to_wc_abspath, svn_wc_notify_update_delete,
+                                    s->kind,
+                                    svn_wc_notify_state_inapplicable,
+                                    svn_wc_notify_state_inapplicable,
+                                    b->ctx->notify_func2, b->ctx->notify_baton2,
+                                    scratch_pool));
+        }
+    }
+
+  /* If we can merge a file, do so. */
+  if (s->node_status == svn_wc_status_modified)
+    {
+      if (s->kind == svn_node_dir)
+        {
+          SVN_ERR(wc_dir_props_merge(to_wc_abspath,
+                                     base_props, work_props,
+                                     b->ctx, scratch_pool, scratch_pool));
+        }
+      else if (s->kind == svn_node_file)
+        {
+          SVN_ERR(wc_file_merge(to_wc_abspath,
+                                stored_base_abspath, stored_work_abspath,
+                                base_props, work_props,
+                                b->ctx, scratch_pool));
+        }
+      SVN_ERR(send_notification(to_wc_abspath, svn_wc_notify_update_update,
+                                s->kind,
+                                (s->kind == svn_node_dir)
+                                  ? svn_wc_notify_state_inapplicable
+                                  : svn_wc_notify_state_merged,
+                                (s->kind == svn_node_dir)
+                                  ? svn_wc_notify_state_merged
+                                  : svn_wc_notify_state_unknown,
+                                b->ctx->notify_func2, b->ctx->notify_baton2,
+                                scratch_pool));
+    }
+
+  /* For an added file, copy it into the WC and ensure it's versioned. */
+  if (s->node_status == svn_wc_status_added
+      || s->node_status == svn_wc_status_replaced)
+    {
+      if (s->kind == svn_node_dir)
+        {
+          SVN_ERR(svn_io_make_dir_recursively(to_wc_abspath, scratch_pool));
+        }
+      else if (s->kind == svn_node_file)
+        {
+          SVN_ERR(svn_io_make_dir_recursively(to_dir_abspath, scratch_pool));
+          SVN_ERR(svn_io_copy_file(stored_work_abspath, to_wc_abspath,
+                                   TRUE /*copy_perms*/, scratch_pool));
+        }
+      SVN_ERR(wc_node_add(to_wc_abspath, work_props, b->ctx, scratch_pool));
+      SVN_ERR(send_notification(to_wc_abspath,
+                                (s->node_status == svn_wc_status_replaced)
+                                  ? svn_wc_notify_update_replace
+                                  : svn_wc_notify_update_add,
+                                s->kind,
+                                svn_wc_notify_state_inapplicable,
+                                svn_wc_notify_state_inapplicable,
+                                b->ctx->notify_func2, b->ctx->notify_baton2,
+                                scratch_pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/*-------------------------------------------------------------------------*/
+/* Diff */
+
+/*  */
+static svn_error_t *
+file_changed(svn_client__shelf2_version_t *shelf_version,
+             const char *relpath,
+             svn_wc_status3_t *s,
+             const svn_diff_tree_processor_t *diff_processor,
+             svn_diff_source_t *left_source,
+             svn_diff_source_t *right_source,
+             const char *left_stored_abspath,
+             const char *right_stored_abspath,
+             void *dir_baton,
+             apr_pool_t *scratch_pool)
+{
+  void *fb;
+  svn_boolean_t skip = FALSE;
+
+  SVN_ERR(diff_processor->file_opened(&fb, &skip, relpath,
+                                      left_source, right_source,
+                                      NULL /*copyfrom*/,
+                                      dir_baton, diff_processor,
+                                      scratch_pool, scratch_pool));
+  if (!skip)
+    {
+      apr_hash_t *left_props, *right_props;
+      apr_array_header_t *prop_changes;
+
+      SVN_ERR(read_props_from_shelf(&left_props, &right_props,
+                                    s->node_status, shelf_version, relpath,
+                                    scratch_pool, scratch_pool));
+      SVN_ERR(svn_prop_diffs(&prop_changes, right_props, left_props,
+                             scratch_pool));
+      SVN_ERR(diff_processor->file_changed(
+                relpath,
+                left_source, right_source,
+                left_stored_abspath, right_stored_abspath,
+                left_props, right_props,
+                TRUE /*file_modified*/, prop_changes,
+                fb, diff_processor, scratch_pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/*  */
+static svn_error_t *
+file_deleted(svn_client__shelf2_version_t *shelf_version,
+             const char *relpath,
+             svn_wc_status3_t *s,
+             const svn_diff_tree_processor_t *diff_processor,
+             svn_diff_source_t *left_source,
+             const char *left_stored_abspath,
+             void *dir_baton,
+             apr_pool_t *scratch_pool)
+{
+  void *fb;
+  svn_boolean_t skip = FALSE;
+
+  SVN_ERR(diff_processor->file_opened(&fb, &skip, relpath,
+                                      left_source, NULL, NULL /*copyfrom*/,
+                                      dir_baton, diff_processor,
+                                      scratch_pool, scratch_pool));
+  if (!skip)
+    {
+      apr_hash_t *left_props, *right_props;
+
+      SVN_ERR(read_props_from_shelf(&left_props, &right_props,
+                                    s->node_status, shelf_version, relpath,
+                                    scratch_pool, scratch_pool));
+      SVN_ERR(diff_processor->file_deleted(relpath,
+                                           left_source,
+                                           left_stored_abspath,
+                                           left_props,
+                                           fb, diff_processor,
+                                           scratch_pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/*  */
+static svn_error_t *
+file_added(svn_client__shelf2_version_t *shelf_version,
+           const char *relpath,
+           svn_wc_status3_t *s,
+           const svn_diff_tree_processor_t *diff_processor,
+           svn_diff_source_t *right_source,
+           const char *right_stored_abspath,
+           void *dir_baton,
+           apr_pool_t *scratch_pool)
+{
+  void *fb;
+  svn_boolean_t skip = FALSE;
+
+  SVN_ERR(diff_processor->file_opened(&fb, &skip, relpath,
+                                      NULL, right_source, NULL /*copyfrom*/,
+                                      dir_baton, diff_processor,
+                                      scratch_pool, scratch_pool));
+  if (!skip)
+    {
+      apr_hash_t *left_props, *right_props;
+
+      SVN_ERR(read_props_from_shelf(&left_props, &right_props,
+                                    s->node_status, shelf_version, relpath,
+                                    scratch_pool, scratch_pool));
+      SVN_ERR(diff_processor->file_added(
+                relpath,
+                NULL /*copyfrom_source*/, right_source,
+                NULL /*copyfrom_abspath*/, right_stored_abspath,
+                NULL /*copyfrom_props*/, right_props,
+                fb, diff_processor, scratch_pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Baton for diff_visitor(). */
+struct diff_baton_t
+{
+  svn_client__shelf2_version_t *shelf_version;
+  const char *top_relpath;  /* top of diff, relative to shelf */
+  const char *walk_root_abspath;
+  const svn_diff_tree_processor_t *diff_processor;
+};
+
+/* Drive BATON->diff_processor.
+ * Implements svn_io_walk_func_t. */
+static svn_error_t *
+diff_visitor(void *baton,
+             const char *abspath,
+             const apr_finfo_t *finfo,
+             apr_pool_t *scratch_pool)
+{
+  struct diff_baton_t *b = baton;
+  const char *relpath;
+
+  relpath = svn_dirent_skip_ancestor(b->walk_root_abspath, abspath);
+  if (finfo->filetype == APR_REG
+           && (strlen(relpath) >= 5 && strcmp(relpath+strlen(relpath)-5, ".meta") == 0))
+    {
+      svn_wc_status3_t *s;
+      void *db = NULL;
+      svn_diff_source_t *left_source;
+      svn_diff_source_t *right_source;
+      char *left_stored_abspath, *right_stored_abspath;
+
+      relpath = apr_pstrndup(scratch_pool, relpath, strlen(relpath) - 5);
+      if (!svn_relpath_skip_ancestor(b->top_relpath, relpath))
+        return SVN_NO_ERROR;
+
+      SVN_ERR(status_read(&s, b->shelf_version, relpath,
+                          scratch_pool, scratch_pool));
+
+      left_source = svn_diff__source_create(s->revision, scratch_pool);
+      right_source = svn_diff__source_create(SVN_INVALID_REVNUM, scratch_pool);
+      SVN_ERR(get_base_file_abspath(&left_stored_abspath,
+                                    b->shelf_version, relpath,
+                                    scratch_pool, scratch_pool));
+      SVN_ERR(get_working_file_abspath(&right_stored_abspath,
+                                       b->shelf_version, relpath,
+                                       scratch_pool, scratch_pool));
+
+      switch (s->node_status)
+        {
+        case svn_wc_status_modified:
+          SVN_ERR(file_changed(b->shelf_version, relpath, s,
+                               b->diff_processor,
+                               left_source, right_source,
+                               left_stored_abspath, right_stored_abspath,
+                               db, scratch_pool));
+          break;
+        case svn_wc_status_added:
+          SVN_ERR(file_added(b->shelf_version, relpath, s,
+                             b->diff_processor,
+                             right_source, right_stored_abspath,
+                             db, scratch_pool));
+          break;
+        case svn_wc_status_deleted:
+          SVN_ERR(file_deleted(b->shelf_version, relpath, s,
+                               b->diff_processor,
+                               left_source, left_stored_abspath,
+                               db, scratch_pool));
+          break;
+        case svn_wc_status_replaced:
+          SVN_ERR(file_deleted(b->shelf_version, relpath, s,
+                               b->diff_processor,
+                               left_source, left_stored_abspath,
+                               db, scratch_pool));
+          SVN_ERR(file_added(b->shelf_version, relpath, s,
+                             b->diff_processor,
+                             right_source, right_stored_abspath,
+                             db, scratch_pool));
+        default:
+          break;
+        }
+    }
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_test_apply_file(svn_boolean_t *conflict_p,
+                                   svn_client__shelf2_version_t *shelf_version,
+                                   const char *file_relpath,
+                                   apr_pool_t *scratch_pool)
+{
+  struct apply_files_baton_t baton = {0};
+
+  baton.shelf_version = shelf_version;
+  baton.test_only = TRUE;
+  baton.conflict = FALSE;
+  baton.ctx = shelf_version->shelf->ctx;
+  SVN_ERR(shelf_status_visit_path(shelf_version, file_relpath,
+                           apply_file_visitor, &baton,
+                           scratch_pool));
+  *conflict_p = baton.conflict;
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_apply(svn_client__shelf2_version_t *shelf_version,
+                         svn_boolean_t dry_run,
+                         apr_pool_t *scratch_pool)
+{
+  struct apply_files_baton_t baton = {0};
+
+  baton.shelf_version = shelf_version;
+  baton.ctx = shelf_version->shelf->ctx;
+  SVN_ERR(shelf_status_walk(shelf_version, "",
+                            apply_file_visitor, &baton,
+                            scratch_pool));
+
+  svn_io_sleep_for_timestamps(shelf_version->shelf->wc_root_abspath,
+                              scratch_pool);
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_unapply(svn_client__shelf2_version_t *shelf_version,
+                           svn_boolean_t dry_run,
+                           apr_pool_t *scratch_pool)
+{
+  apr_array_header_t *targets;
+
+  SVN_ERR(shelf_paths_changed(NULL, &targets, shelf_version,
+                              TRUE /*as_abspath*/,
+                              scratch_pool, scratch_pool));
+  if (!dry_run)
+    {
+      SVN_ERR(svn_client_revert4(targets, svn_depth_empty,
+                                 NULL /*changelists*/,
+                                 FALSE /*clear_changelists*/,
+                                 FALSE /*metadata_only*/,
+                                 FALSE /*added_keep_local*/,
+                                 shelf_version->shelf->ctx, scratch_pool));
+    }
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_delete_newer_versions(svn_client__shelf2_t *shelf,
+                                         svn_client__shelf2_version_t *shelf_version,
+                                         apr_pool_t *scratch_pool)
+{
+  int previous_version = shelf_version ? shelf_version->version_number : 0;
+  int i;
+
+  /* Delete any newer checkpoints */
+  for (i = shelf->max_version; i > previous_version; i--)
+    {
+      SVN_ERR(shelf_version_delete(shelf, i, scratch_pool));
+    }
+
+  shelf->max_version = previous_version;
+  SVN_ERR(shelf_write_current(shelf, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_diff(svn_client__shelf2_version_t *shelf_version,
+                        const char *shelf_relpath,
+                        svn_depth_t depth,
+                        svn_boolean_t ignore_ancestry,
+                        const svn_diff_tree_processor_t *diff_processor,
+                        apr_pool_t *scratch_pool)
+{
+  struct diff_baton_t baton;
+
+  if (shelf_version->version_number == 0)
+    return SVN_NO_ERROR;
+
+  baton.shelf_version = shelf_version;
+  baton.top_relpath = shelf_relpath;
+  baton.walk_root_abspath = shelf_version->files_dir_abspath;
+  baton.diff_processor = diff_processor;
+  SVN_ERR(svn_io_dir_walk2(baton.walk_root_abspath, 0 /*wanted*/,
+                           diff_visitor, &baton,
+                           scratch_pool));
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_save_new_version3(svn_client__shelf2_version_t **new_version_p,
+                                     svn_client__shelf2_t *shelf,
+                                     const apr_array_header_t *paths,
+                                     svn_depth_t depth,
+                                     const apr_array_header_t *changelists,
+                                     svn_client_status_func_t shelved_func,
+                                     void *shelved_baton,
+                                     svn_client_status_func_t not_shelved_func,
+                                     void *not_shelved_baton,
+                                     apr_pool_t *scratch_pool)
+{
+  int next_version = shelf->max_version + 1;
+  svn_client__shelf2_version_t *new_shelf_version;
+  svn_boolean_t any_shelved;
+
+  SVN_ERR(shelf_version_create(&new_shelf_version,
+                               shelf, next_version, scratch_pool));
+  SVN_ERR(shelf_write_changes(&any_shelved,
+                              new_shelf_version,
+                              paths, depth, changelists,
+                              shelved_func, shelved_baton,
+                              not_shelved_func, not_shelved_baton,
+                              shelf->wc_root_abspath,
+                              shelf->ctx, scratch_pool, scratch_pool));
+
+  if (any_shelved)
+    {
+      shelf->max_version = next_version;
+      SVN_ERR(shelf_write_current(shelf, scratch_pool));
+
+      if (new_version_p)
+        SVN_ERR(svn_client__shelf2_version_open(new_version_p, shelf, next_version,
+                                                scratch_pool, scratch_pool));
+    }
+  else
+    {
+      if (new_version_p)
+        *new_version_p = NULL;
+    }
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_get_log_message(char **log_message,
+                                   svn_client__shelf2_t *shelf,
+                                   apr_pool_t *result_pool)
+{
+  svn_string_t *propval = svn_hash_gets(shelf->revprops, SVN_PROP_REVISION_LOG);
+
+  if (propval)
+    *log_message = apr_pstrdup(result_pool, propval->data);
+  else
+    *log_message = NULL;
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_set_log_message(svn_client__shelf2_t *shelf,
+                                   const char *message,
+                                   apr_pool_t *scratch_pool)
+{
+  svn_string_t *propval
+    = message ? svn_string_create(message, shelf->pool) : NULL;
+
+  SVN_ERR(svn_client__shelf2_revprop_set(shelf, SVN_PROP_REVISION_LOG, propval,
+                                         scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_list(apr_hash_t **shelf_infos,
+                        const char *local_abspath,
+                        svn_client_ctx_t *ctx,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool)
+{
+  const char *wc_root_abspath;
+  char *shelves_dir;
+  apr_hash_t *dirents;
+  apr_hash_index_t *hi;
+
+  SVN_ERR(svn_wc__get_wcroot(&wc_root_abspath, ctx->wc_ctx, local_abspath,
+                             scratch_pool, scratch_pool));
+  SVN_ERR(get_shelves_dir(&shelves_dir, ctx->wc_ctx, local_abspath,
+                          scratch_pool, scratch_pool));
+  SVN_ERR(svn_io_get_dirents3(&dirents, shelves_dir, FALSE /*only_check_type*/,
+                              result_pool, scratch_pool));
+
+  *shelf_infos = apr_hash_make(result_pool);
+
+  /* Remove non-shelves */
+  for (hi = apr_hash_first(scratch_pool, dirents); hi; hi = apr_hash_next(hi))
+    {
+      const char *filename = apr_hash_this_key(hi);
+      svn_io_dirent2_t *dirent = apr_hash_this_val(hi);
+      char *name = NULL;
+
+      svn_error_clear(shelf_name_from_filename(&name, filename, result_pool));
+      if (name && dirent->kind == svn_node_file)
+        {
+          svn_client__shelf2_info_t *info
+            = apr_palloc(result_pool, sizeof(*info));
+
+          info->mtime = dirent->mtime;
+          svn_hash_sets(*shelf_infos, name, info);
+        }
+    }
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_version_open(svn_client__shelf2_version_t **shelf_version_p,
+                                svn_client__shelf2_t *shelf,
+                                int version_number,
+                                apr_pool_t *result_pool,
+                                apr_pool_t *scratch_pool)
+{
+  svn_client__shelf2_version_t *shelf_version;
+  const svn_io_dirent2_t *dirent;
+
+  SVN_ERR(shelf_version_create(&shelf_version,
+                               shelf, version_number, result_pool));
+  SVN_ERR(svn_io_stat_dirent2(&dirent,
+                              shelf_version->files_dir_abspath,
+                              FALSE /*verify_truename*/,
+                              TRUE /*ignore_enoent*/,
+                              result_pool, scratch_pool));
+  if (dirent->kind == svn_node_none)
+    {
+      return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                               _("Shelf '%s' version %d not found"),
+                               shelf->name, version_number);
+    }
+  shelf_version->mtime = dirent->mtime;
+  *shelf_version_p = shelf_version;
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_get_newest_version(svn_client__shelf2_version_t **shelf_version_p,
+                                      svn_client__shelf2_t *shelf,
+                                      apr_pool_t *result_pool,
+                                      apr_pool_t *scratch_pool)
+{
+  if (shelf->max_version == 0)
+    {
+      *shelf_version_p = NULL;
+      return SVN_NO_ERROR;
+    }
+
+  SVN_ERR(svn_client__shelf2_version_open(shelf_version_p,
+                                          shelf, shelf->max_version,
+                                          result_pool, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__shelf2_get_all_versions(apr_array_header_t **versions_p,
+                                    svn_client__shelf2_t *shelf,
+                                    apr_pool_t *result_pool,
+                                    apr_pool_t *scratch_pool)
+{
+  int i;
+
+  *versions_p = apr_array_make(result_pool, shelf->max_version - 1,
+                               sizeof(svn_client__shelf2_version_t *));
+
+  for (i = 1; i <= shelf->max_version; i++)
+    {
+      svn_client__shelf2_version_t *shelf_version;
+
+      SVN_ERR(svn_client__shelf2_version_open(&shelf_version,
+                                              shelf, i,
+                                              result_pool, scratch_pool));
+      APR_ARRAY_PUSH(*versions_p, svn_client__shelf2_version_t *) = shelf_version;
+    }
+  return SVN_NO_ERROR;
+}
diff --git a/subversion/libsvn_client/status.c b/subversion/libsvn_client/status.c
index 5ab5234..9e53713 100644
--- a/subversion/libsvn_client/status.c
+++ b/subversion/libsvn_client/status.c
@@ -44,6 +44,7 @@
 #include "svn_error.h"
 #include "svn_hash.h"
 
+#include "private/svn_client_shelf.h"
 #include "private/svn_client_private.h"
 #include "private/svn_sorts_private.h"
 #include "private/svn_wc_private.h"
diff --git a/subversion/libsvn_delta/branch.c b/subversion/libsvn_delta/branch.c
index 95355d4..57cdea7 100644
--- a/subversion/libsvn_delta/branch.c
+++ b/subversion/libsvn_delta/branch.c
@@ -157,7 +157,7 @@ branch_txn_delete_branch(svn_branch__txn_t *txn,
 
       if (strcmp(b->bid, bid) == 0)
         {
-          svn_sort__array_delete(txn->priv->branches, i, 1);
+          SVN_ERR(svn_sort__array_delete2(txn->priv->branches, i, 1));
           break;
         }
     }
diff --git a/subversion/libsvn_diff/diff_file.c b/subversion/libsvn_diff/diff_file.c
index d0182c8..6d72159 100644
--- a/subversion/libsvn_diff/diff_file.c
+++ b/subversion/libsvn_diff/diff_file.c
@@ -1253,7 +1253,7 @@ svn_diff_file_options_parse(svn_diff_file_options_t *options,
   apr_array_cat(argv, args);
   APR_ARRAY_PUSH(argv, const char *) = NULL;
 
-  apr_getopt_init(&os, pool, 
+  apr_getopt_init(&os, pool,
                   argv->nelts - 1 /* Exclude trailing NULL */,
                   (const char *const *) argv->elts);
 
diff --git a/subversion/libsvn_diff/parse-diff.c b/subversion/libsvn_diff/parse-diff.c
index a9c8e62..4fc5bfd 100644
--- a/subversion/libsvn_diff/parse-diff.c
+++ b/subversion/libsvn_diff/parse-diff.c
@@ -215,7 +215,7 @@ svn_diff_hunk__create_adds_single_line(svn_diff_hunk_t **hunk_out,
                                        apr_pool_t *result_pool,
                                        apr_pool_t *scratch_pool)
 {
-  SVN_ERR(add_or_delete_single_line(hunk_out, line, patch, 
+  SVN_ERR(add_or_delete_single_line(hunk_out, line, patch,
                                     (!patch->reverse),
                                     result_pool, scratch_pool));
   return SVN_NO_ERROR;
@@ -1235,7 +1235,7 @@ parse_next_hunk(svn_diff_hunk_t **hunk,
           c = line->data[0];
           if (c == ' '
               || ((original_lines > 0 && modified_lines > 0)
-                  && ( 
+                  && (
                /* Tolerate chopped leading spaces on empty lines. */
                       (! eof && line->len == 0)
                /* Maybe tolerate chopped leading spaces on non-empty lines. */
@@ -2085,7 +2085,7 @@ parse_binary_patch(svn_patch_t *patch, apr_file_t *apr_file,
           else if (in_src)
             {
               patch->binary_patch = bpatch; /* SUCCESS! */
-              break; 
+              break;
             }
           else
             {
diff --git a/subversion/libsvn_fs/fs-loader.h b/subversion/libsvn_fs/fs-loader.h
index f48a812..35b55d6 100644
--- a/subversion/libsvn_fs/fs-loader.h
+++ b/subversion/libsvn_fs/fs-loader.h
@@ -207,12 +207,12 @@ typedef struct fs_vtable_t
   svn_error_t *(*revision_prop)(svn_string_t **value_p, svn_fs_t *fs,
                                 svn_revnum_t rev, const char *propname,
                                 svn_boolean_t refresh,
-                                apr_pool_t *result_pool, 
+                                apr_pool_t *result_pool,
                                 apr_pool_t *scratch_pool);
   svn_error_t *(*revision_proplist)(apr_hash_t **table_p, svn_fs_t *fs,
                                     svn_revnum_t rev,
                                     svn_boolean_t refresh,
-                                    apr_pool_t *result_pool, 
+                                    apr_pool_t *result_pool,
                                     apr_pool_t *scratch_pool);
   svn_error_t *(*change_rev_prop)(svn_fs_t *fs, svn_revnum_t rev,
                                   const char *name,
diff --git a/subversion/libsvn_fs_fs/cached_data.c b/subversion/libsvn_fs_fs/cached_data.c
index 1bd8248..9778dba 100644
--- a/subversion/libsvn_fs_fs/cached_data.c
+++ b/subversion/libsvn_fs_fs/cached_data.c
@@ -2337,7 +2337,7 @@ svn_fs_fs__get_contents_from_file(svn_stream_t **contents_p,
                              rb->filehandle_pool));
 
       /* Insert the access to REP as the first element of the delta chain. */
-      svn_sort__array_insert(rb->rs_list, &rs, 0);
+      SVN_ERR(svn_sort__array_insert2(rb->rs_list, &rs, 0));
     }
 
   /* Now, the baton is complete and we can assemble the stream around it. */
diff --git a/subversion/libsvn_fs_fs/fs.c b/subversion/libsvn_fs_fs/fs.c
index c1dd42a..5174da2 100644
--- a/subversion/libsvn_fs_fs/fs.c
+++ b/subversion/libsvn_fs_fs/fs.c
@@ -277,6 +277,7 @@ fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code_t ctlcode,
                                        cancel_func, cancel_baton,
                                        result_pool, scratch_pool));
           *output_p = output;
+          return SVN_NO_ERROR;
         }
       else if (ctlcode.code == SVN_FS_FS__IOCTL_DUMP_INDEX.code)
         {
@@ -288,6 +289,7 @@ fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code_t ctlcode,
                                         cancel_func, cancel_baton,
                                         scratch_pool));
           *output_p = NULL;
+          return SVN_NO_ERROR;
         }
       else if (ctlcode.code == SVN_FS_FS__IOCTL_LOAD_INDEX.code)
         {
@@ -296,6 +298,7 @@ fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code_t ctlcode,
           SVN_ERR(svn_fs_fs__load_index(fs, input->revision, input->entries,
                                         scratch_pool));
           *output_p = NULL;
+          return SVN_NO_ERROR;
         }
       else if (ctlcode.code == SVN_FS_FS__IOCTL_REVISION_SIZE.code)
         {
@@ -307,14 +310,27 @@ fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code_t ctlcode,
                                            fs, input->revision,
                                            scratch_pool));
           *output_p = output;
+          return SVN_NO_ERROR;
+        }
+      else if (ctlcode.code == SVN_FS_FS__IOCTL_BUILD_REP_CACHE.code)
+        {
+          svn_fs_fs__ioctl_build_rep_cache_input_t *input = input_void;
+
+          SVN_ERR(svn_fs_fs__build_rep_cache(fs,
+                                             input->start_rev,
+                                             input->end_rev,
+                                             input->progress_func,
+                                             input->progress_baton,
+                                             cancel_func,
+                                             cancel_baton,
+                                             scratch_pool));
+
+          *output_p = NULL;
+          return SVN_NO_ERROR;
         }
-      else
-        return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL);
     }
-  else
-    return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL);
 
-  return SVN_NO_ERROR;
+  return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL);
 }
 
 /* The vtable associated with a specific open filesystem. */
diff --git a/subversion/libsvn_fs_fs/fs_fs.c b/subversion/libsvn_fs_fs/fs_fs.c
index 5cb1362..76b053e 100644
--- a/subversion/libsvn_fs_fs/fs_fs.c
+++ b/subversion/libsvn_fs_fs/fs_fs.c
@@ -37,6 +37,7 @@
 #include "cached_data.h"
 #include "id.h"
 #include "index.h"
+#include "low_level.h"
 #include "rep-cache.h"
 #include "revprops.h"
 #include "transaction.h"
@@ -2343,3 +2344,172 @@ svn_fs_fs__info_config_files(apr_array_header_t **files,
                                                          result_pool);
   return SVN_NO_ERROR;
 }
+
+static svn_error_t *
+ensure_representation_sha1(svn_fs_t *fs,
+                           representation_t *rep,
+                           apr_pool_t *pool)
+{
+  if (!rep->has_sha1)
+    {
+      svn_stream_t *contents;
+      svn_checksum_t *checksum;
+
+      SVN_ERR(svn_fs_fs__get_contents(&contents, fs, rep, FALSE, pool));
+      SVN_ERR(svn_stream_contents_checksum(&checksum, contents,
+                                           svn_checksum_sha1, pool, pool));
+
+      memcpy(rep->sha1_digest, checksum->digest, APR_SHA1_DIGESTSIZE);
+      rep->has_sha1 = TRUE;
+    }
+
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+reindex_node(svn_fs_t *fs,
+             const svn_fs_id_t *id,
+             svn_revnum_t rev,
+             svn_fs_fs__revision_file_t *rev_file,
+             svn_cancel_func_t cancel_func,
+             void *cancel_baton,
+             apr_pool_t *pool)
+{
+  node_revision_t *noderev;
+  apr_off_t offset;
+
+  if (svn_fs_fs__id_rev(id) != rev)
+    {
+      return SVN_NO_ERROR;
+    }
+
+  if (cancel_func)
+    SVN_ERR(cancel_func(cancel_baton));
+
+  SVN_ERR(svn_fs_fs__item_offset(&offset, fs, rev_file, rev, NULL,
+                                 svn_fs_fs__id_item(id), pool));
+
+  SVN_ERR(svn_io_file_seek(rev_file->file, APR_SET, &offset, pool));
+  SVN_ERR(svn_fs_fs__read_noderev(&noderev, rev_file->stream,
+                                  pool, pool));
+
+  /* Make sure EXPANDED_SIZE has the correct value for every rep. */
+  SVN_ERR(svn_fs_fs__fixup_expanded_size(fs, noderev->data_rep, pool));
+  SVN_ERR(svn_fs_fs__fixup_expanded_size(fs, noderev->prop_rep, pool));
+
+  /* First reindex sub-directory to match write_final_rev() behavior. */
+  if (noderev->kind == svn_node_dir)
+    {
+      apr_array_header_t *entries;
+
+      SVN_ERR(svn_fs_fs__rep_contents_dir(&entries, fs, noderev, pool, pool));
+
+      if (entries->nelts > 0)
+        {
+          int i;
+          apr_pool_t *iterpool;
+
+          iterpool = svn_pool_create(pool);
+          for (i = 0; i < entries->nelts; i++)
+            {
+              const svn_fs_dirent_t *dirent;
+
+              svn_pool_clear(iterpool);
+
+              dirent = APR_ARRAY_IDX(entries, i, svn_fs_dirent_t *);
+
+              SVN_ERR(reindex_node(fs, dirent->id, rev, rev_file,
+                                   cancel_func, cancel_baton, iterpool));
+            }
+          svn_pool_destroy(iterpool);
+        }
+    }
+
+  if (noderev->data_rep && noderev->data_rep->revision == rev &&
+      noderev->kind == svn_node_file)
+    {
+      SVN_ERR(ensure_representation_sha1(fs, noderev->data_rep, pool));
+      SVN_ERR(svn_fs_fs__set_rep_reference(fs, noderev->data_rep, pool));
+    }
+
+  if (noderev->prop_rep && noderev->prop_rep->revision == rev)
+    {
+      SVN_ERR(ensure_representation_sha1(fs, noderev->prop_rep, pool));
+      SVN_ERR(svn_fs_fs__set_rep_reference(fs, noderev->prop_rep, pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_fs_fs__build_rep_cache(svn_fs_t *fs,
+                           svn_revnum_t start_rev,
+                           svn_revnum_t end_rev,
+                           svn_fs_progress_notify_func_t progress_func,
+                           void *progress_baton,
+                           svn_cancel_func_t cancel_func,
+                           void *cancel_baton,
+                           apr_pool_t *pool)
+{
+  fs_fs_data_t *ffd = fs->fsap_data;
+  apr_pool_t *iterpool;
+  svn_revnum_t rev;
+
+  if (ffd->format < SVN_FS_FS__MIN_REP_SHARING_FORMAT)
+    {
+      return svn_error_createf(SVN_ERR_FS_REP_SHARING_NOT_SUPPORTED, NULL,
+                               _("FSFS format (%d) too old for rep-sharing; "
+                                 "please upgrade the filesystem."),
+                               ffd->format);
+    }
+
+  if (!ffd->rep_sharing_allowed)
+    {
+      return svn_error_create(SVN_ERR_FS_REP_SHARING_NOT_ALLOWED, NULL,
+                              _("Filesystem does not allow rep-sharing."));
+    }
+
+  /* Do not build rep-cache for revision zero to match
+   * svn_fs_fs__create() behavior. */
+  if (start_rev == SVN_INVALID_REVNUM)
+    start_rev = 1;
+
+  if (end_rev == SVN_INVALID_REVNUM)
+    SVN_ERR(svn_fs_fs__youngest_rev(&end_rev, fs, pool));
+
+  /* Do nothing for empty FS. */
+  if (start_rev > end_rev)
+    {
+      return SVN_NO_ERROR;
+    }
+
+  if (!ffd->rep_cache_db)
+    SVN_ERR(svn_fs_fs__open_rep_cache(fs, pool));
+
+  iterpool = svn_pool_create(pool);
+  for (rev = start_rev; rev <= end_rev; rev++)
+    {
+      svn_fs_id_t *root_id;
+      svn_fs_fs__revision_file_t *file;
+      svn_error_t *err;
+
+      svn_pool_clear(iterpool);
+
+      if (progress_func)
+        progress_func(rev, progress_baton, iterpool);
+
+      SVN_ERR(svn_fs_fs__open_pack_or_rev_file(&file, fs, rev,
+                                               iterpool, iterpool));
+      SVN_ERR(svn_fs_fs__rev_get_root(&root_id, fs, rev, iterpool, iterpool));
+
+      SVN_ERR(svn_sqlite__begin_transaction(ffd->rep_cache_db));
+      err = reindex_node(fs, root_id, rev, file, cancel_func, cancel_baton, iterpool);
+      SVN_ERR(svn_sqlite__finish_transaction(ffd->rep_cache_db, err));
+
+      SVN_ERR(svn_fs_fs__close_revision_file(file));
+    }
+
+  svn_pool_destroy(iterpool);
+
+  return SVN_NO_ERROR;
+}
diff --git a/subversion/libsvn_fs_fs/fs_fs.h b/subversion/libsvn_fs_fs/fs_fs.h
index f3e356b..b233be1 100644
--- a/subversion/libsvn_fs_fs/fs_fs.h
+++ b/subversion/libsvn_fs_fs/fs_fs.h
@@ -356,4 +356,23 @@ svn_fs_fs__revision_size(apr_off_t *rev_size,
                          svn_revnum_t revision,
                          apr_pool_t *scratch_pool);
 
+/* Add missing entries to the rep-cache on the filesystem FS. Process data
+ * in revisions START_REV through END_REV inclusive. If START_REV is
+ * SVN_INVALID_REVNUM, start at revision 1; if END_REV is SVN_INVALID_REVNUM,
+ * end at the head revision. If the rep-cache does not exist, then create it.
+ *
+ * Indicate progress via the optional PROGRESS_FUNC callback using
+ * PROGRESS_BATON. The optional CANCEL_FUNC will periodically be called with
+ * CANCEL_BATON to allow cancellation. Use POOL for temporary allocations.
+ */
+svn_error_t *
+svn_fs_fs__build_rep_cache(svn_fs_t *fs,
+                           svn_revnum_t start_rev,
+                           svn_revnum_t end_rev,
+                           svn_fs_progress_notify_func_t progress_func,
+                           void *progress_baton,
+                           svn_cancel_func_t cancel_func,
+                           void *cancel_baton,
+                           apr_pool_t *pool);
+
 #endif
diff --git a/subversion/libsvn_fs_fs/low_level.c b/subversion/libsvn_fs_fs/low_level.c
index f57c745..906f47f 100644
--- a/subversion/libsvn_fs_fs/low_level.c
+++ b/subversion/libsvn_fs_fs/low_level.c
@@ -506,7 +506,7 @@ svn_fs_fs__read_changes(apr_array_header_t **changes,
       SVN_ERR(read_change(&change, stream, result_pool, iterpool));
       if (!change)
         break;
- 
+
       APR_ARRAY_PUSH(*changes, change_t*) = change;
     }
   svn_pool_destroy(iterpool);
diff --git a/subversion/libsvn_fs_fs/pack.c b/subversion/libsvn_fs_fs/pack.c
index 7f32f13..c9e2b4d 100644
--- a/subversion/libsvn_fs_fs/pack.c
+++ b/subversion/libsvn_fs_fs/pack.c
@@ -315,12 +315,12 @@ initialize_pack_context(pack_context_t *context,
   context->file_props = apr_array_make(pool, max_items,
                                        sizeof(svn_fs_fs__p2l_entry_t *));
   SVN_ERR(svn_io_open_unique_file3(&context->file_props_file, NULL, temp_dir,
-                                   svn_io_file_del_on_close, 
+                                   svn_io_file_del_on_close,
                                    context->info_pool, pool));
   context->dir_props = apr_array_make(pool, max_items,
                                       sizeof(svn_fs_fs__p2l_entry_t *));
   SVN_ERR(svn_io_open_unique_file3(&context->dir_props_file, NULL, temp_dir,
-                                   svn_io_file_del_on_close, 
+                                   svn_io_file_del_on_close,
                                    context->info_pool, pool));
 
   /* noderev and representation item bucket */
diff --git a/subversion/libsvn_fs_fs/rep-cache-db.h b/subversion/libsvn_fs_fs/rep-cache-db.h
index 3229f96..4cad066 100644
--- a/subversion/libsvn_fs_fs/rep-cache-db.h
+++ b/subversion/libsvn_fs_fs/rep-cache-db.h
@@ -38,7 +38,7 @@
 #define STMT_SET_REP 3
 #define STMT_3_INFO {"STMT_SET_REP", NULL}
 #define STMT_3 \
-  "INSERT OR FAIL INTO rep_cache (hash, revision, offset, size, expanded_size) " \
+  "INSERT OR IGNORE INTO rep_cache (hash, revision, offset, size, expanded_size) " \
   "VALUES (?1, ?2, ?3, ?4, ?5) " \
   ""
 
diff --git a/subversion/libsvn_fs_fs/rep-cache-db.sql b/subversion/libsvn_fs_fs/rep-cache-db.sql
index cd89f35..a700a9d 100644
--- a/subversion/libsvn_fs_fs/rep-cache-db.sql
+++ b/subversion/libsvn_fs_fs/rep-cache-db.sql
@@ -61,7 +61,7 @@ WHERE hash = ?1
 
 -- STMT_SET_REP
 /* Works for both V1 and V2 schemas. */
-INSERT OR FAIL INTO rep_cache (hash, revision, offset, size, expanded_size)
+INSERT OR IGNORE INTO rep_cache (hash, revision, offset, size, expanded_size)
 VALUES (?1, ?2, ?3, ?4, ?5)
 
 -- STMT_GET_REPS_FOR_RANGE
diff --git a/subversion/libsvn_fs_fs/rep-cache.c b/subversion/libsvn_fs_fs/rep-cache.c
index b0b81fa..c51cde3 100644
--- a/subversion/libsvn_fs_fs/rep-cache.c
+++ b/subversion/libsvn_fs_fs/rep-cache.c
@@ -328,7 +328,6 @@ svn_fs_fs__set_rep_reference(svn_fs_t *fs,
 {
   fs_fs_data_t *ffd = fs->fsap_data;
   svn_sqlite__stmt_t *stmt;
-  svn_error_t *err;
   svn_checksum_t checksum;
   checksum.kind = svn_checksum_sha1;
   checksum.digest = rep->sha1_digest;
@@ -351,28 +350,7 @@ svn_fs_fs__set_rep_reference(svn_fs_t *fs,
                             (apr_int64_t) rep->size,
                             (apr_int64_t) rep->expanded_size));
 
-  err = svn_sqlite__insert(NULL, stmt);
-  if (err)
-    {
-      representation_t *old_rep;
-
-      if (err->apr_err != SVN_ERR_SQLITE_CONSTRAINT)
-        return svn_error_trace(err);
-
-      svn_error_clear(err);
-
-      /* Constraint failed so the mapping for SHA1_CHECKSUM->REP
-         should exist.  If so that's cool -- just do nothing.  If not,
-         that's a red flag!  */
-      SVN_ERR(svn_fs_fs__get_rep_reference(&old_rep, fs, &checksum, pool));
-
-      if (!old_rep)
-        {
-          /* Something really odd at this point, we failed to insert the
-             checksum AND failed to read an existing checksum.  Do we need
-             to flag this? */
-        }
-    }
+  SVN_ERR(svn_sqlite__insert(NULL, stmt));
 
   return SVN_NO_ERROR;
 }
diff --git a/subversion/libsvn_fs_fs/revprops.c b/subversion/libsvn_fs_fs/revprops.c
index da11727..bba40ce 100644
--- a/subversion/libsvn_fs_fs/revprops.c
+++ b/subversion/libsvn_fs_fs/revprops.c
@@ -261,7 +261,7 @@ cache_revprops(svn_boolean_t *is_cached,
 }
 
 /* Read the non-packed revprops for revision REV in FS, put them into the
- * revprop cache if PROPULATE_CACHE is set and return them in *PROPERTIES. 
+ * revprop cache if PROPULATE_CACHE is set and return them in *PROPERTIES.
  *
  * If the data could not be read due to an otherwise recoverable error,
  * leave *PROPERTIES unchanged. No error will be returned in that case.
diff --git a/subversion/libsvn_fs_fs/stats.c b/subversion/libsvn_fs_fs/stats.c
index a26a79d..98a421f 100644
--- a/subversion/libsvn_fs_fs/stats.c
+++ b/subversion/libsvn_fs_fs/stats.c
@@ -488,7 +488,7 @@ parse_representation(rep_stats_t **representation,
             }
         }
 
-      svn_sort__array_insert(revision_info->representations, &result, idx);
+      SVN_ERR(svn_sort__array_insert2(revision_info->representations, &result, idx));
     }
 
   *representation = result;
diff --git a/subversion/libsvn_fs_fs/temp_serializer.c b/subversion/libsvn_fs_fs/temp_serializer.c
index f6e9e3a..b4f6b86 100644
--- a/subversion/libsvn_fs_fs/temp_serializer.c
+++ b/subversion/libsvn_fs_fs/temp_serializer.c
@@ -1013,13 +1013,13 @@ slowly_replace_dir_entry(void **data,
         APR_ARRAY_IDX(entries, idx, svn_fs_dirent_t *)
           = replace_baton->new_entry;
       else
-        svn_sort__array_insert(entries, &replace_baton->new_entry, idx);
+        SVN_ERR(svn_sort__array_insert2(entries, &replace_baton->new_entry, idx));
     }
   else
     {
       /* Remove the old ENTRY. */
       if (entry)
-        svn_sort__array_delete(entries, idx, 1);
+        SVN_ERR(svn_sort__array_delete2(entries, idx, 1));
     }
 
   return svn_fs_fs__serialize_dir_entries(data, data_len, dir, pool);
diff --git a/subversion/libsvn_fs_fs/transaction.c b/subversion/libsvn_fs_fs/transaction.c
index eb6fefa..9e1e40c 100644
--- a/subversion/libsvn_fs_fs/transaction.c
+++ b/subversion/libsvn_fs_fs/transaction.c
@@ -587,7 +587,7 @@ unparse_dir_entry(svn_fs_dirent_t *dirent,
                       : sizeof(SVN_FS_FS__KIND_DIR);
   apr_size_t value_len = type_len + id_str->len;
 
-  /* A buffer with sufficient space for 
+  /* A buffer with sufficient space for
    * - both string lines
    * - 4 newlines
    * - 2 lines K/V lines containing a number each
diff --git a/subversion/libsvn_fs_fs/tree.c b/subversion/libsvn_fs_fs/tree.c
index 1fafcfc..764052b 100644
--- a/subversion/libsvn_fs_fs/tree.c
+++ b/subversion/libsvn_fs_fs/tree.c
@@ -4644,7 +4644,7 @@ make_txn_root(svn_fs_root_t **root_p,
                                       svn_fs_fs__dag_deserialize,
                                       APR_HASH_KEY_STRING,
                                       32, 20, FALSE,
-                                      apr_pstrcat(pool, txn, ":TXN",
+                                      apr_pstrcat(pool, root->txn, ":TXN",
                                                   SVN_VA_NULL),
                                       root->pool));
 
diff --git a/subversion/libsvn_fs_x/cached_data.c b/subversion/libsvn_fs_x/cached_data.c
index 909842e..c9bca2f 100644
--- a/subversion/libsvn_fs_x/cached_data.c
+++ b/subversion/libsvn_fs_x/cached_data.c
@@ -2229,7 +2229,7 @@ svn_fs_x__get_contents_from_file(svn_stream_t **contents_p,
                              rb->filehandle_pool, rb->scratch_pool));
 
       /* Insert the access to REP as the first element of the delta chain. */
-      svn_sort__array_insert(rb->rs_list, &rs, 0);
+      SVN_ERR(svn_sort__array_insert2(rb->rs_list, &rs, 0));
     }
 
   /* Now, the baton is complete and we can assemble the stream around it. */
diff --git a/subversion/libsvn_fs_x/dag_cache.c b/subversion/libsvn_fs_x/dag_cache.c
index a8a3e7a..34a0117 100644
--- a/subversion/libsvn_fs_x/dag_cache.c
+++ b/subversion/libsvn_fs_x/dag_cache.c
@@ -807,7 +807,7 @@ get_copy_inheritance(svn_fs_x__copy_id_inherit_t *inherit_p,
      or if it is a branch point that we are accessing via its original
      copy destination path. */
   svn_fs_x__dag_get_copyroot(&copyroot_rev, &copyroot_path, child->node);
-  SVN_ERR(svn_fs_x__revision_root(&copyroot_root, fs, copyroot_rev, 
+  SVN_ERR(svn_fs_x__revision_root(&copyroot_root, fs, copyroot_rev,
                                   scratch_pool));
   SVN_ERR(svn_fs_x__get_temp_dag_node(&copyroot_node, copyroot_root,
                                       copyroot_path, scratch_pool));
@@ -909,7 +909,7 @@ svn_fs_x__get_dag_path(svn_fs_x__dag_path_t **dag_path_p,
         {
           /* If this was the last path component, and the caller
              said it was optional, then don't return an error;
-             just put a NULL node pointer in the path. 
+             just put a NULL node pointer in the path.
            */
           if ((flags & svn_fs_x__dag_path_last_optional)
               && (path_len == path.len))
diff --git a/subversion/libsvn_fs_x/fs_x.c b/subversion/libsvn_fs_x/fs_x.c
index ba1982f..0959357 100644
--- a/subversion/libsvn_fs_x/fs_x.c
+++ b/subversion/libsvn_fs_x/fs_x.c
@@ -951,7 +951,7 @@ write_revision_zero(svn_fs_t *fs,
 
   SVN_ERR(svn_io_file_open(&apr_file,
                            svn_fs_x__path_revprops(fs, 0, scratch_pool),
-                           APR_WRITE | APR_CREATE, APR_OS_DEFAULT, 
+                           APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
                            scratch_pool));
   SVN_ERR(svn_fs_x__write_non_packed_revprops(apr_file, proplist,
                                               scratch_pool));
diff --git a/subversion/libsvn_fs_x/low_level.c b/subversion/libsvn_fs_x/low_level.c
index 491813a..e4cf4b7 100644
--- a/subversion/libsvn_fs_x/low_level.c
+++ b/subversion/libsvn_fs_x/low_level.c
@@ -998,7 +998,7 @@ svn_fs_x__read_changes(apr_array_header_t **changes,
       SVN_ERR(read_change(&change, stream, result_pool, iterpool));
       if (!change)
         break;
- 
+
       APR_ARRAY_PUSH(*changes, svn_fs_x__change_t*) = change;
     }
   svn_pool_destroy(iterpool);
diff --git a/subversion/libsvn_fs_x/revprops.c b/subversion/libsvn_fs_x/revprops.c
index f98c044..4b38fce 100644
--- a/subversion/libsvn_fs_x/revprops.c
+++ b/subversion/libsvn_fs_x/revprops.c
@@ -449,7 +449,7 @@ verify_checksum(svn_stringbuf_t *content,
                        content->len, scratch_pool));
 
   if (!svn_checksum_match(actual, expected))
-    SVN_ERR(svn_checksum_mismatch_err(expected, actual, scratch_pool, 
+    SVN_ERR(svn_checksum_mismatch_err(expected, actual, scratch_pool,
                                       "checksum mismatch"));
 
   return SVN_NO_ERROR;
@@ -1203,7 +1203,7 @@ repack_file_open(apr_file_t **file,
   if (revprops->entry.start_rev == start_rev)
     APR_ARRAY_IDX(revprops->manifest, idx, manifest_entry_t) = new_entry;
   else
-    svn_sort__array_insert(revprops->manifest, &new_path, idx + 1);
+    SVN_ERR(svn_sort__array_insert2(revprops->manifest, &new_path, idx + 1));
 
   /* open the file */
   new_path = get_revprop_pack_filepath(revprops, &new_entry, scratch_pool);
@@ -1424,7 +1424,7 @@ svn_fs_x__set_revision_proplist(svn_fs_t *fs,
                                  scratch_pool));
   else
     SVN_ERR(write_non_packed_revprop(&final_path, &tmp_path,
-                                     fs, rev, proplist, batch, 
+                                     fs, rev, proplist, batch,
                                      scratch_pool, scratch_pool));
 
   /* We use the rev file of this revision as the perms reference,
diff --git a/subversion/libsvn_fs_x/temp_serializer.c b/subversion/libsvn_fs_x/temp_serializer.c
index efabf1b..b1aaa2b 100644
--- a/subversion/libsvn_fs_x/temp_serializer.c
+++ b/subversion/libsvn_fs_x/temp_serializer.c
@@ -925,13 +925,13 @@ slowly_replace_dir_entry(void **data,
         APR_ARRAY_IDX(entries, idx, svn_fs_x__dirent_t *)
           = replace_baton->new_entry;
       else
-        svn_sort__array_insert(entries, &replace_baton->new_entry, idx);
+        SVN_ERR(svn_sort__array_insert2(entries, &replace_baton->new_entry, idx));
     }
   else
     {
       /* Remove the old ENTRY. */
       if (entry)
-        svn_sort__array_delete(entries, idx, 1);
+        SVN_ERR(svn_sort__array_delete2(entries, idx, 1));
     }
 
   return svn_fs_x__serialize_dir_entries(data, data_len, dir, pool);
diff --git a/subversion/libsvn_fs_x/transaction.c b/subversion/libsvn_fs_x/transaction.c
index ff05d62..b54caf4 100644
--- a/subversion/libsvn_fs_x/transaction.c
+++ b/subversion/libsvn_fs_x/transaction.c
@@ -881,7 +881,7 @@ unparse_dir_entry(svn_fs_x__dirent_t *dirent,
   apr_size_t to_write;
   apr_size_t name_len = strlen(dirent->name);
 
-  /* A buffer with sufficient space for 
+  /* A buffer with sufficient space for
    * - entry name + 1 terminating NUL
    * - 1 byte for the node kind
    * - 2 numbers in 7b/8b encoding for the noderev-id
diff --git a/subversion/libsvn_fs_x/verify.c b/subversion/libsvn_fs_x/verify.c
index 6f03201..c1351ba 100644
--- a/subversion/libsvn_fs_x/verify.c
+++ b/subversion/libsvn_fs_x/verify.c
@@ -179,7 +179,7 @@ verify_index_checksum(svn_fs_x__revision_file_t *file,
 
       SVN_ERR(svn_fs_x__rev_file_name(&file_name, file, scratch_pool));
       SVN_ERR(svn_checksum_mismatch_err(index_info->checksum, actual,
-                                        scratch_pool, 
+                                        scratch_pool,
                                         _("%s checksum mismatch in file %s"),
                                         name, file_name));
     }
diff --git a/subversion/libsvn_ra/compat.c b/subversion/libsvn_ra/compat.c
index f7307bf..aba1c78 100644
--- a/subversion/libsvn_ra/compat.c
+++ b/subversion/libsvn_ra/compat.c
@@ -942,7 +942,7 @@ svn_ra__get_inherited_props_walk(svn_ra_session_t *session,
                                                          parent_url,
                                                          result_pool);
           new_iprop->prop_hash = final_hash;
-          svn_sort__array_insert(*inherited_props, &new_iprop, 0);
+          SVN_ERR(svn_sort__array_insert2(*inherited_props, &new_iprop, 0));
         }
     }
 
diff --git a/subversion/libsvn_ra/deprecated.c b/subversion/libsvn_ra/deprecated.c
index b7e717e..2612be4 100644
--- a/subversion/libsvn_ra/deprecated.c
+++ b/subversion/libsvn_ra/deprecated.c
@@ -151,6 +151,19 @@ static svn_ra_reporter2_t reporter_3in2_wrapper = {
   abort_report
 };
 
+svn_error_t *svn_ra_open4(svn_ra_session_t **session_p,
+                          const char **corrected_url_p,
+                          const char *repos_URL,
+                          const char *uuid,
+                          const svn_ra_callbacks2_t *callbacks,
+                          void *callback_baton,
+                          apr_hash_t *config,
+                          apr_pool_t *pool)
+{
+  return svn_ra_open5(session_p, corrected_url_p, NULL, repos_URL, uuid,
+                      callbacks, callback_baton, config, pool);
+}
+
 svn_error_t *svn_ra_open3(svn_ra_session_t **session_p,
                           const char *repos_URL,
                           const char *uuid,
diff --git a/subversion/libsvn_ra/ra_loader.c b/subversion/libsvn_ra/ra_loader.c
index ac07545..0fc7407 100644
--- a/subversion/libsvn_ra/ra_loader.c
+++ b/subversion/libsvn_ra/ra_loader.c
@@ -256,8 +256,9 @@ svn_ra_create_callbacks(svn_ra_callbacks2_t **callbacks,
   return SVN_NO_ERROR;
 }
 
-svn_error_t *svn_ra_open4(svn_ra_session_t **session_p,
+svn_error_t *svn_ra_open5(svn_ra_session_t **session_p,
                           const char **corrected_url_p,
+                          const char **redirect_url_p,
                           const char *repos_URL,
                           const char *uuid,
                           const svn_ra_callbacks2_t *callbacks,
@@ -381,7 +382,7 @@ svn_error_t *svn_ra_open4(svn_ra_session_t **session_p,
   session->pool = sesspool;
 
   /* Ask the library to open the session. */
-  err = vtable->open_session(session, corrected_url_p,
+  err = vtable->open_session(session, corrected_url_p, redirect_url_p,
                              repos_URL,
                              callbacks, callback_baton, auth_baton,
                              config, sesspool, scratch_pool);
@@ -406,12 +407,14 @@ svn_error_t *svn_ra_open4(svn_ra_session_t **session_p,
     {
       /* *session_p = NULL; */
       *corrected_url_p = apr_pstrdup(pool, *corrected_url_p);
+      if (redirect_url_p && *redirect_url_p)
+        *redirect_url_p = apr_pstrdup(pool, *redirect_url_p);
       svn_pool_destroy(sesspool); /* Includes scratch_pool */
       return SVN_NO_ERROR;
     }
 
   if (vtable->set_svn_ra_open)
-    SVN_ERR(vtable->set_svn_ra_open(session, svn_ra_open4));
+    SVN_ERR(vtable->set_svn_ra_open(session, svn_ra_open5));
 
   /* Check the UUID. */
   if (uuid)
@@ -472,7 +475,7 @@ svn_ra__dup_session(svn_ra_session_t **new_session,
                                            scratch_pool));
 
   if (session->vtable->set_svn_ra_open)
-    SVN_ERR(session->vtable->set_svn_ra_open(session, svn_ra_open4));
+    SVN_ERR(session->vtable->set_svn_ra_open(session, svn_ra_open5));
 
   *new_session = session;
   return SVN_NO_ERROR;
diff --git a/subversion/libsvn_ra/ra_loader.h b/subversion/libsvn_ra/ra_loader.h
index c20b5bf..1cae421 100644
--- a/subversion/libsvn_ra/ra_loader.h
+++ b/subversion/libsvn_ra/ra_loader.h
@@ -42,6 +42,7 @@ extern "C" {
    handed to the ra api to allow opening other ra sessions. */
 typedef svn_error_t * (*svn_ra__open_func_t)(svn_ra_session_t **session_p,
                                               const char **corrected_url,
+                                              const char **redirect_url,
                                               const char *repos_URL,
                                               const char *uuid,
                                               const svn_ra_callbacks2_t *callbacks,
@@ -64,11 +65,12 @@ typedef struct svn_ra__vtable_t {
 
   /* Implementations of the public API functions. */
 
-  /* See svn_ra_open4(). */
+  /* See svn_ra_open5(). */
   /* All fields in SESSION, except priv, have been initialized by the
      time this is called.  SESSION->priv may be set by this function. */
   svn_error_t *(*open_session)(svn_ra_session_t *session,
                                const char **corrected_url,
+                               const char **redirect_url,
                                const char *session_URL,
                                const svn_ra_callbacks2_t *callbacks,
                                void *callback_baton,
diff --git a/subversion/libsvn_ra/wrapper_template.h b/subversion/libsvn_ra/wrapper_template.h
index 0585ded..a74dbf1 100644
--- a/subversion/libsvn_ra/wrapper_template.h
+++ b/subversion/libsvn_ra/wrapper_template.h
@@ -90,7 +90,7 @@ static svn_error_t *compat_open(void **session_baton,
   callbacks2->progress_func = NULL;
   callbacks2->progress_baton = NULL;
 
-  SVN_ERR(VTBL.open_session(sess, &session_url, repos_URL,
+  SVN_ERR(VTBL.open_session(sess, &session_url, NULL, repos_URL,
                             callbacks2, callback_baton,
                             callbacks ? callbacks->auth_baton : NULL,
                             config, sesspool, sesspool));
diff --git a/subversion/libsvn_ra_local/ra_plugin.c b/subversion/libsvn_ra_local/ra_plugin.c
index 7bff85f..8dcb3a9 100644
--- a/subversion/libsvn_ra_local/ra_plugin.c
+++ b/subversion/libsvn_ra_local/ra_plugin.c
@@ -554,6 +554,7 @@ ignore_warnings(void *baton,
 static svn_error_t *
 svn_ra_local__open(svn_ra_session_t *session,
                    const char **corrected_url,
+                   const char **redirect_url,
                    const char *repos_URL,
                    const svn_ra_callbacks2_t *callbacks,
                    void *callback_baton,
@@ -576,6 +577,8 @@ svn_ra_local__open(svn_ra_session_t *session,
   /* We don't support redirections in ra-local. */
   if (corrected_url)
     *corrected_url = NULL;
+  if (redirect_url)
+    *redirect_url = NULL;
 
   /* Allocate and stash the session_sess args we have already. */
   sess = apr_pcalloc(pool, sizeof(*sess));
diff --git a/subversion/libsvn_ra_serf/inherited_props.c b/subversion/libsvn_ra_serf/inherited_props.c
index 6edafb1..f4e9e5e 100644
--- a/subversion/libsvn_ra_serf/inherited_props.c
+++ b/subversion/libsvn_ra_serf/inherited_props.c
@@ -340,7 +340,7 @@ get_iprops_via_more_requests(svn_ra_session_t *ra_session,
       new_iprop = apr_palloc(result_pool, sizeof(*new_iprop));
       new_iprop->path_or_url = apr_pstrdup(result_pool, rq->relpath);
       new_iprop->prop_hash = svn_prop_hash_dup(node_props, result_pool);
-      svn_sort__array_insert(*iprops, &new_iprop, 0);
+      SVN_ERR(svn_sort__array_insert2(*iprops, &new_iprop, 0));
     }
 
   return SVN_NO_ERROR;
diff --git a/subversion/libsvn_ra_serf/lock.c b/subversion/libsvn_ra_serf/lock.c
index d303104..a9d5992 100644
--- a/subversion/libsvn_ra_serf/lock.c
+++ b/subversion/libsvn_ra_serf/lock.c
@@ -354,7 +354,7 @@ run_locks(svn_ra_serf__session_t *sess,
               SVN_ERR(cb_err);
 
               waittime_left = sess->timeout;
-              svn_sort__array_delete(lock_ctxs, i, 1);
+              SVN_ERR(svn_sort__array_delete2(lock_ctxs, i, 1));
               i--;
 
               svn_pool_destroy(ctx->pool);
diff --git a/subversion/libsvn_ra_serf/options.c b/subversion/libsvn_ra_serf/options.c
index f368ceb..a3d321a 100644
--- a/subversion/libsvn_ra_serf/options.c
+++ b/subversion/libsvn_ra_serf/options.c
@@ -546,6 +546,7 @@ svn_ra_serf__v1_get_activity_collection(const char **activity_url,
 svn_error_t *
 svn_ra_serf__exchange_capabilities(svn_ra_serf__session_t *serf_sess,
                                    const char **corrected_url,
+                                   const char **redirect_url,
                                    apr_pool_t *result_pool,
                                    apr_pool_t *scratch_pool)
 {
@@ -553,6 +554,8 @@ svn_ra_serf__exchange_capabilities(svn_ra_serf__session_t *serf_sess,
 
   if (corrected_url)
     *corrected_url = NULL;
+  if (redirect_url)
+    *redirect_url = NULL;
 
   /* This routine automatically fills in serf_sess->capabilities */
   SVN_ERR(create_options_req(&opt_ctx, serf_sess, scratch_pool));
@@ -575,7 +578,11 @@ svn_ra_serf__exchange_capabilities(svn_ra_serf__session_t *serf_sess,
         }
       else if (svn_path_is_url(opt_ctx->handler->location))
         {
-          *corrected_url = apr_pstrdup(result_pool, opt_ctx->handler->location);
+          SVN_ERR(svn_uri_canonicalize_safe(corrected_url, NULL,
+              opt_ctx->handler->location, result_pool, scratch_pool));
+          if (redirect_url)
+            *redirect_url = apr_pstrdup(result_pool,
+                                        opt_ctx->handler->location);
         }
       else
         {
@@ -586,9 +593,14 @@ svn_ra_serf__exchange_capabilities(svn_ra_serf__session_t *serf_sess,
              See issue #3775 for details. */
 
           apr_uri_t corrected_URI = serf_sess->session_url;
+          char *absolute_uri;
 
           corrected_URI.path = (char *)corrected_url;
-          *corrected_url = apr_uri_unparse(result_pool, &corrected_URI, 0);
+          absolute_uri = apr_uri_unparse(scratch_pool, &corrected_URI, 0);
+          SVN_ERR(svn_uri_canonicalize_safe(corrected_url, NULL,
+              absolute_uri, result_pool, scratch_pool));
+          if (redirect_url)
+            *redirect_url = apr_pstrdup(result_pool, absolute_uri);
         }
 
       return SVN_NO_ERROR;
@@ -696,7 +708,8 @@ svn_ra_serf__has_capability(svn_ra_session_t *ra_session,
 
   /* If any capability is unknown, they're all unknown, so ask. */
   if (cap_result == NULL)
-    SVN_ERR(svn_ra_serf__exchange_capabilities(serf_sess, NULL, pool, pool));
+    SVN_ERR(svn_ra_serf__exchange_capabilities(serf_sess, NULL, NULL,
+                                               pool, pool));
 
   /* Try again, now that we've fetched the capabilities. */
   cap_result = svn_hash_gets(serf_sess->capabilities, capability);
diff --git a/subversion/libsvn_ra_serf/ra_serf.h b/subversion/libsvn_ra_serf/ra_serf.h
index 9191d07..0135e81 100644
--- a/subversion/libsvn_ra_serf/ra_serf.h
+++ b/subversion/libsvn_ra_serf/ra_serf.h
@@ -1472,6 +1472,7 @@ svn_ra_serf__get_mergeinfo(svn_ra_session_t *ra_session,
 svn_error_t *
 svn_ra_serf__exchange_capabilities(svn_ra_serf__session_t *serf_sess,
                                    const char **corrected_url,
+                                   const char **redirect_url,
                                    apr_pool_t *result_pool,
                                    apr_pool_t *scratch_pool);
 
diff --git a/subversion/libsvn_ra_serf/replay.c b/subversion/libsvn_ra_serf/replay.c
index a8cc398..27b4bdc 100644
--- a/subversion/libsvn_ra_serf/replay.c
+++ b/subversion/libsvn_ra_serf/replay.c
@@ -666,7 +666,7 @@ svn_ra_serf__replay_range(svn_ra_session_t *ra_session,
   apr_pool_t *subpool = svn_pool_create(scratch_pool);
 
   if (session->http20) {
-      /* ### Auch... this doesn't work yet... 
+      /* ### Auch... this doesn't work yet...
 
          This code relies on responses coming in in an exact order, while
          http2 does everything to deliver responses as fast as possible.
diff --git a/subversion/libsvn_ra_serf/serf.c b/subversion/libsvn_ra_serf/serf.c
index 830e5ca..1a79bdc 100644
--- a/subversion/libsvn_ra_serf/serf.c
+++ b/subversion/libsvn_ra_serf/serf.c
@@ -363,7 +363,7 @@ load_config(svn_ra_serf__session_t *session,
     {
       apr_int64_t timeout;
       svn_error_t *err;
-      
+
       err = svn_cstring_strtoi64(&timeout, timeout_str, 0, APR_INT64_MAX, 10);
       if (err)
         return svn_error_createf(SVN_ERR_BAD_CONFIG_VALUE, err,
@@ -476,6 +476,7 @@ get_user_agent_string(apr_pool_t *pool)
 static svn_error_t *
 svn_ra_serf__open(svn_ra_session_t *session,
                   const char **corrected_url,
+                  const char **redirect_url,
                   const char *session_URL,
                   const svn_ra_callbacks2_t *callbacks,
                   void *callback_baton,
@@ -492,6 +493,8 @@ svn_ra_serf__open(svn_ra_session_t *session,
 
   if (corrected_url)
     *corrected_url = NULL;
+  if (redirect_url)
+    *redirect_url = NULL;
 
   serf_sess = apr_pcalloc(result_pool, sizeof(*serf_sess));
   serf_sess->pool = result_pool;
@@ -588,7 +591,7 @@ svn_ra_serf__open(svn_ra_session_t *session,
      Luckily our caller now passes us two pools which handle this case.
    */
 #if defined(SVN_DEBUG) && !SERF_VERSION_AT_LEAST(1,4,0)
-  /* Currently ensured by svn_ra_open4().
+  /* Currently ensured by svn_ra_open5().
      If failing causes segfault in basic_tests.py 48, "basic auth test" */
   SVN_ERR_ASSERT((serf_sess->pool != scratch_pool)
                  && apr_pool_is_ancestor(serf_sess->pool, scratch_pool));
@@ -599,6 +602,7 @@ svn_ra_serf__open(svn_ra_session_t *session,
   serf_sess->conn_latency = -1;
 
   err = svn_ra_serf__exchange_capabilities(serf_sess, corrected_url,
+                                           redirect_url,
                                            result_pool, scratch_pool);
 
   /* serf should produce a usable error code instead of APR_EGENERAL */
diff --git a/subversion/libsvn_ra_svn/client.c b/subversion/libsvn_ra_svn/client.c
index afdd12a..c6e3d77 100644
--- a/subversion/libsvn_ra_svn/client.c
+++ b/subversion/libsvn_ra_svn/client.c
@@ -841,6 +841,7 @@ is_valid_hostinfo(const char *hostinfo)
 
 static svn_error_t *ra_svn_open(svn_ra_session_t *session,
                                 const char **corrected_url,
+                                const char **redirect_url,
                                 const char *url,
                                 const svn_ra_callbacks2_t *callbacks,
                                 void *callback_baton,
@@ -858,6 +859,8 @@ static svn_error_t *ra_svn_open(svn_ra_session_t *session,
   /* We don't support server-prescribed redirections in ra-svn. */
   if (corrected_url)
     *corrected_url = NULL;
+  if (redirect_url)
+    *redirect_url = NULL;
 
   SVN_ERR(parse_url(url, &uri, sess_pool));
 
@@ -913,7 +916,7 @@ static svn_error_t *ra_svn_dup_session(svn_ra_session_t *new_session,
 {
   svn_ra_svn__session_baton_t *old_sess = old_session->priv;
 
-  SVN_ERR(ra_svn_open(new_session, NULL, new_session_url,
+  SVN_ERR(ra_svn_open(new_session, NULL, NULL, new_session_url,
                       old_sess->callbacks, old_sess->callbacks_baton,
                       old_sess->auth_baton, old_sess->config,
                       result_pool, scratch_pool));
diff --git a/subversion/libsvn_ra_svn/editorp.c b/subversion/libsvn_ra_svn/editorp.c
index 10c8a2b..438bbfc 100644
--- a/subversion/libsvn_ra_svn/editorp.c
+++ b/subversion/libsvn_ra_svn/editorp.c
@@ -118,7 +118,7 @@ make_token(char type,
   char buffer[1 + SVN_INT64_BUFFER_SIZE];
   buffer[0] = type;
   len = 1 + svn__ui64toa(&buffer[1], eb->next_token++);
-  
+
   return svn_string_ncreate(buffer, len, pool);
 }
 
diff --git a/subversion/libsvn_repos/authz.c b/subversion/libsvn_repos/authz.c
index 68a87f3..9f8dbc5 100644
--- a/subversion/libsvn_repos/authz.c
+++ b/subversion/libsvn_repos/authz.c
@@ -81,11 +81,11 @@ typedef struct limited_rights_t
    */
   path_access_t access;
 
-  /* Minimal access rights that the user has on this or any other node in 
+  /* Minimal access rights that the user has on this or any other node in
    * the sub-tree.  This does not take inherited rights into account. */
   authz_access_t min_rights;
 
-  /* Maximal access rights that the user has on this or any other node in 
+  /* Maximal access rights that the user has on this or any other node in
    * the sub-tree.  This does not take inherited rights into account. */
   authz_access_t max_rights;
 
@@ -369,7 +369,7 @@ ensure_node_in_array(apr_array_header_t **array,
    * Create one and insert it into the sorted array. */
   entry.node = create_node(segment, result_pool);
   entry.next = NULL;
-  svn_sort__array_insert(*array, &entry, idx);
+  svn_error_clear(svn_sort__array_insert2(*array, &entry, idx));
 
   return entry.node;
 }
@@ -889,7 +889,7 @@ create_user_authz(authz_full_t *authz,
   /* Use a separate sub-pool to keep memory usage tight. */
   apr_pool_t *subpool = svn_pool_create(scratch_pool);
 
-  /* Find all ACLs for REPOSITORY. 
+  /* Find all ACLs for REPOSITORY.
    * Note that repo-specific rules replace global rules,
    * even if they don't apply to the current user. */
   apr_array_header_t *acls = apr_array_make(subpool, authz->acls->nelts,
@@ -947,7 +947,7 @@ create_user_authz(authz_full_t *authz,
   svn_pool_clear(subpool);
   trim_tree(root, NO_SEQUENCE_NUMBER, subpool);
 
-  /* Calculate recursive rights. 
+  /* Calculate recursive rights.
    *
    * This is a bottom-up calculation of the range of access rights
    * specified anywhere in  the respective sub-tree, including the base
@@ -999,7 +999,7 @@ static lookup_state_t *
 create_lookup_state(apr_pool_t *result_pool)
 {
   lookup_state_t *state = apr_pcalloc(result_pool, sizeof(*state));
- 
+
   state->next = apr_array_make(result_pool, 4, sizeof(node_t *));
   state->current = apr_array_make(result_pool, 4, sizeof(node_t *));
 
diff --git a/subversion/libsvn_repos/authz_parse.c b/subversion/libsvn_repos/authz_parse.c
index e2964de..4fb064d 100644
--- a/subversion/libsvn_repos/authz_parse.c
+++ b/subversion/libsvn_repos/authz_parse.c
@@ -569,7 +569,7 @@ parse_rule_path(authz_rule_t *rule,
               || (pattern->len == 2 && pattern->data[1] == '*'))
             {
               /* Process * and **, applying normalization as per
-                 https://wiki.apache.org/subversion/AuthzImprovements. */
+                 https://cwiki.apache.org/confluence/display/SVN/Authz+Improvements. */
 
               authz_rule_segment_t *const prev =
                 (nseg > 1 ? segment - 1 : NULL);
diff --git a/subversion/libsvn_repos/commit.c b/subversion/libsvn_repos/commit.c
index 42d0525..515600d 100644
--- a/subversion/libsvn_repos/commit.c
+++ b/subversion/libsvn_repos/commit.c
@@ -189,7 +189,7 @@ check_out_of_date(struct edit_baton *eb,
   else if (base_rev > created_rev)
     {
       if (base_rev > svn_fs_txn_base_revision(eb->txn))
-        return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL, 
+        return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL,
                                  _("No such revision %ld"),
                                  base_rev);
     }
diff --git a/subversion/libsvn_repos/config_file.c b/subversion/libsvn_repos/config_file.c
index 9187277..4bec766 100644
--- a/subversion/libsvn_repos/config_file.c
+++ b/subversion/libsvn_repos/config_file.c
@@ -342,7 +342,7 @@ svn_repos__create_config_access(svn_repos_t *repos_hint,
   return result;
 }
 
-void 
+void
 svn_repos__destroy_config_access(config_access_t *access)
 {
   svn_pool_destroy(access->pool);
diff --git a/subversion/libsvn_repos/config_file.h b/subversion/libsvn_repos/config_file.h
index 7fce18f..745b637 100644
--- a/subversion/libsvn_repos/config_file.h
+++ b/subversion/libsvn_repos/config_file.h
@@ -48,7 +48,7 @@ svn_repos__create_config_access(svn_repos_t *repos_hint,
                                 apr_pool_t *result_pool);
 
 /* Release all resources allocated while using ACCESS. */
-void 
+void
 svn_repos__destroy_config_access(config_access_t *access);
 
 /* Using ACCESS as a helper object, access the textual configuration at PATH,
diff --git a/subversion/libsvn_repos/dump_editor.c b/subversion/libsvn_repos/dump_editor.c
index fbf0be2..c1ece57 100644
--- a/subversion/libsvn_repos/dump_editor.c
+++ b/subversion/libsvn_repos/dump_editor.c
@@ -61,8 +61,8 @@ normalize_props(apr_hash_t **normal_props,
       svn_pool_clear(iterpool);
 
       SVN_ERR(svn_repos__normalize_prop(&value, NULL, key, value,
-                                        result_pool, iterpool));
-      svn_hash_sets(*normal_props, key, value);
+                                        iterpool, iterpool));
+      svn_hash_sets(*normal_props, key, svn_string_dup(value, result_pool));
     }
   svn_pool_destroy(iterpool);
 
diff --git a/subversion/libsvn_repos/fs-wrap.c b/subversion/libsvn_repos/fs-wrap.c
index f895d5a..c5cecdc 100644
--- a/subversion/libsvn_repos/fs-wrap.c
+++ b/subversion/libsvn_repos/fs-wrap.c
@@ -282,7 +282,7 @@ svn_repos__normalize_prop(const svn_string_t **result_p,
     }
   else
     {
-      *result_p = svn_string_dup(value, result_pool);
+      *result_p = value;
       if (normalized_p)
         *normalized_p = FALSE;
     }
@@ -1106,7 +1106,7 @@ svn_repos_fs_get_inherited_props(apr_array_header_t **inherited_props_p,
                 apr_pstrdup(result_pool, parent_path + 1);
               i_props->prop_hash = parent_properties;
               /* Build the output array in depth-first order. */
-              svn_sort__array_insert(inherited_props, &i_props, 0);
+              SVN_ERR(svn_sort__array_insert2(inherited_props, &i_props, 0));
             }
         }
     }
diff --git a/subversion/libsvn_repos/load-fs-vtable.c b/subversion/libsvn_repos/load-fs-vtable.c
index 6746065..17c0d27 100644
--- a/subversion/libsvn_repos/load-fs-vtable.c
+++ b/subversion/libsvn_repos/load-fs-vtable.c
@@ -155,9 +155,11 @@ get_revision_mapping(apr_hash_t *rev_map,
 }
 
 
-/* Change revision property NAME to VALUE for REVISION in REPOS.  If
-   VALIDATE_PROPS is set, use functions which perform validation of
-   the property value.  Otherwise, bypass those checks. */
+/* Change revision property NAME to VALUE for REVISION in REPOS.
+   If NORMALIZE_PROPS is set, attempt to normalize properties before
+   changing them, if that is needed.  If VALIDATE_PROPS is set, use
+   functions which perform validation of the property value.
+   Otherwise, bypass those checks. */
 static svn_error_t *
 change_rev_prop(svn_repos_t *repos,
                 svn_revnum_t revision,
@@ -179,17 +181,23 @@ change_rev_prop(svn_repos_t *repos,
                                    NULL, value, pool);
 }
 
-/* Change property NAME to VALUE for PATH in TXN_ROOT.  If
-   VALIDATE_PROPS is set, use functions which perform validation of
-   the property value.  Otherwise, bypass those checks. */
+/* Change property NAME to VALUE for PATH in TXN_ROOT.
+   If NORMALIZE_PROPS is set, attempt to normalize properties before
+   changing them, if that is needed.  If VALIDATE_PROPS is set, use
+   functions which perform validation of the property value.
+   Otherwise, bypass those checks. */
 static svn_error_t *
 change_node_prop(svn_fs_root_t *txn_root,
                  const char *path,
                  const char *name,
                  const svn_string_t *value,
                  svn_boolean_t validate_props,
+                 svn_boolean_t normalize_props,
                  apr_pool_t *pool)
 {
+  if (normalize_props)
+    SVN_ERR(svn_repos__normalize_prop(&value, NULL, name, value, pool, pool));
+
   if (validate_props)
     return svn_repos_fs_change_node_prop(txn_root, path, name, value, pool);
   else
@@ -874,7 +882,8 @@ set_node_property(void *baton,
     }
 
   return change_node_prop(rb->txn_root, nb->path, name, value,
-                          pb->validate_props, nb->pool);
+                          pb->validate_props, rb->pb->normalize_props,
+                          nb->pool);
 }
 
 
@@ -890,7 +899,8 @@ delete_node_property(void *baton,
     return SVN_NO_ERROR;
 
   return change_node_prop(rb->txn_root, nb->path, name, NULL,
-                          rb->pb->validate_props, nb->pool);
+                          rb->pb->validate_props, rb->pb->normalize_props,
+                          nb->pool);
 }
 
 
@@ -914,7 +924,8 @@ remove_node_props(void *baton)
       const char *key = apr_hash_this_key(hi);
 
       SVN_ERR(change_node_prop(rb->txn_root, nb->path, key, NULL,
-                               rb->pb->validate_props, nb->pool));
+                               rb->pb->validate_props, rb->pb->normalize_props,
+                               nb->pool));
     }
 
   return SVN_NO_ERROR;
@@ -1410,7 +1421,7 @@ revprops_close_revision(void *baton)
  * both of these values are #SVN_INVALID_REVNUM (in  which case no
  * revision-based filtering occurs at all), or both are valid revisions
  * (where START_REV is older than or equivalent to END_REV).
- * 
+ *
  * START_REV and END_REV act as filters, the lower and upper (inclusive)
  * range values of revisions which will
  * be loaded.  Either both of these values are #SVN_INVALID_REVNUM (in
diff --git a/subversion/libsvn_repos/log.c b/subversion/libsvn_repos/log.c
index 5db5028..d9a1fb1 100644
--- a/subversion/libsvn_repos/log.c
+++ b/subversion/libsvn_repos/log.c
@@ -655,7 +655,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catalog_t *deleted_mergeinfo_catalog,
      because that greatly influences the costs for log processing.
      So, it is faster to iterate over the changes twice - in the worst
      case b/c most times there is no m/i at all and we exit out early
-     without any overhead. 
+     without any overhead.
    */
   while (change && (!any_mergeinfo || !any_copy))
     {
@@ -1227,7 +1227,7 @@ typedef struct interesting_merge_baton_t
   void *inner_baton;
 } interesting_merge_baton_t;
 
-/* Implements svn_repos_path_change_receiver_t. 
+/* Implements svn_repos_path_change_receiver_t.
  * *BATON is a interesting_merge_baton_t.
  *
  * If BATON->REV a merged revision that is not already part of
diff --git a/subversion/libsvn_repos/replay.c b/subversion/libsvn_repos/replay.c
index d8fb70d..4c82569 100644
--- a/subversion/libsvn_repos/replay.c
+++ b/subversion/libsvn_repos/replay.c
@@ -891,7 +891,7 @@ get_relevant_changes(apr_hash_t **changed_paths,
             }
 
           /* If the base_path doesn't match the top directory of this path
-             we don't want anything to do with it... 
+             we don't want anything to do with it...
              ...unless this was a change to one of the parent directories of
              base_path. */
           if (   svn_relpath_skip_ancestor(base_relpath, path)
diff --git a/subversion/libsvn_repos/repos.c b/subversion/libsvn_repos/repos.c
index 73f4022..df87652 100644
--- a/subversion/libsvn_repos/repos.c
+++ b/subversion/libsvn_repos/repos.c
@@ -1191,7 +1191,7 @@ svn_repos_create(svn_repos_t **repos_p,
   if ((err = svn_fs_create2(&repos->fs, repos->db_path, fs_config,
                             result_pool, scratch_pool)))
     {
-      /* If there was an error making the filesytem, e.g. unknown/supported
+      /* If there was an error making the filesystem, e.g. unknown/supported
        * filesystem type.  Clean up after ourselves.  Yes this is safe because
        * create_repos_structure will fail if the path existed before we started
        * so we can't accidentally remove a directory that previously existed.
diff --git a/subversion/libsvn_subr/cmdline.c b/subversion/libsvn_subr/cmdline.c
index 2255952..d1aad71 100644
--- a/subversion/libsvn_subr/cmdline.c
+++ b/subversion/libsvn_subr/cmdline.c
@@ -39,6 +39,7 @@
 
 #include <apr.h>                /* for STDIN_FILENO */
 #include <apr_errno.h>          /* for apr_strerror */
+#include <apr_escape.h>
 #include <apr_general.h>        /* for apr_initialize/apr_terminate */
 #include <apr_strings.h>        /* for apr_snprintf */
 #include <apr_pools.h>
@@ -1233,7 +1234,7 @@ svn_cmdline__be_interactive(svn_boolean_t non_interactive,
 }
 
 
-/* Helper for the next two functions.  Set *EDITOR to some path to an
+/* Helper for the edit_externally functions.  Set *EDITOR to some path to an
    editor binary.  Sources to search include: the EDITOR_CMD argument
    (if not NULL), $SVN_EDITOR, the runtime CONFIG variable (if CONFIG
    is not NULL), $VISUAL, $EDITOR.  Return
@@ -1299,6 +1300,98 @@ find_editor_binary(const char **editor,
   return SVN_NO_ERROR;
 }
 
+/* Wrapper around apr_pescape_shell() which also escapes whitespace. */
+static const char *
+escape_path(apr_pool_t *pool, const char *orig_path)
+{
+  apr_size_t len, esc_len;
+  apr_status_t status;
+
+  len = strlen(orig_path);
+  esc_len = 0;
+
+  status = apr_escape_shell(NULL, orig_path, len, &esc_len);
+
+  if (status == APR_NOTFOUND)
+    {
+      /* No special characters found by APR, so just surround it in double
+         quotes in case there is whitespace, which APR (as of 1.6.5) doesn't
+         consider special. */
+      return apr_psprintf(pool, "\"%s\"", orig_path);
+    }
+  else
+    {
+#ifdef WIN32
+      const char *p;
+      /* Following the advice from
+         https://docs.microsoft.com/en-us/archive/blogs/twistylittlepassagesallalike/everyone-quotes-command-line-arguments-the-wrong-way
+         1. Surround argument with double-quotes
+         2. Escape backslashes, if they're followed by a double-quote, and double-quotes
+         3. Escape any metacharacter, including double-quotes, with ^ */
+
+      /* Use APR's buffer size as an approximation for how large the escaped
+         string should be, plus 4 bytes for the leading/trailing ^" */
+      svn_stringbuf_t *buf = svn_stringbuf_create_ensure(esc_len + 4, pool);
+      svn_stringbuf_appendcstr(buf, "^\"");
+      for (p = orig_path; *p; p++)
+        {
+          int nr_backslash = 0;
+          while (*p && *p == '\\')
+            {
+              nr_backslash++;
+              p++;
+            }
+
+          if (!*p)
+            /* We've reached the end of the argument, so we need 2n backslash
+               characters.  That will be interpreted as n backslashes and the
+               final double-quote character will be interpreted as the final
+               string delimiter. */
+            svn_stringbuf_appendfill(buf, '\\', nr_backslash * 2);
+          else if (*p == '"')
+            {
+              /* Double-quote as part of the argument means we need to double
+                 any preceeding backslashes and then add one to escape the
+                 double-quote. */
+              svn_stringbuf_appendfill(buf, '\\', nr_backslash * 2 + 1);
+              svn_stringbuf_appendbyte(buf, '^');
+              svn_stringbuf_appendbyte(buf, *p);
+            }
+          else
+            {
+              /* Since there's no double-quote, we just insert any backslashes
+                 literally.  No escaping needed. */
+              svn_stringbuf_appendfill(buf, '\\', nr_backslash);
+              if (strchr("()%!^<>&|", *p))
+                svn_stringbuf_appendbyte(buf, '^');
+              svn_stringbuf_appendbyte(buf, *p);
+            }
+        }
+      svn_stringbuf_appendcstr(buf, "^\"");
+      return buf->data;
+#else
+      char *path, *p, *esc_path;
+
+      /* Account for whitespace, since APR doesn't */
+      for (p = (char *)orig_path; *p; p++)
+        if (strchr(" \t\n\r", *p))
+          esc_len++;
+
+      path = apr_pcalloc(pool, esc_len);
+      apr_escape_shell(path, orig_path, len, NULL);
+
+      p = esc_path = apr_pcalloc(pool, len + esc_len + 1);
+      while (*path)
+        {
+          if (strchr(" \t\n\r", *path))
+            *p++ = '\\';
+          *p++ = *path++;
+        }
+
+      return esc_path;
+#endif
+    }
+}
 
 svn_error_t *
 svn_cmdline__edit_file_externally(const char *path,
@@ -1330,7 +1423,9 @@ svn_cmdline__edit_file_externally(const char *path,
     return svn_error_wrap_apr
       (apr_err, _("Can't change working directory to '%s'"), base_dir);
 
-  cmd = apr_psprintf(pool, "%s %s", editor, file_name);
+  /* editor is explicitly documented as being interpreted by the user's shell,
+     and as such should already be quoted/escaped as needed. */
+  cmd = apr_psprintf(pool, "%s %s", editor, escape_path(pool, file_name));
   sys_err = system(cmd);
 
   apr_err = apr_filepath_set(old_cwd, pool);
@@ -1489,7 +1584,10 @@ svn_cmdline__edit_string_externally(svn_string_t **edited_contents /* UTF-8! */,
   err = svn_utf_cstring_from_utf8(&tmpfile_native, tmpfile_name, pool);
   if (err)
     goto cleanup;
-  cmd = apr_psprintf(pool, "%s %s", editor, tmpfile_native);
+
+  /* editor is explicitly documented as being interpreted by the user's shell,
+     and as such should already be quoted/escaped as needed. */
+  cmd = apr_psprintf(pool, "%s %s", editor, escape_path(pool, tmpfile_native));
 
   /* If the caller wants us to leave the file around, return the path
      of the file we'll use, and make a note not to destroy it.  */
diff --git a/subversion/libsvn_subr/config_keys.inc b/subversion/libsvn_subr/config_keys.inc
index d9f4484..498e704 100644
--- a/subversion/libsvn_subr/config_keys.inc
+++ b/subversion/libsvn_subr/config_keys.inc
@@ -1,4 +1,4 @@
-/* Automatically generated by build/generator/gen_base.pyc:write_config_keys() */
+/* Automatically generated by build/generator/gen_base.py:write_config_keys() */
 
 static const char *svn__valid_config_files[] = {
   SVN_CONFIG_CATEGORY_SERVERS,
diff --git a/subversion/libsvn_subr/gpg_agent.c b/subversion/libsvn_subr/gpg_agent.c
index e851cb0..08d1cfc 100644
--- a/subversion/libsvn_subr/gpg_agent.c
+++ b/subversion/libsvn_subr/gpg_agent.c
@@ -108,7 +108,7 @@ escape_blanks(char *str)
 
 #define is_hex(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'A' && (c) <= 'F'))
 #define hex_to_int(c) ((c) < '9' ? (c) - '0' : (c) - 'A' + 10)
- 
+
 /* Modify STR in-place.  '%', CR and LF are always percent escaped,
    other characters may be percent escaped, always using uppercase
    hex, see https://www.gnupg.org/documentation/manuals/assuan.pdf */
diff --git a/subversion/libsvn_subr/io.c b/subversion/libsvn_subr/io.c
index 9d6db8f..b351c00 100644
--- a/subversion/libsvn_subr/io.c
+++ b/subversion/libsvn_subr/io.c
@@ -1574,7 +1574,7 @@ reown_file(const char *path,
 }
 
 /* Determine what the PERMS for a new file should be by looking at the
-   permissions of a temporary file that we create in DIRECTORY.  
+   permissions of a temporary file that we create in DIRECTORY.
    DIRECTORY can be NULL in which case the system temporary dir is used.
    Unfortunately, umask() as defined in POSIX provides no thread-safe way
    to get at the current value of the umask, so what we're doing here is
diff --git a/subversion/libsvn_subr/iter.c b/subversion/libsvn_subr/iter.c
index ebccb66..6d04846 100644
--- a/subversion/libsvn_subr/iter.c
+++ b/subversion/libsvn_subr/iter.c
@@ -37,7 +37,6 @@ static svn_error_t internal_break_error =
     __LINE__ /* line number */
   };
 
-#if APR_VERSION_AT_LEAST(1, 4, 0)
 struct hash_do_baton
 {
   void *baton;
@@ -59,7 +58,6 @@ int hash_do_callback(void *baton,
 
   return hdb->err == SVN_NO_ERROR;
 }
-#endif
 
 svn_error_t *
 svn_iter_apr_hash(svn_boolean_t *completed,
@@ -68,7 +66,6 @@ svn_iter_apr_hash(svn_boolean_t *completed,
                   void *baton,
                   apr_pool_t *pool)
 {
-#if APR_VERSION_AT_LEAST(1, 4, 0)
   struct hash_do_baton hdb;
   svn_boolean_t error_received;
 
@@ -97,43 +94,6 @@ svn_iter_apr_hash(svn_boolean_t *completed,
     }
 
   return hdb.err;
-#else
-  svn_error_t *err = SVN_NO_ERROR;
-  apr_pool_t *iterpool = svn_pool_create(pool);
-  apr_hash_index_t *hi;
-
-  for (hi = apr_hash_first(pool, hash);
-       ! err && hi; hi = apr_hash_next(hi))
-    {
-      const void *key;
-      void *val;
-      apr_ssize_t len;
-
-      svn_pool_clear(iterpool);
-
-      apr_hash_this(hi, &key, &len, &val);
-      err = (*func)(baton, key, len, val, iterpool);
-    }
-
-  if (completed)
-    *completed = ! err;
-
-  if (err && err->apr_err == SVN_ERR_ITER_BREAK)
-    {
-      if (err != &internal_break_error)
-        /* Errors - except those created by svn_iter_break() -
-           need to be cleared when not further propagated. */
-        svn_error_clear(err);
-
-      err = SVN_NO_ERROR;
-    }
-
-  /* Clear iterpool, because callers may clear the error but have no way
-     to clear the iterpool with potentially lots of allocated memory */
-  svn_pool_destroy(iterpool);
-
-  return err;
-#endif
 }
 
 svn_error_t *
@@ -183,29 +143,3 @@ svn_iter__break(void)
 {
   return &internal_break_error;
 }
-
-#if !APR_VERSION_AT_LEAST(1, 5, 0)
-const void *apr_hash_this_key(apr_hash_index_t *hi)
-{
-  const void *key;
-
-  apr_hash_this((apr_hash_index_t *)hi, &key, NULL, NULL);
-  return key;
-}
-
-apr_ssize_t apr_hash_this_key_len(apr_hash_index_t *hi)
-{
-  apr_ssize_t klen;
-
-  apr_hash_this((apr_hash_index_t *)hi, NULL, &klen, NULL);
-  return klen;
-}
-
-void *apr_hash_this_val(apr_hash_index_t *hi)
-{
-  void *val;
-
-  apr_hash_this((apr_hash_index_t *)hi, NULL, NULL, &val);
-  return val;
-}
-#endif
diff --git a/subversion/libsvn_subr/mergeinfo.c b/subversion/libsvn_subr/mergeinfo.c
index 21fa212..721dc4b 100644
--- a/subversion/libsvn_subr/mergeinfo.c
+++ b/subversion/libsvn_subr/mergeinfo.c
@@ -44,8 +44,9 @@
 /* Return TRUE iff the forward revision range FIRST wholly contains the
  * forward revision range SECOND and (if CONSIDER_INHERITANCE is TRUE) has
  * the same inheritability. */
-static svn_boolean_t
-range_contains(const svn_merge_range_t *first, const svn_merge_range_t *second,
+static svn_error_t *
+range_contains(svn_boolean_t *result,
+               const svn_merge_range_t *first, const svn_merge_range_t *second,
                svn_boolean_t consider_inheritance);
 
 
@@ -457,21 +458,48 @@ combine_with_lastrange(const svn_merge_range_t *new_range,
 }
 
 /* Convert a single svn_merge_range_t *RANGE back into a string.  */
-static char *
-range_to_string(const svn_merge_range_t *range,
+static svn_error_t *
+range_to_string(char **s,
+                const svn_merge_range_t *range,
                 apr_pool_t *pool)
 {
   const char *mark
     = range->inheritable ? "" : SVN_MERGEINFO_NONINHERITABLE_STR;
 
   if (range->start == range->end - 1)
-    return apr_psprintf(pool, "%ld%s", range->end, mark);
+    *s = apr_psprintf(pool, "%ld%s", range->end, mark);
   else if (range->start - 1 == range->end)
-    return apr_psprintf(pool, "-%ld%s", range->start, mark);
+    *s = apr_psprintf(pool, "-%ld%s", range->start, mark);
   else if (range->start < range->end)
-    return apr_psprintf(pool, "%ld-%ld%s", range->start + 1, range->end, mark);
+    *s = apr_psprintf(pool, "%ld-%ld%s", range->start + 1, range->end, mark);
+  else if (range->start > range->end)
+    *s = apr_psprintf(pool, "%ld-%ld%s", range->start, range->end + 1, mark);
   else
-    return apr_psprintf(pool, "%ld-%ld%s", range->start, range->end + 1, mark);
+    {
+      return svn_error_createf(SVN_ERR_ASSERTION_FAIL, NULL,
+                               _("bad range {start=%ld,end=%ld,inheritable=%d}"),
+                               range->start, range->end, range->inheritable);
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Convert a single svn_merge_range_t *RANGE back into a string.  */
+static char *
+range_to_string_debug(const svn_merge_range_t *range,
+                      apr_pool_t *pool)
+{
+  svn_error_t *err;
+  char *s;
+
+  err = range_to_string(&s, range, pool);
+  if (err)
+    {
+      svn_error_clear(err);
+      s = apr_psprintf(pool, _("bad range {start=%ld,end=%ld,inheritable=%d}"),
+                       range->start, range->end, range->inheritable);
+    }
+  return s;
 }
 
 /* Helper for svn_mergeinfo_parse()
@@ -667,10 +695,10 @@ svn_rangelist__canonicalize(svn_rangelist_t *rangelist,
                                          "revision ranges '%s' and '%s' "
                                          "with different inheritance "
                                          "types"),
-                                       range_to_string(lastrange,
-                                                       scratch_pool),
-                                       range_to_string(range,
-                                                       scratch_pool));
+                                       range_to_string_debug(lastrange,
+                                                             scratch_pool),
+                                       range_to_string_debug(range,
+                                                             scratch_pool));
             }
 
           /* Combine overlapping or adjacent ranges with the
@@ -678,7 +706,7 @@ svn_rangelist__canonicalize(svn_rangelist_t *rangelist,
           if (lastrange->inheritable == range->inheritable)
             {
               lastrange->end = MAX(range->end, lastrange->end);
-              svn_sort__array_delete(rangelist, i, 1);
+              SVN_ERR(svn_sort__array_delete2(rangelist, i, 1));
               i--;
             }
         }
@@ -788,490 +816,349 @@ svn_mergeinfo_parse(svn_mergeinfo_t *mergeinfo,
   return err;
 }
 
-/* Cleanup after svn_rangelist_merge2 when it modifies the ending range of
-   a single rangelist element in-place.
-
-   If *RANGE_INDEX is not a valid element in RANGELIST do nothing.  Otherwise
-   ensure that RANGELIST[*RANGE_INDEX]->END does not adjoin or overlap any
-   subsequent ranges in RANGELIST.
-
-   If overlap is found, then remove, modify, and/or add elements to RANGELIST
-   as per the invariants for rangelists documented in svn_mergeinfo.h.  If
-   RANGELIST[*RANGE_INDEX]->END adjoins a subsequent element then combine the
-   elements if their inheritability permits -- The inheritance of intersecting
-   and adjoining ranges is handled as per svn_mergeinfo_merge2.  Upon return
-   set *RANGE_INDEX to the index of the youngest element modified, added, or
-   adjoined to RANGELIST[*RANGE_INDEX].
+static const char *
+rangelist_to_string_debug(const svn_rangelist_t *rl,
+                          apr_pool_t *pool)
+{
+  svn_string_t *rls;
+  svn_error_t *err;
 
-   Note: Adjoining rangelist elements are those where the end rev of the older
-   element is equal to the start rev of the younger element.
+  err = svn_rangelist_to_string(&rls, rl, pool);
+  if (err)
+    {
+      char *s = apr_psprintf(pool, _("<bad rangelist [%d ranges]: %s>"),
+                             rl->nelts, err->message);
+      svn_error_clear(err);
+      return s;
+    }
+  return rls->data;
+}
 
-   Any new elements inserted into RANGELIST are allocated in  RESULT_POOL.*/
-static void
-adjust_remaining_ranges(svn_rangelist_t *rangelist,
-                        int *range_index,
-                        apr_pool_t *result_pool)
+static svn_boolean_t
+rangelist_is_sorted(const svn_rangelist_t *rangelist)
 {
   int i;
-  int starting_index;
-  int elements_to_delete = 0;
-  svn_merge_range_t *modified_range;
 
-  if (*range_index >= rangelist->nelts)
-    return;
+  for (i = 1; i < rangelist->nelts; i++)
+    {
+      const svn_merge_range_t *lastrange
+        = APR_ARRAY_IDX(rangelist, i-1, svn_merge_range_t *);
+      const svn_merge_range_t *thisrange
+        = APR_ARRAY_IDX(rangelist, i, svn_merge_range_t *);
 
-  starting_index = *range_index + 1;
-  modified_range = APR_ARRAY_IDX(rangelist, *range_index, svn_merge_range_t *);
+      if (svn_sort_compare_ranges(&lastrange, &thisrange) > 0)
+        return FALSE;
+    }
+  return TRUE;
+}
 
-  for (i = *range_index + 1; i < rangelist->nelts; i++)
-    {
-      svn_merge_range_t *next_range = APR_ARRAY_IDX(rangelist, i,
-                                                    svn_merge_range_t *);
+/* Mergeinfo inheritance or absence in a rangelist interval */
+enum rangelist_interval_kind_t { MI_NONE, MI_NON_INHERITABLE, MI_INHERITABLE };
 
-      /* If MODIFIED_RANGE doesn't adjoin or overlap the next range in
-         RANGELIST then we are finished. */
-      if (modified_range->end < next_range->start)
-        break;
+/* A rangelist interval: like svn_merge_range_t but an interval can represent
+ * a gap in the rangelist (kind = MI_NONE). */
+typedef struct rangelist_interval_t
+{
+  svn_revnum_t start, end;
+  enum rangelist_interval_kind_t kind;
+} rangelist_interval_t;
+
+/* Iterator for intervals in a rangelist. */
+typedef struct rangelist_interval_iterator_t {
+  /* iteration state: */
+  const svn_rangelist_t *rl;  /* input */
+  int i;  /* current interval is this range in RL or the gap before it */
+  svn_boolean_t in_range;  /* current interval is range RL[I], not a gap? */
+
+  /* current interval: */
+  rangelist_interval_t interval;
+} rangelist_interval_iterator_t;
+
+/* Update IT->interval to match the current iteration state of IT.
+ * Return the iterator, or NULL if the iteration has reached its end.
+ */
+static rangelist_interval_iterator_t *
+rlii_update(rangelist_interval_iterator_t *it)
+{
+  const svn_merge_range_t *range
+    = (it->i < it->rl->nelts
+       ? APR_ARRAY_IDX(it->rl, it->i, void *) : NULL);
 
-      /* Does MODIFIED_RANGE adjoin NEXT_RANGE? */
-      if (modified_range->end == next_range->start)
-        {
-          if (modified_range->inheritable == next_range->inheritable)
-            {
-              /* Combine adjoining ranges with the same inheritability. */
-              modified_range->end = next_range->end;
-              elements_to_delete++;
-            }
-          else
-            {
-              /* Cannot join because inheritance differs. */
-              (*range_index)++;
-            }
-          break;
-        }
+  if (!range)
+    return NULL;
 
-      /* Alright, we know MODIFIED_RANGE overlaps NEXT_RANGE, but how? */
-      if (modified_range->end > next_range->end)
-        {
-          /* NEXT_RANGE is a proper subset of MODIFIED_RANGE and the two
-             don't share the same end range. */
-          if (modified_range->inheritable
-              || (modified_range->inheritable == next_range->inheritable))
-            {
-              /* MODIFIED_RANGE absorbs NEXT_RANGE. */
-              elements_to_delete++;
-            }
-          else
-            {
-              /* NEXT_RANGE is a proper subset MODIFIED_RANGE but
-                 MODIFIED_RANGE is non-inheritable and NEXT_RANGE is
-                 inheritable.  This means MODIFIED_RANGE is truncated,
-                 NEXT_RANGE remains, and the portion of MODIFIED_RANGE
-                 younger than NEXT_RANGE is added as a separate range:
-                  ______________________________________________
-                 |                                              |
-                 M                 MODIFIED_RANGE               N
-                 |                 (!inheritable)               |
-                 |______________________________________________|
-                                  |              |
-                                  O  NEXT_RANGE  P
-                                  | (inheritable)|
-                                  |______________|
-                                         |
-                                         V
-                  _______________________________________________
-                 |                |              |               |
-                 M MODIFIED_RANGE O  NEXT_RANGE  P   NEW_RANGE   N
-                 | (!inheritable) | (inheritable)| (!inheritable)|
-                 |________________|______________|_______________|
-              */
-              svn_merge_range_t *new_modified_range =
-                apr_palloc(result_pool, sizeof(*new_modified_range));
-              new_modified_range->start = next_range->end;
-              new_modified_range->end = modified_range->end;
-              new_modified_range->inheritable = FALSE;
-              modified_range->end = next_range->start;
-              (*range_index) += 2 + elements_to_delete;
-              svn_sort__array_insert(rangelist, &new_modified_range,
-                                     *range_index);
-              /* Recurse with the new range. */
-              adjust_remaining_ranges(rangelist, range_index, result_pool);
-              break;
-            }
-        }
-      else if (modified_range->end == next_range->end)
-        {
-          /* NEXT_RANGE is a proper subset MODIFIED_RANGE and share
-             the same end range. */
-          if (modified_range->inheritable
-              || (modified_range->inheritable == next_range->inheritable))
-            {
-              /* MODIFIED_RANGE absorbs NEXT_RANGE. */
-              elements_to_delete++;
-            }
-          else
-            {
-              /* The intersection between MODIFIED_RANGE and NEXT_RANGE is
-                 absorbed by the latter. */
-              modified_range->end = next_range->start;
-              (*range_index)++;
-            }
-          break;
-        }
-      else
-        {
-          /* NEXT_RANGE and MODIFIED_RANGE intersect but NEXT_RANGE is not
-             a proper subset of MODIFIED_RANGE, nor do the two share the
-             same end revision, i.e. they overlap. */
-          if (modified_range->inheritable == next_range->inheritable)
-            {
-              /* Combine overlapping ranges with the same inheritability. */
-              modified_range->end = next_range->end;
-              elements_to_delete++;
-            }
-          else if (modified_range->inheritable)
-            {
-              /* MODIFIED_RANGE absorbs the portion of NEXT_RANGE it overlaps
-                 and NEXT_RANGE is truncated. */
-              next_range->start = modified_range->end;
-              (*range_index)++;
-            }
-          else
-            {
-              /* NEXT_RANGE absorbs the portion of MODIFIED_RANGE it overlaps
-                 and MODIFIED_RANGE is truncated. */
-              modified_range->end = next_range->start;
-              (*range_index)++;
-            }
-          break;
-        }
+  if (!it->in_range)
+    {
+      it->interval.start
+        = (it->i > 0
+           ? APR_ARRAY_IDX(it->rl, it->i - 1, svn_merge_range_t *)->end
+           : 0);
+      it->interval.end = range->start;
+      it->interval.kind = MI_NONE;
     }
+  else
+    {
+      it->interval.start = range->start;
+      it->interval.end = range->end;
+      it->interval.kind
+        = (range->inheritable ? MI_INHERITABLE : MI_NON_INHERITABLE);
+    }
+  return it;
+}
 
-  if (elements_to_delete)
-    svn_sort__array_delete(rangelist, starting_index, elements_to_delete);
+/* Move to the next interval, which might be a zero-length interval.
+ * Return IT, or return NULL at the end of iteration. */
+static rangelist_interval_iterator_t *
+rlii_next_any_interval(rangelist_interval_iterator_t *it)
+{
+  /* Should be called before iteration is finished. */
+  if (it->i >= it->rl->nelts)
+    return NULL;
+
+  /* If we are in a range, move to the next pre-range gap;
+   * else, move from this pre-range gap into this range. */
+  if (it->in_range)
+    it->i++;
+  it->in_range = !it->in_range;
+  return it;
 }
 
-#if 0 /* Temporary debug helper code */
-static svn_error_t *
-dual_dump(const char *prefix,
-  const svn_rangelist_t *rangelist,
-  const svn_rangelist_t *changes,
-  apr_pool_t *scratch_pool)
+/* Return an iterator pointing at the first non-zero-length interval in RL,
+ * or NULL if there are none. */
+static rangelist_interval_iterator_t *
+rlii_first(const svn_rangelist_t *rl,
+           apr_pool_t *pool)
 {
-  svn_string_t *rls, *chg;
+  rangelist_interval_iterator_t *it = apr_palloc(pool, sizeof(*it));
 
-  SVN_ERR(svn_rangelist_to_string(&rls, rangelist, scratch_pool));
-  SVN_ERR(svn_rangelist_to_string(&chg, changes, scratch_pool));
+  it->rl = rl;
+  it->i = 0;
+  it->in_range = FALSE;
 
-  SVN_DBG(("%s: %s / %s", prefix, rls->data, chg->data));
-  return SVN_NO_ERROR;
+  /* Update, and skip empty intervals */
+  while ((it = rlii_update(it)) && it->interval.start == it->interval.end)
+    {
+      it = rlii_next_any_interval(it);
+    }
+  return it;
 }
-#endif
 
-svn_error_t *
-svn_rangelist_merge2(svn_rangelist_t *rangelist,
-                     const svn_rangelist_t *chg,
-                     apr_pool_t *result_pool,
-                     apr_pool_t *scratch_pool)
+/* Move to the next non-empty interval.
+ * Intervals will be generated in this sequence:
+ *  (0,               MI_NONE,  RL[0]->start),  // i=0, !in_range
+ *  (RL[0]->start,    MI_*      RL[0]->end),    // i=0, in_range
+ *  (RL[0]->end,      MI_NONE,  RL[1]->start),
+ *  (RL[1]->start,    MI_*      RL[1]->end),
+ *  ...
+ *  (RL[n-2]->end,    MI_NONE,  RL[n-1]->start),
+ *  (RL[n-1]->start,  MI_*      RL[n-1]->end),
+ * but excluding empty intervals.
+ * Return IT, or return NULL at the end of iteration. */
+static rangelist_interval_iterator_t *
+rlii_next(rangelist_interval_iterator_t *it)
 {
-  svn_rangelist_t *changes;
-  int i = 0;
-  int j;
-
-  SVN_ERR(svn_rangelist__canonicalize(rangelist, scratch_pool));
+  it = rlii_next_any_interval(it);
 
-  /* We may modify CHANGES, so make a copy in SCRATCH_POOL. */
-  changes = svn_rangelist_dup(chg, scratch_pool);
-  SVN_ERR(svn_rangelist__canonicalize(changes, scratch_pool));
-
-  for (j = 0; j < changes->nelts; j++)
+  /* Update, and skip empty intervals */
+  while ((it = rlii_update(it)) && it->interval.start == it->interval.end)
     {
-      svn_merge_range_t *range;
-      svn_merge_range_t *change =
-        APR_ARRAY_IDX(changes, j, svn_merge_range_t *);
-      int res;
-
-      range = (i < rangelist->nelts)
-              ? APR_ARRAY_IDX(rangelist, i, svn_merge_range_t *)
-              : NULL;
+      it = rlii_next_any_interval(it);
+    }
+  return it;
+}
 
-      if (!range || change->end < range->start)
-        {
-          /* No overlap, nor adjoin, copy change to result range */
-          svn_merge_range_t *chg_copy = svn_merge_range_dup(change,
-                                                            result_pool);
-          svn_sort__array_insert(rangelist, &chg_copy, i++);
-          continue;
-        }
-      else if ((change->start > range->end)
-               || (change->start == range->end
-                   && change->inheritable != range->inheritable))
-        {
-          /* No overlap, nor adjoin. Check next range item against change */
-          i++;
-          j--;
-          continue;
-        }
+/* Rangelist builder. Accumulates consecutive intervals, combining them
+ * when possible. */
+typedef struct rangelist_builder_t {
+  svn_rangelist_t *rl;  /* rangelist to build */
+  rangelist_interval_t accu_interval;  /* current interval accumulator */
+  apr_pool_t *pool;  /* from which to allocate ranges */
+} rangelist_builder_t;
+
+/* Return an initialized rangelist builder. */
+static rangelist_builder_t *
+rl_builder_new(svn_rangelist_t *rl,
+               apr_pool_t *pool)
+{
+  rangelist_builder_t *b = apr_pcalloc(pool, sizeof(*b));
 
-      if (change->start < range->start
-          && range->inheritable != change->inheritable
-          && ! (change->inheritable && range_contains(change, range, FALSE))
-          && ! (range->inheritable && range_contains(range, change, FALSE)))
-        {
-          /* Can't fold change into existing range.
-             Insert new range before range */
+  b->rl = rl;
+  /* b->accu_interval = {0, 0, RL_NONE} */
+  b->pool = pool;
+  return b;
+}
 
-          svn_merge_range_t *chg_copy = svn_merge_range_dup(change,
-                                                            result_pool);
+/* Flush the last accumulated interval in the rangelist builder B. */
+static void
+rl_builder_flush(rangelist_builder_t *b)
+{
+  if (b->accu_interval.kind > MI_NONE)
+    {
+      svn_merge_range_t *mrange = apr_pcalloc(b->pool, sizeof(*mrange));
+      mrange->start = b->accu_interval.start;
+      mrange->end = b->accu_interval.end;
+      mrange->inheritable = (b->accu_interval.kind == MI_INHERITABLE);
+      APR_ARRAY_PUSH(b->rl, svn_merge_range_t *) = mrange;
+    }
+}
 
-          chg_copy->start = MIN(change->start, range->start);
-          if (! change->inheritable)
-            chg_copy->end = range->start;
-          else
-            range->start = change->end;
+/* Add a new INTERVAL to the rangelist builder B. */
+static void
+rl_builder_add_interval(rangelist_builder_t *b,
+                        const rangelist_interval_t *interval)
+{
+  SVN_ERR_ASSERT_NO_RETURN(interval->start < interval->end);
+  SVN_ERR_ASSERT_NO_RETURN(interval->start == b->accu_interval.end);
 
-          svn_sort__array_insert(rangelist, &chg_copy, i++);
+  /* Extend the accumulating interval, or end it and start another? */
+  if (interval->kind == b->accu_interval.kind)
+    {
+      b->accu_interval.end = interval->end;
+    }
+  else
+    {
+      /* Push the accumulated interval onto the building rangelist. */
+      rl_builder_flush(b);
+      /* Start accumulating a new interval */
+      b->accu_interval = *interval;
+    }
+}
 
-          change->start = chg_copy->end;
-          if (change->start >= change->end)
-            continue; /* No overlap with range left */
-        }
-      else
-        {
-          range->start = MIN(range->start, change->start);
-        }
+/* Set RL_OUT to the union (merge) of RL1 and RL2.
+ * On entry, RL_OUT must be an empty rangelist.
+ *
+ * Each range added to RL_OUT will be either shallow-copied from RL1 or
+ * allocated from RESULT_POOL.
+ */
+static svn_error_t *
+rangelist_merge(svn_rangelist_t *rl_out,
+                const svn_rangelist_t *rl1,
+                const svn_rangelist_t *rl2,
+                apr_pool_t *result_pool,
+                apr_pool_t *scratch_pool)
+{
+  rangelist_interval_iterator_t *it[2];
+  rangelist_builder_t *rl_builder = rl_builder_new(rl_out, result_pool);
+  svn_revnum_t r_last = 0;
+
+  /*SVN_ERR_ASSERT(svn_rangelist__is_canonical(rl1));*/
+  /*SVN_ERR_ASSERT(svn_rangelist__is_canonical(rl2));*/
+  SVN_ERR_ASSERT(rangelist_is_sorted(rl1));
+  SVN_ERR_ASSERT(rangelist_is_sorted(rl2));
+  SVN_ERR_ASSERT(rl_out->nelts == 0);
+
+  /* Initialize the input iterators and the output generator */
+  it[0] = rlii_first(rl1, scratch_pool);
+  it[1] = rlii_first(rl2, scratch_pool);
+
+  /* Keep choosing the next input revision (whether a start or end of a range)
+   * at which to consider making an output transition. */
+  while (it[0] || it[1])
+    {
+      svn_revnum_t r_next = !it[1] ? it[0]->interval.end
+                            : !it[0] ? it[1]->interval.end
+                            : MIN(it[0]->interval.end, it[1]->interval.end);
+      rangelist_interval_t interval;
+
+      interval.start = r_last;
+      interval.end = r_next;
+      interval.kind = !it[1] ? it[0]->interval.kind
+                       : !it[0] ? it[1]->interval.kind
+                       : MAX(it[0]->interval.kind, it[1]->interval.kind);
+
+      /* Accumulate */
+      SVN_ERR_ASSERT(interval.start < interval.end);
+      rl_builder_add_interval(rl_builder, &interval);
+
+      /* if we have used up either or both input intervals, increment them */
+      if (it[0] && it[0]->interval.end <= r_next)
+        it[0] = rlii_next(it[0]);
+      if (it[1] && it[1]->interval.end <= r_next)
+        it[1] = rlii_next(it[1]);
+
+      r_last = interval.end;
+    }
+  rl_builder_flush(rl_builder);
+  return SVN_NO_ERROR;
+}
 
-      SVN_ERR_ASSERT(change->start >= range->start);
+svn_error_t *
+svn_rangelist_merge2(svn_rangelist_t *rangelist,
+                     const svn_rangelist_t *chg,
+                     apr_pool_t *result_pool,
+                     apr_pool_t *scratch_pool)
+{
+  svn_error_t *err;
+  svn_rangelist_t *rangelist_orig;
 
-      res = svn_sort_compare_ranges(&range, &change);
+#ifdef SVN_DEBUG
+  SVN_ERR_ASSERT(rangelist_is_sorted(rangelist));
+  SVN_ERR_ASSERT(rangelist_is_sorted(chg));
+#endif
 
-      if (res == 0)
-        {
-          /* Only when merging two non-inheritable ranges is the result also
-             non-inheritable.  In all other cases ensure an inheritable
-             result. */
-          if (range->inheritable || change->inheritable)
-            range->inheritable = TRUE;
-          i++;
-          continue;
-        }
-      else if (res < 0) /* CHANGE is younger than RANGE */
-        {
-          if (range->end == change->start)
-            {
-              /* RANGE and CHANGE adjoin */
-              if (range->inheritable == change->inheritable)
-                {
-                  /* RANGE and CHANGE have the same inheritability so
-                     RANGE expands to absord CHANGE. */
-                  range->end = change->end;
-                  adjust_remaining_ranges(rangelist, &i, result_pool);
-                  continue;
-                }
-              else
-                {
-                  /* RANGE and CHANGE adjoin, but have different
-                     inheritability.  Since RANGE is older, just
-                     move on to the next RANGE. */
-                  SVN_ERR_MALFUNCTION();
-                }
-            }
-          else
-            {
-              /* RANGE and CHANGE overlap, but how? */
-              if ((range->inheritable == change->inheritable)
-                  || range->inheritable)
-                {
-                  /* If CHANGE is a proper subset of RANGE, it absorbs RANGE
-                      with no adjustment otherwise only the intersection is
-                      absorbed and CHANGE is truncated. */
-                  if (range->end >= change->end)
-                    continue;
-                  else
-                    {
-                      change->start = range->end;
-                      j--;
-                      continue;
-                    }
-                }
-              else
-                {
-                  /* RANGE is non-inheritable and CHANGE is inheritable. */
-                  if (range->start < change->start)
-                    {
-                      /* CHANGE absorbs intersection with RANGE and RANGE
-                         is truncated. */
-                      svn_merge_range_t *range_copy =
-                        svn_merge_range_dup(range, result_pool);
-                      range_copy->end = change->start;
-                      range->start = change->start;
-                      svn_sort__array_insert(rangelist, &range_copy, i++);
-                      j--;
-                      continue;
-                    }
-                  else
-                    {
-                      /* CHANGE and RANGE share the same start rev, but
-                         RANGE is considered older because its end rev
-                         is older. */
-                      range->inheritable = TRUE;
-                      change->start = range->end;
-                      j--;
-                      continue;
-                    }
-                }
-            }
-        }
-      else /* res > 0, CHANGE is older than RANGE */
-        {
-          if (change->end == range->start)
-            {
-              /* RANGE and CHANGE adjoin */
-              if (range->inheritable == change->inheritable)
-                {
-                  /* RANGE and CHANGE have the same inheritability so we
-                     can simply combine the two in place. */
-                  range->start = change->start;
-                  continue;
-                }
-              else
-                {
-                  /* RANGE and CHANGE have different inheritability so insert
-                     a copy of CHANGE into RANGELIST. */
-                  SVN_ERR_MALFUNCTION(); /* Already handled */
-                }
-            }
-          else
-            {
-              /* RANGE and CHANGE overlap. */
-              if (range->inheritable == change->inheritable)
-                {
-                  /* RANGE and CHANGE have the same inheritability so we
-                     can simply combine the two in place... */
-                  range->start = change->start;
-                  if (range->end < change->end)
-                    {
-                      /* ...but if RANGE is expanded ensure that we don't
-                         violate any rangelist invariants. */
-                      range->end = change->end;
-                      adjust_remaining_ranges(rangelist, &i, result_pool);
-                    }
-                  continue;
-                }
-              else if (range->inheritable)
-                {
-                  if (change->start < range->start)
-                    {
-                      /* RANGE is inheritable so absorbs any part of CHANGE
-                         it overlaps.  CHANGE is truncated and the remainder
-                         inserted into RANGELIST. */
-                      SVN_ERR_MALFUNCTION(); /* Already handled */
-                    }
-                  else
-                    {
-                      /* CHANGE and RANGE share the same start rev, but
-                         CHANGE is considered older because CHANGE->END is
-                         older than RANGE->END. */
-                      continue;
-                    }
-                }
-              else
-                {
-                  /* RANGE is non-inheritable and CHANGE is inheritable. */
-                  if (change->start < range->start)
-                    {
-                      if (change->end == range->end)
-                        {
-                          /* RANGE is a proper subset of CHANGE and share the
-                             same end revision, so set RANGE equal to CHANGE. */
-                          range->start = change->start;
-                          range->inheritable = TRUE;
-                          continue;
-                        }
-                      else if (change->end > range->end)
-                        {
-                          /* RANGE is a proper subset of CHANGE and CHANGE has
-                             a younger end revision, so set RANGE equal to its
-                             intersection with CHANGE and truncate CHANGE. */
-                          range->start = change->start;
-                          range->inheritable = TRUE;
-                          change->start = range->end;
-                          j--;
-                          continue;
-                        }
-                      else
-                        {
-                          /* CHANGE and RANGE overlap. Set RANGE equal to its
-                             intersection with CHANGE and take the remainder
-                             of RANGE and insert it into RANGELIST. */
-                          svn_merge_range_t *range_copy =
-                            svn_merge_range_dup(range, result_pool);
-                          range_copy->start = change->end;
-                          range->start = change->start;
-                          range->end = change->end;
-                          range->inheritable = TRUE;
-                          svn_sort__array_insert(rangelist, &range_copy, ++i);
-                          continue;
-                        }
-                    }
-                  else
-                    {
-                      /* CHANGE and RANGE share the same start rev, but
-                         CHANGE is considered older because its end rev
-                         is older.
-
-                         Insert the intersection of RANGE and CHANGE into
-                         RANGELIST and then set RANGE to the non-intersecting
-                         portion of RANGE. */
-                      svn_merge_range_t *range_copy =
-                        svn_merge_range_dup(range, result_pool);
-                      range_copy->end = change->end;
-                      range_copy->inheritable = TRUE;
-                      range->start = change->end;
-                      svn_sort__array_insert(rangelist, &range_copy, i++);
-                      continue;
-                    }
-                }
-            }
-        }
-      SVN_ERR_MALFUNCTION(); /* Unreachable */
-    }
+  /* Move the original rangelist aside. A shallow copy suffices,
+   * as rangelist_merge() won't modify its inputs. */
+  rangelist_orig = apr_array_copy(scratch_pool, rangelist);
+  apr_array_clear(rangelist);
+  err = svn_error_trace(rangelist_merge(rangelist, rangelist_orig, chg,
+                                        result_pool, scratch_pool));
 
 #ifdef SVN_DEBUG
-  SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));
+  if (err)
+    {
+      err = svn_error_createf(SVN_ERR_ASSERTION_FAIL, err,
+              "svn_rangelist_merge2( %s / %s ): internal error",
+              rangelist_to_string_debug(rangelist_orig, scratch_pool),
+              rangelist_to_string_debug(chg, scratch_pool));
+    }
+  else if (! svn_rangelist__is_canonical(rangelist)
+           && svn_rangelist__is_canonical(rangelist_orig)
+           && svn_rangelist__is_canonical(chg))
+    {
+      err = svn_error_createf(SVN_ERR_ASSERTION_FAIL, NULL,
+              "svn_rangelist_merge2( %s / %s ): canonical inputs, "
+              "non-canonical result ( %s )",
+              rangelist_to_string_debug(rangelist_orig, scratch_pool),
+              rangelist_to_string_debug(chg, scratch_pool),
+              rangelist_to_string_debug(rangelist, scratch_pool));
+    }
 #endif
 
-  return SVN_NO_ERROR;
+  return err;
 }
 
-/* Return TRUE iff the forward revision ranges FIRST and SECOND overlap and
- * (if CONSIDER_INHERITANCE is TRUE) have the same inheritability. */
-static svn_boolean_t
-range_intersect(const svn_merge_range_t *first, const svn_merge_range_t *second,
+/* Set *RESULT to TRUE iff the forward revision ranges FIRST and SECOND overlap
+ * and (if CONSIDER_INHERITANCE is TRUE) have the same inheritability. */
+static svn_error_t *
+range_intersect(svn_boolean_t *result,
+                const svn_merge_range_t *first, const svn_merge_range_t *second,
                 svn_boolean_t consider_inheritance)
 {
-  SVN_ERR_ASSERT_NO_RETURN(IS_VALID_FORWARD_RANGE(first));
-  SVN_ERR_ASSERT_NO_RETURN(IS_VALID_FORWARD_RANGE(second));
+  SVN_ERR_ASSERT(IS_VALID_FORWARD_RANGE(first));
+  SVN_ERR_ASSERT(IS_VALID_FORWARD_RANGE(second));
 
-  return (first->start + 1 <= second->end)
-    && (second->start + 1 <= first->end)
-    && (!consider_inheritance
-        || (!(first->inheritable) == !(second->inheritable)));
+  *result = (first->start + 1 <= second->end)
+            && (second->start + 1 <= first->end)
+            && (!consider_inheritance
+                || (!(first->inheritable) == !(second->inheritable)));
+  return SVN_NO_ERROR;
 }
 
-/* Return TRUE iff the forward revision range FIRST wholly contains the
+/* Set *RESULT to TRUE iff the forward revision range FIRST wholly contains the
  * forward revision range SECOND and (if CONSIDER_INHERITANCE is TRUE) has
  * the same inheritability. */
-static svn_boolean_t
-range_contains(const svn_merge_range_t *first, const svn_merge_range_t *second,
+static svn_error_t *
+range_contains(svn_boolean_t *result,
+               const svn_merge_range_t *first, const svn_merge_range_t *second,
                svn_boolean_t consider_inheritance)
 {
-  SVN_ERR_ASSERT_NO_RETURN(IS_VALID_FORWARD_RANGE(first));
-  SVN_ERR_ASSERT_NO_RETURN(IS_VALID_FORWARD_RANGE(second));
+  SVN_ERR_ASSERT(IS_VALID_FORWARD_RANGE(first));
+  SVN_ERR_ASSERT(IS_VALID_FORWARD_RANGE(second));
 
-  return (first->start <= second->start) && (second->end <= first->end)
-    && (!consider_inheritance
-        || (!(first->inheritable) == !(second->inheritable)));
+  *result = (first->start <= second->start) && (second->end <= first->end)
+            && (!consider_inheritance
+                || (!(first->inheritable) == !(second->inheritable)));
+  return SVN_NO_ERROR;
 }
 
 /* Swap start and end fields of RANGE. */
@@ -1390,6 +1277,7 @@ rangelist_intersect_or_remove(svn_rangelist_t **output,
   while (i1 < rangelist1->nelts && i2 < rangelist2->nelts)
     {
       svn_merge_range_t *elt1, *elt2;
+      svn_boolean_t elt1_contains_elt2, elt1_intersects_elt2;
 
       elt1 = APR_ARRAY_IDX(rangelist1, i1, svn_merge_range_t *);
 
@@ -1405,6 +1293,10 @@ rangelist_intersect_or_remove(svn_rangelist_t **output,
 
       elt2 = &working_elt2;
 
+      SVN_ERR(range_contains(&elt1_contains_elt2,
+                             elt1, elt2, consider_inheritance));
+      SVN_ERR(range_intersect(&elt1_intersects_elt2,
+                              elt1, elt2, consider_inheritance));
       /* If the rangelist2 range is contained completely in the
          rangelist1, we increment the rangelist2.
          If the ranges intersect, and match exactly, we increment both
@@ -1413,7 +1305,7 @@ rangelist_intersect_or_remove(svn_rangelist_t **output,
          the removal of rangelist1 from rangelist2, and possibly change
          the rangelist2 to the remaining portion of the right part of
          the removal, to test against. */
-      if (range_contains(elt1, elt2, consider_inheritance))
+      if (elt1_contains_elt2)
         {
           if (!do_remove)
             {
@@ -1434,7 +1326,7 @@ rangelist_intersect_or_remove(svn_rangelist_t **output,
           if (elt2->start == elt1->start && elt2->end == elt1->end)
             i1++;
         }
-      else if (range_intersect(elt1, elt2, consider_inheritance))
+      else if (elt1_intersects_elt2)
         {
           if (elt2->start < elt1->start)
             {
@@ -1977,18 +1869,21 @@ svn_rangelist_to_string(svn_string_t **output,
     {
       int i;
       svn_merge_range_t *range;
+      char *s;
 
       /* Handle the elements that need commas at the end.  */
       for (i = 0; i < rangelist->nelts - 1; i++)
         {
           range = APR_ARRAY_IDX(rangelist, i, svn_merge_range_t *);
-          svn_stringbuf_appendcstr(buf, range_to_string(range, pool));
+          SVN_ERR(range_to_string(&s, range, pool));
+          svn_stringbuf_appendcstr(buf, s);
           svn_stringbuf_appendcstr(buf, ",");
         }
 
       /* Now handle the last element, which needs no comma.  */
       range = APR_ARRAY_IDX(rangelist, i, svn_merge_range_t *);
-      svn_stringbuf_appendcstr(buf, range_to_string(range, pool));
+      SVN_ERR(range_to_string(&s, range, pool));
+      svn_stringbuf_appendcstr(buf, s);
     }
 
   *output = svn_stringbuf__morph_into_string(buf);
diff --git a/subversion/libsvn_subr/object_pool.c b/subversion/libsvn_subr/object_pool.c
index 0f41fea..5091b89 100644
--- a/subversion/libsvn_subr/object_pool.c
+++ b/subversion/libsvn_subr/object_pool.c
@@ -321,7 +321,7 @@ svn_object_pool__insert(void **object,
 {
   *object = NULL;
   SVN_MUTEX__WITH_LOCK(object_pool->mutex,
-                       insert(object, object_pool, key, item, 
+                       insert(object, object_pool, key, item,
                               item_pool, result_pool));
   return SVN_NO_ERROR;
 }
diff --git a/subversion/libsvn_subr/pool.c b/subversion/libsvn_subr/pool.c
index bbeafde..340c576 100644
--- a/subversion/libsvn_subr/pool.c
+++ b/subversion/libsvn_subr/pool.c
@@ -151,16 +151,6 @@ svn_pool_create_allocator(svn_boolean_t thread_safe)
 }
 
 
-/*
- * apr_pool_create_core_ex was introduced in APR 1.3.0, then
- * deprecated and renamed to apr_pool_create_unmanaged_ex in 1.3.3.
- * Since our minimum requirement is APR 1.3.0, one or the other of
- * these functions will always be available.
- */
-#if !APR_VERSION_AT_LEAST(1,3,3)
-#define apr_pool_create_unmanaged_ex apr_pool_create_core_ex
-#endif
-
 /* Private function that creates an unmanaged pool. */
 apr_pool_t *
 svn_pool__create_unmanaged(svn_boolean_t thread_safe)
diff --git a/subversion/libsvn_subr/sorts.c b/subversion/libsvn_subr/sorts.c
index 613c93b..7fe7b7c 100644
--- a/subversion/libsvn_subr/sorts.c
+++ b/subversion/libsvn_subr/sorts.c
@@ -34,6 +34,8 @@
 #include "svn_error.h"
 #include "private/svn_sorts_private.h"
 
+#include "svn_private_config.h"
+
 
 
 /*** svn_sort__hash() ***/
@@ -299,15 +301,20 @@ svn_sort__array_lookup(const apr_array_header_t *array,
   return compare_func(result, key) ? NULL : result;
 }
 
-void
-svn_sort__array_insert(apr_array_header_t *array,
-                       const void *new_element,
-                       int insert_index)
+svn_error_t *
+svn_sort__array_insert2(apr_array_header_t *array,
+                        const void *new_element,
+                        int insert_index)
 {
   int elements_to_move;
   char *new_position;
 
-  assert(0 <= insert_index && insert_index <= array->nelts);
+  if (insert_index < 0 || insert_index > array->nelts)
+    return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+                             _("svn_sort__array_insert2: Attempted insert "
+                               "at index %d in array length %d"),
+                             insert_index, array->nelts);
+
   elements_to_move = array->nelts - insert_index;  /* before bumping nelts */
 
   /* Grow the array, allocating a new space at the end. Note: this can
@@ -322,31 +329,35 @@ svn_sort__array_insert(apr_array_header_t *array,
 
   /* Copy in the new element */
   memcpy(new_position, new_element, array->elt_size);
+  return SVN_NO_ERROR;
 }
 
-void
-svn_sort__array_delete(apr_array_header_t *arr,
-                       int delete_index,
-                       int elements_to_delete)
+svn_error_t *
+svn_sort__array_delete2(apr_array_header_t *arr,
+                        int delete_index,
+                        int elements_to_delete)
 {
-  /* Do we have a valid index and are there enough elements? */
-  if (delete_index >= 0
-      && delete_index < arr->nelts
-      && elements_to_delete > 0
-      && (arr->nelts - delete_index) >= elements_to_delete)
-    {
-      /* If we are not deleting a block of elements that extends to the end
-         of the array, then we need to move the remaining elements to keep
-         the array contiguous. */
-      if ((elements_to_delete + delete_index) < arr->nelts)
-        memmove(
-          arr->elts + arr->elt_size * delete_index,
-          arr->elts + (arr->elt_size * (delete_index + elements_to_delete)),
-          arr->elt_size * (arr->nelts - elements_to_delete - delete_index));
-
-      /* Delete the last ELEMENTS_TO_DELETE elements. */
-      arr->nelts -= elements_to_delete;
-    }
+  if (!(delete_index >= 0
+        && delete_index < arr->nelts
+        && elements_to_delete > 0
+        && (arr->nelts - delete_index) >= elements_to_delete))
+    return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+                             _("svn_sort__array_delete2: Attempted delete "
+                               "at index %d, %d elements, in array length %d"),
+                             delete_index, elements_to_delete, arr->nelts);
+
+  /* If we are deleting a block of elements that does not extend to the end
+     of the array, then we need to move the remaining elements to keep
+     the array contiguous. */
+  if ((elements_to_delete + delete_index) < arr->nelts)
+    memmove(
+      arr->elts + arr->elt_size * delete_index,
+      arr->elts + (arr->elt_size * (delete_index + elements_to_delete)),
+      arr->elt_size * (arr->nelts - elements_to_delete - delete_index));
+
+  /* Delete the last ELEMENTS_TO_DELETE elements. */
+  arr->nelts -= elements_to_delete;
+  return SVN_NO_ERROR;
 }
 
 void
diff --git a/subversion/libsvn_subr/subst.c b/subversion/libsvn_subr/subst.c
index b69f90a..a1213cb 100644
--- a/subversion/libsvn_subr/subst.c
+++ b/subversion/libsvn_subr/subst.c
@@ -210,10 +210,10 @@ keyword_printf(const char *fmt,
           break;
         case 'D': /* long format of date of this revision */
           if (date)
-	    {
+            {
               char *date_keyword;
-              char *date_utf8 = svn_time_to_human_cstring (date, pool);
-              svn_utf_cstring_from_utf8(&date_keyword, date_utf8, pool);
+              char *date_utf8 = svn_time_to_human_cstring(date, pool);
+              SVN_ERR(svn_utf_cstring_from_utf8(&date_keyword, date_utf8, pool));
               svn_stringbuf_appendcstr(value, date_keyword);
             }
           break;
diff --git a/subversion/libsvn_subr/sysinfo.c b/subversion/libsvn_subr/sysinfo.c
index 1dda38c..1f826e9 100644
--- a/subversion/libsvn_subr/sysinfo.c
+++ b/subversion/libsvn_subr/sysinfo.c
@@ -1,3 +1,4 @@
+
 /*
  * sysinfo.c :  information about the running system
  *
@@ -1386,6 +1387,7 @@ release_name_from_minor_version(int minor, const char* product_name)
         case 12: return "Sierra";
         case 13: return "High Sierra";
         case 14: return "Mojave";
+        case 15: return "Catalina";
         }
     }
   return NULL;
diff --git a/subversion/libsvn_subr/utf8proc/utf8proc_data.c b/subversion/libsvn_subr/utf8proc/utf8proc_data.c
index 63ce17e..b7a66f4 100644
--- a/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+++ b/subversion/libsvn_subr/utf8proc/utf8proc_data.c
@@ -1,6596 +1,6596 @@
 UTF8PROC_DATA
 const utf8proc_uint16_t utf8proc_sequences[] = {
-  97, 98, 99, 100, 101, 102, 103, 
-  104, 105, 106, 107, 108, 109, 110, 111, 
-  112, 113, 114, 115, 116, 117, 118, 119, 
-  120, 121, 122, 32, 32, 776, 32, 772, 
-  50, 51, 32, 769, 956, 32, 807, 49, 
-  49, 8260, 52, 49, 8260, 50, 51, 8260, 
-  52, 65, 768, 224, 65, 769, 225, 65, 
-  770, 226, 65, 771, 227, 65, 776, 228, 
-  65, 778, 229, 230, 67, 807, 231, 69, 
-  768, 232, 69, 769, 233, 69, 770, 234, 
-  69, 776, 235, 73, 768, 236, 73, 769, 
-  237, 73, 770, 238, 73, 776, 239, 240, 
-  78, 771, 241, 79, 768, 242, 79, 769, 
-  243, 79, 770, 244, 79, 771, 245, 79, 
-  776, 246, 248, 85, 768, 249, 85, 769, 
-  250, 85, 770, 251, 85, 776, 252, 89, 
-  769, 253, 254, 115, 115, 97, 768, 97, 
-  769, 97, 770, 97, 771, 97, 776, 97, 
-  778, 99, 807, 101, 768, 101, 769, 101, 
-  770, 101, 776, 105, 768, 105, 769, 105, 
-  770, 105, 776, 110, 771, 111, 768, 111, 
-  769, 111, 770, 111, 771, 111, 776, 117, 
-  768, 117, 769, 117, 770, 117, 776, 121, 
-  769, 121, 776, 65, 772, 257, 97, 772, 
-  65, 774, 259, 97, 774, 65, 808, 261, 
-  97, 808, 67, 769, 263, 99, 769, 67, 
-  770, 265, 99, 770, 67, 775, 267, 99, 
-  775, 67, 780, 269, 99, 780, 68, 780, 
-  271, 100, 780, 273, 69, 772, 275, 101, 
-  772, 69, 774, 277, 101, 774, 69, 775, 
-  279, 101, 775, 69, 808, 281, 101, 808, 
-  69, 780, 283, 101, 780, 71, 770, 285, 
-  103, 770, 71, 774, 287, 103, 774, 71, 
-  775, 289, 103, 775, 71, 807, 291, 103, 
-  807, 72, 770, 293, 104, 770, 295, 73, 
-  771, 297, 105, 771, 73, 772, 299, 105, 
-  772, 73, 774, 301, 105, 774, 73, 808, 
-  303, 105, 808, 73, 775, 105, 775, 73, 
-  74, 307, 105, 106, 74, 770, 309, 106, 
-  770, 75, 807, 311, 107, 807, 76, 769, 
-  314, 108, 769, 76, 807, 316, 108, 807, 
-  76, 780, 318, 108, 780, 76, 183, 320, 
-  108, 183, 322, 78, 769, 324, 110, 769, 
-  78, 807, 326, 110, 807, 78, 780, 328, 
-  110, 780, 700, 110, 331, 79, 772, 333, 
-  111, 772, 79, 774, 335, 111, 774, 79, 
-  779, 337, 111, 779, 339, 82, 769, 341, 
-  114, 769, 82, 807, 343, 114, 807, 82, 
-  780, 345, 114, 780, 83, 769, 347, 115, 
-  769, 83, 770, 349, 115, 770, 83, 807, 
-  351, 115, 807, 83, 780, 353, 115, 780, 
-  84, 807, 355, 116, 807, 84, 780, 357, 
-  116, 780, 359, 85, 771, 361, 117, 771, 
-  85, 772, 363, 117, 772, 85, 774, 365, 
-  117, 774, 85, 778, 367, 117, 778, 85, 
-  779, 369, 117, 779, 85, 808, 371, 117, 
-  808, 87, 770, 373, 119, 770, 89, 770, 
-  375, 121, 770, 89, 776, 255, 90, 769, 
-  378, 122, 769, 90, 775, 380, 122, 775, 
-  90, 780, 382, 122, 780, 595, 387, 389, 
-  596, 392, 598, 599, 396, 477, 601, 603, 
-  402, 608, 611, 617, 616, 409, 623, 626, 
-  629, 79, 795, 417, 111, 795, 419, 421, 
-  640, 424, 643, 429, 648, 85, 795, 432, 
-  117, 795, 650, 651, 436, 438, 658, 441, 
-  445, 68, 381, 454, 68, 382, 100, 382, 
-  76, 74, 457, 76, 106, 108, 106, 78, 
-  74, 460, 78, 106, 110, 106, 65, 780, 
-  462, 97, 780, 73, 780, 464, 105, 780, 
-  79, 780, 466, 111, 780, 85, 780, 468, 
-  117, 780, 220, 772, 470, 252, 772, 220, 
-  769, 472, 252, 769, 220, 780, 474, 252, 
-  780, 220, 768, 476, 252, 768, 196, 772, 
-  479, 228, 772, 550, 772, 481, 551, 772, 
-  198, 772, 483, 230, 772, 485, 71, 780, 
-  487, 103, 780, 75, 780, 489, 107, 780, 
-  79, 808, 491, 111, 808, 490, 772, 493, 
-  491, 772, 439, 780, 495, 658, 780, 106, 
-  780, 68, 90, 499, 68, 122, 100, 122, 
-  71, 769, 501, 103, 769, 405, 447, 78, 
-  768, 505, 110, 768, 197, 769, 507, 229, 
-  769, 198, 769, 509, 230, 769, 216, 769, 
-  511, 248, 769, 65, 783, 513, 97, 783, 
-  65, 785, 515, 97, 785, 69, 783, 517, 
-  101, 783, 69, 785, 519, 101, 785, 73, 
-  783, 521, 105, 783, 73, 785, 523, 105, 
-  785, 79, 783, 525, 111, 783, 79, 785, 
-  527, 111, 785, 82, 783, 529, 114, 783, 
-  82, 785, 531, 114, 785, 85, 783, 533, 
-  117, 783, 85, 785, 535, 117, 785, 83, 
-  806, 537, 115, 806, 84, 806, 539, 116, 
-  806, 541, 72, 780, 543, 104, 780, 414, 
-  547, 549, 65, 775, 551, 97, 775, 69, 
-  807, 553, 101, 807, 214, 772, 555, 246, 
-  772, 213, 772, 557, 245, 772, 79, 775, 
-  559, 111, 775, 558, 772, 561, 559, 772, 
-  89, 772, 563, 121, 772, 11365, 572, 410, 
-  11366, 578, 384, 649, 652, 583, 585, 587, 
-  589, 591, 614, 633, 635, 641, 32, 774, 
-  32, 775, 32, 778, 32, 808, 32, 771, 
-  32, 779, 661, 768, 769, 787, 776, 769, 
-  953, 881, 883, 697, 887, 32, 837, 59, 
-  1011, 168, 769, 913, 769, 940, 183, 917, 
-  769, 941, 919, 769, 942, 921, 769, 943, 
-  927, 769, 972, 933, 769, 973, 937, 769, 
-  974, 970, 769, 953, 776, 769, 945, 946, 
-  947, 948, 949, 950, 951, 952, 954, 955, 
-  957, 958, 959, 960, 961, 963, 964, 965, 
-  966, 967, 968, 969, 921, 776, 970, 933, 
-  776, 971, 945, 769, 949, 769, 951, 769, 
-  953, 769, 971, 769, 965, 776, 769, 953, 
-  776, 965, 776, 959, 769, 965, 769, 969, 
-  769, 983, 933, 978, 769, 978, 776, 985, 
-  987, 989, 991, 993, 995, 997, 999, 1001, 
-  1003, 1005, 1007, 962, 920, 1016, 931, 1010, 
-  1019, 891, 892, 893, 1045, 768, 1104, 1045, 
-  776, 1105, 1106, 1043, 769, 1107, 1108, 1109, 
-  1110, 1030, 776, 1111, 1112, 1113, 1114, 1115, 
-  1050, 769, 1116, 1048, 768, 1117, 1059, 774, 
-  1118, 1119, 1072, 1073, 1074, 1075, 1076, 1077, 
-  1078, 1079, 1080, 1048, 774, 1081, 1082, 1083, 
-  1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 
-  1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 
-  1100, 1101, 1102, 1103, 1080, 774, 1077, 768, 
-  1077, 776, 1075, 769, 1110, 776, 1082, 769, 
-  1080, 768, 1091, 774, 1121, 1123, 1125, 1127, 
-  1129, 1131, 1133, 1135, 1137, 1139, 1141, 1140, 
-  783, 1143, 1141, 783, 1145, 1147, 1149, 1151, 
-  1153, 1163, 1165, 1167, 1169, 1171, 1173, 1175, 
-  1177, 1179, 1181, 1183, 1185, 1187, 1189, 1191, 
-  1193, 1195, 1197, 1199, 1201, 1203, 1205, 1207, 
-  1209, 1211, 1213, 1215, 1231, 1046, 774, 1218, 
-  1078, 774, 1220, 1222, 1224, 1226, 1228, 1230, 
-  1040, 774, 1233, 1072, 774, 1040, 776, 1235, 
-  1072, 776, 1237, 1045, 774, 1239, 1077, 774, 
-  1241, 1240, 776, 1243, 1241, 776, 1046, 776, 
-  1245, 1078, 776, 1047, 776, 1247, 1079, 776, 
-  1249, 1048, 772, 1251, 1080, 772, 1048, 776, 
-  1253, 1080, 776, 1054, 776, 1255, 1086, 776, 
-  1257, 1256, 776, 1259, 1257, 776, 1069, 776, 
-  1261, 1101, 776, 1059, 772, 1263, 1091, 772, 
-  1059, 776, 1265, 1091, 776, 1059, 779, 1267, 
-  1091, 779, 1063, 776, 1269, 1095, 776, 1271, 
-  1067, 776, 1273, 1099, 776, 1275, 1277, 1279, 
-  1281, 1283, 1285, 1287, 1289, 1291, 1293, 1295, 
-  1297, 1299, 1301, 1303, 1305, 1307, 1309, 1311, 
-  1313, 1315, 1317, 1319, 1321, 1323, 1325, 1327, 
-  1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 
-  1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 
-  1393, 1394, 1395, 1396, 1397, 1398, 1399, 1400, 
-  1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 
-  1409, 1410, 1411, 1412, 1413, 1414, 1381, 1410, 
-  1575, 1619, 1575, 1620, 1608, 1620, 1575, 1621, 
-  1610, 1620, 1575, 1652, 1608, 1652, 1735, 1652, 
-  1610, 1652, 1749, 1620, 1729, 1620, 1746, 1620, 
-  2344, 2364, 2352, 2364, 2355, 2364, 2325, 2364, 
-  2326, 2364, 2327, 2364, 2332, 2364, 2337, 2364, 
-  2338, 2364, 2347, 2364, 2351, 2364, 2503, 2494, 
-  2503, 2519, 2465, 2492, 2466, 2492, 2479, 2492, 
-  2610, 2620, 2616, 2620, 2582, 2620, 2583, 2620, 
-  2588, 2620, 2603, 2620, 2887, 2902, 2887, 2878, 
-  2887, 2903, 2849, 2876, 2850, 2876, 2962, 3031, 
-  3014, 3006, 3015, 3006, 3014, 3031, 3142, 3158, 
-  3263, 3285, 3270, 3285, 3270, 3286, 3270, 3266, 
-  3274, 3285, 3398, 3390, 3399, 3390, 3398, 3415, 
-  3545, 3530, 3545, 3535, 3548, 3530, 3545, 3551, 
-  3661, 3634, 3789, 3762, 3755, 3737, 3755, 3745, 
-  3851, 3906, 4023, 3916, 4023, 3921, 4023, 3926, 
-  4023, 3931, 4023, 3904, 4021, 3953, 3954, 3953, 
-  3956, 4018, 3968, 4018, 3969, 4019, 3968, 4019, 
-  3969, 3953, 3968, 3986, 4023, 3996, 4023, 4001, 
-  4023, 4006, 4023, 4011, 4023, 3984, 4021, 4133, 
-  4142, 11520, 11521, 11522, 11523, 11524, 11525, 11526, 
-  11527, 11528, 11529, 11530, 11531, 11532, 11533, 11534, 
-  11535, 11536, 11537, 11538, 11539, 11540, 11541, 11542, 
-  11543, 11544, 11545, 11546, 11547, 11548, 11549, 11550, 
-  11551, 11552, 11553, 11554, 11555, 11556, 11557, 11559, 
-  11565, 4316, 5104, 5105, 5106, 5107, 5108, 5109, 
-  6917, 6965, 6919, 6965, 6921, 6965, 6923, 6965, 
-  6925, 6965, 6929, 6965, 6970, 6965, 6972, 6965, 
-  6974, 6965, 6975, 6965, 6978, 6965, 42571, 65, 
-  198, 66, 68, 69, 398, 71, 72, 73, 
-  74, 75, 76, 77, 78, 79, 546, 80, 
-  82, 84, 85, 87, 592, 593, 7426, 604, 
-  7446, 7447, 7453, 7461, 594, 597, 607, 609, 
-  613, 618, 7547, 669, 621, 7557, 671, 625, 
-  624, 627, 628, 632, 642, 427, 7452, 656, 
-  657, 65, 805, 7681, 97, 805, 66, 775, 
-  7683, 98, 775, 66, 803, 7685, 98, 803, 
-  66, 817, 7687, 98, 817, 199, 769, 7689, 
-  231, 769, 68, 775, 7691, 100, 775, 68, 
-  803, 7693, 100, 803, 68, 817, 7695, 100, 
-  817, 68, 807, 7697, 100, 807, 68, 813, 
-  7699, 100, 813, 274, 768, 7701, 275, 768, 
-  274, 769, 7703, 275, 769, 69, 813, 7705, 
-  101, 813, 69, 816, 7707, 101, 816, 552, 
-  774, 7709, 553, 774, 70, 775, 7711, 102, 
-  775, 71, 772, 7713, 103, 772, 72, 775, 
-  7715, 104, 775, 72, 803, 7717, 104, 803, 
-  72, 776, 7719, 104, 776, 72, 807, 7721, 
-  104, 807, 72, 814, 7723, 104, 814, 73, 
-  816, 7725, 105, 816, 207, 769, 7727, 239, 
-  769, 75, 769, 7729, 107, 769, 75, 803, 
-  7731, 107, 803, 75, 817, 7733, 107, 817, 
-  76, 803, 7735, 108, 803, 7734, 772, 7737, 
-  7735, 772, 76, 817, 7739, 108, 817, 76, 
-  813, 7741, 108, 813, 77, 769, 7743, 109, 
-  769, 77, 775, 7745, 109, 775, 77, 803, 
-  7747, 109, 803, 78, 775, 7749, 110, 775, 
-  78, 803, 7751, 110, 803, 78, 817, 7753, 
-  110, 817, 78, 813, 7755, 110, 813, 213, 
-  769, 7757, 245, 769, 213, 776, 7759, 245, 
-  776, 332, 768, 7761, 333, 768, 332, 769, 
-  7763, 333, 769, 80, 769, 7765, 112, 769, 
-  80, 775, 7767, 112, 775, 82, 775, 7769, 
-  114, 775, 82, 803, 7771, 114, 803, 7770, 
-  772, 7773, 7771, 772, 82, 817, 7775, 114, 
-  817, 83, 775, 7777, 115, 775, 83, 803, 
-  7779, 115, 803, 346, 775, 7781, 347, 775, 
-  352, 775, 7783, 353, 775, 7778, 775, 7785, 
-  7779, 775, 84, 775, 7787, 116, 775, 84, 
-  803, 7789, 116, 803, 84, 817, 7791, 116, 
-  817, 84, 813, 7793, 116, 813, 85, 804, 
-  7795, 117, 804, 85, 816, 7797, 117, 816, 
-  85, 813, 7799, 117, 813, 360, 769, 7801, 
-  361, 769, 362, 776, 7803, 363, 776, 86, 
-  771, 7805, 118, 771, 86, 803, 7807, 118, 
-  803, 87, 768, 7809, 119, 768, 87, 769, 
-  7811, 119, 769, 87, 776, 7813, 119, 776, 
-  87, 775, 7815, 119, 775, 87, 803, 7817, 
-  119, 803, 88, 775, 7819, 120, 775, 88, 
-  776, 7821, 120, 776, 89, 775, 7823, 121, 
-  775, 90, 770, 7825, 122, 770, 90, 803, 
-  7827, 122, 803, 90, 817, 7829, 122, 817, 
-  104, 817, 116, 776, 119, 778, 121, 778, 
-  97, 702, 383, 775, 223, 65, 803, 7841, 
-  97, 803, 65, 777, 7843, 97, 777, 194, 
-  769, 7845, 226, 769, 194, 768, 7847, 226, 
-  768, 194, 777, 7849, 226, 777, 194, 771, 
-  7851, 226, 771, 7840, 770, 7853, 7841, 770, 
-  258, 769, 7855, 259, 769, 258, 768, 7857, 
-  259, 768, 258, 777, 7859, 259, 777, 258, 
-  771, 7861, 259, 771, 7840, 774, 7863, 7841, 
-  774, 69, 803, 7865, 101, 803, 69, 777, 
-  7867, 101, 777, 69, 771, 7869, 101, 771, 
-  202, 769, 7871, 234, 769, 202, 768, 7873, 
-  234, 768, 202, 777, 7875, 234, 777, 202, 
-  771, 7877, 234, 771, 7864, 770, 7879, 7865, 
-  770, 73, 777, 7881, 105, 777, 73, 803, 
-  7883, 105, 803, 79, 803, 7885, 111, 803, 
-  79, 777, 7887, 111, 777, 212, 769, 7889, 
-  244, 769, 212, 768, 7891, 244, 768, 212, 
-  777, 7893, 244, 777, 212, 771, 7895, 244, 
-  771, 7884, 770, 7897, 7885, 770, 416, 769, 
-  7899, 417, 769, 416, 768, 7901, 417, 768, 
-  416, 777, 7903, 417, 777, 416, 771, 7905, 
-  417, 771, 416, 803, 7907, 417, 803, 85, 
-  803, 7909, 117, 803, 85, 777, 7911, 117, 
-  777, 431, 769, 7913, 432, 769, 431, 768, 
-  7915, 432, 768, 431, 777, 7917, 432, 777, 
-  431, 771, 7919, 432, 771, 431, 803, 7921, 
-  432, 803, 89, 768, 7923, 121, 768, 89, 
-  803, 7925, 121, 803, 89, 777, 7927, 121, 
-  777, 89, 771, 7929, 121, 771, 7931, 7933, 
-  7935, 945, 787, 945, 788, 7936, 768, 7937, 
-  768, 7936, 769, 7937, 769, 7936, 834, 7937, 
-  834, 913, 787, 7936, 913, 788, 7937, 7944, 
-  768, 7938, 7945, 768, 7939, 7944, 769, 7940, 
-  7945, 769, 7941, 7944, 834, 7942, 7945, 834, 
-  7943, 949, 787, 949, 788, 7952, 768, 7953, 
-  768, 7952, 769, 7953, 769, 917, 787, 7952, 
-  917, 788, 7953, 7960, 768, 7954, 7961, 768, 
-  7955, 7960, 769, 7956, 7961, 769, 7957, 951, 
-  787, 951, 788, 7968, 768, 7969, 768, 7968, 
-  769, 7969, 769, 7968, 834, 7969, 834, 919, 
-  787, 7968, 919, 788, 7969, 7976, 768, 7970, 
-  7977, 768, 7971, 7976, 769, 7972, 7977, 769, 
-  7973, 7976, 834, 7974, 7977, 834, 7975, 953, 
-  787, 953, 788, 7984, 768, 7985, 768, 7984, 
-  769, 7985, 769, 7984, 834, 7985, 834, 921, 
-  787, 7984, 921, 788, 7985, 7992, 768, 7986, 
-  7993, 768, 7987, 7992, 769, 7988, 7993, 769, 
-  7989, 7992, 834, 7990, 7993, 834, 7991, 959, 
-  787, 959, 788, 8000, 768, 8001, 768, 8000, 
-  769, 8001, 769, 927, 787, 8000, 927, 788, 
-  8001, 8008, 768, 8002, 8009, 768, 8003, 8008, 
-  769, 8004, 8009, 769, 8005, 965, 787, 965, 
-  788, 8016, 768, 965, 787, 768, 8017, 768, 
-  8016, 769, 965, 787, 769, 8017, 769, 8016, 
-  834, 965, 787, 834, 8017, 834, 933, 788, 
-  8017, 8025, 768, 8019, 8025, 769, 8021, 8025, 
-  834, 8023, 969, 787, 969, 788, 8032, 768, 
-  8033, 768, 8032, 769, 8033, 769, 8032, 834, 
-  8033, 834, 937, 787, 8032, 937, 788, 8033, 
-  8040, 768, 8034, 8041, 768, 8035, 8040, 769, 
-  8036, 8041, 769, 8037, 8040, 834, 8038, 8041, 
-  834, 8039, 945, 768, 949, 768, 951, 768, 
-  953, 768, 959, 768, 965, 768, 969, 768, 
-  7936, 837, 7936, 953, 7937, 837, 7937, 953, 
-  7938, 837, 7938, 953, 7939, 837, 7939, 953, 
-  7940, 837, 7940, 953, 7941, 837, 7941, 953, 
-  7942, 837, 7942, 953, 7943, 837, 7943, 953, 
-  7944, 837, 8064, 7945, 837, 8065, 7946, 837, 
-  8066, 7947, 837, 8067, 7948, 837, 8068, 7949, 
-  837, 8069, 7950, 837, 8070, 7951, 837, 8071, 
-  7968, 837, 7968, 953, 7969, 837, 7969, 953, 
-  7970, 837, 7970, 953, 7971, 837, 7971, 953, 
-  7972, 837, 7972, 953, 7973, 837, 7973, 953, 
-  7974, 837, 7974, 953, 7975, 837, 7975, 953, 
-  7976, 837, 8080, 7977, 837, 8081, 7978, 837, 
-  8082, 7979, 837, 8083, 7980, 837, 8084, 7981, 
-  837, 8085, 7982, 837, 8086, 7983, 837, 8087, 
-  8032, 837, 8032, 953, 8033, 837, 8033, 953, 
-  8034, 837, 8034, 953, 8035, 837, 8035, 953, 
-  8036, 837, 8036, 953, 8037, 837, 8037, 953, 
-  8038, 837, 8038, 953, 8039, 837, 8039, 953, 
-  8040, 837, 8096, 8041, 837, 8097, 8042, 837, 
-  8098, 8043, 837, 8099, 8044, 837, 8100, 8045, 
-  837, 8101, 8046, 837, 8102, 8047, 837, 8103, 
-  945, 774, 945, 772, 8048, 837, 8048, 953, 
-  945, 837, 945, 953, 940, 837, 940, 953, 
-  945, 834, 8118, 837, 945, 834, 953, 913, 
-  774, 8112, 913, 772, 8113, 913, 768, 8048, 
-  902, 8049, 913, 837, 8115, 32, 787, 32, 
-  834, 168, 834, 8052, 837, 8052, 953, 951, 
-  837, 951, 953, 942, 837, 942, 953, 951, 
-  834, 8134, 837, 951, 834, 953, 917, 768, 
-  8050, 904, 8051, 919, 768, 8052, 905, 8053, 
-  919, 837, 8131, 8127, 768, 8127, 769, 8127, 
-  834, 953, 774, 953, 772, 970, 768, 953, 
-  776, 768, 912, 953, 834, 970, 834, 953, 
-  776, 834, 921, 774, 8144, 921, 772, 8145, 
-  921, 768, 8054, 906, 8055, 8190, 768, 8190, 
-  769, 8190, 834, 965, 774, 965, 772, 971, 
-  768, 965, 776, 768, 944, 961, 787, 961, 
-  788, 965, 834, 971, 834, 965, 776, 834, 
-  933, 774, 8160, 933, 772, 8161, 933, 768, 
-  8058, 910, 8059, 929, 788, 8165, 168, 768, 
-  901, 96, 8060, 837, 8060, 953, 969, 837, 
-  969, 953, 974, 837, 974, 953, 969, 834, 
-  8182, 837, 969, 834, 953, 927, 768, 8056, 
-  908, 8057, 937, 768, 8060, 911, 8061, 937, 
-  837, 8179, 180, 32, 788, 8194, 8195, 8208, 
-  32, 819, 46, 46, 46, 46, 46, 46, 
-  8242, 8242, 8242, 8242, 8242, 8245, 8245, 8245, 
-  8245, 8245, 33, 33, 32, 773, 63, 63, 
-  63, 33, 33, 63, 8242, 8242, 8242, 8242, 
-  48, 52, 53, 54, 55, 56, 57, 43, 
-  8722, 61, 40, 41, 82, 115, 97, 47, 
-  99, 97, 47, 115, 67, 176, 67, 99, 
-  47, 111, 99, 47, 117, 400, 176, 70, 
-  78, 111, 81, 83, 77, 84, 69, 76, 
-  84, 77, 90, 937, 197, 70, 8526, 1488, 
-  1489, 1490, 1491, 70, 65, 88, 915, 928, 
-  8721, 49, 8260, 55, 49, 8260, 57, 49, 
-  8260, 49, 48, 49, 8260, 51, 50, 8260, 
-  51, 49, 8260, 53, 50, 8260, 53, 51, 
-  8260, 53, 52, 8260, 53, 49, 8260, 54, 
-  53, 8260, 54, 49, 8260, 56, 51, 8260, 
-  56, 53, 8260, 56, 55, 8260, 56, 49, 
-  8260, 8560, 73, 73, 8561, 73, 73, 73, 
-  8562, 73, 86, 8563, 86, 8564, 86, 73, 
-  8565, 86, 73, 73, 8566, 86, 73, 73, 
-  73, 8567, 73, 88, 8568, 88, 8569, 88, 
-  73, 8570, 88, 73, 73, 8571, 8572, 8573, 
-  8574, 8575, 105, 105, 105, 105, 105, 105, 
-  118, 118, 105, 118, 105, 105, 118, 105, 
-  105, 105, 105, 120, 120, 105, 120, 105, 
-  105, 8580, 48, 8260, 51, 8592, 824, 8594, 
-  824, 8596, 824, 8656, 824, 8660, 824, 8658, 
-  824, 8707, 824, 8712, 824, 8715, 824, 8739, 
-  824, 8741, 824, 8747, 8747, 8747, 8747, 8747, 
-  8750, 8750, 8750, 8750, 8750, 8764, 824, 8771, 
-  824, 8773, 824, 8776, 824, 61, 824, 8801, 
-  824, 8781, 824, 60, 824, 62, 824, 8804, 
-  824, 8805, 824, 8818, 824, 8819, 824, 8822, 
-  824, 8823, 824, 8826, 824, 8827, 824, 8834, 
-  824, 8835, 824, 8838, 824, 8839, 824, 8866, 
-  824, 8872, 824, 8873, 824, 8875, 824, 8828, 
-  824, 8829, 824, 8849, 824, 8850, 824, 8882, 
-  824, 8883, 824, 8884, 824, 8885, 824, 12296, 
-  12297, 49, 48, 49, 49, 49, 50, 49, 
-  51, 49, 52, 49, 53, 49, 54, 49, 
-  55, 49, 56, 49, 57, 50, 48, 40, 
-  49, 41, 40, 50, 41, 40, 51, 41, 
-  40, 52, 41, 40, 53, 41, 40, 54, 
-  41, 40, 55, 41, 40, 56, 41, 40, 
-  57, 41, 40, 49, 48, 41, 40, 49, 
-  49, 41, 40, 49, 50, 41, 40, 49, 
-  51, 41, 40, 49, 52, 41, 40, 49, 
-  53, 41, 40, 49, 54, 41, 40, 49, 
-  55, 41, 40, 49, 56, 41, 40, 49, 
-  57, 41, 40, 50, 48, 41, 49, 46, 
-  50, 46, 51, 46, 52, 46, 53, 46, 
-  54, 46, 55, 46, 56, 46, 57, 46, 
-  49, 48, 46, 49, 49, 46, 49, 50, 
-  46, 49, 51, 46, 49, 52, 46, 49, 
-  53, 46, 49, 54, 46, 49, 55, 46, 
-  49, 56, 46, 49, 57, 46, 50, 48, 
-  46, 40, 97, 41, 40, 98, 41, 40, 
-  99, 41, 40, 100, 41, 40, 101, 41, 
-  40, 102, 41, 40, 103, 41, 40, 104, 
-  41, 40, 105, 41, 40, 106, 41, 40, 
-  107, 41, 40, 108, 41, 40, 109, 41, 
-  40, 110, 41, 40, 111, 41, 40, 112, 
-  41, 40, 113, 41, 40, 114, 41, 40, 
-  115, 41, 40, 116, 41, 40, 117, 41, 
-  40, 118, 41, 40, 119, 41, 40, 120, 
-  41, 40, 121, 41, 40, 122, 41, 9424, 
-  9425, 9426, 9427, 9428, 9429, 9430, 9431, 9432, 
-  9433, 9434, 9435, 9436, 9437, 9438, 9439, 9440, 
-  9441, 83, 9442, 9443, 9444, 9445, 9446, 9447, 
-  89, 9448, 9449, 8747, 8747, 8747, 8747, 58, 
-  58, 61, 61, 61, 61, 61, 61, 10973, 
-  824, 11312, 11313, 11314, 11315, 11316, 11317, 11318, 
-  11319, 11320, 11321, 11322, 11323, 11324, 11325, 11326, 
-  11327, 11328, 11329, 11330, 11331, 11332, 11333, 11334, 
-  11335, 11336, 11337, 11338, 11339, 11340, 11341, 11342, 
-  11343, 11344, 11345, 11346, 11347, 11348, 11349, 11350, 
-  11351, 11352, 11353, 11354, 11355, 11356, 11357, 11358, 
-  11361, 619, 7549, 637, 11368, 11370, 11372, 11379, 
-  11382, 575, 576, 11393, 11395, 11397, 11399, 11401, 
-  11403, 11405, 11407, 11409, 11411, 11413, 11415, 11417, 
-  11419, 11421, 11423, 11425, 11427, 11429, 11431, 11433, 
-  11435, 11437, 11439, 11441, 11443, 11445, 11447, 11449, 
-  11451, 11453, 11455, 11457, 11459, 11461, 11463, 11465, 
-  11467, 11469, 11471, 11473, 11475, 11477, 11479, 11481, 
-  11483, 11485, 11487, 11489, 11491, 11500, 11502, 11507, 
-  11617, 27597, 40863, 19968, 20008, 20022, 20031, 20057, 
-  20101, 20108, 20128, 20154, 20799, 20837, 20843, 20866, 
-  20886, 20907, 20960, 20981, 20992, 21147, 21241, 21269, 
-  21274, 21304, 21313, 21340, 21353, 21378, 21430, 21448, 
-  21475, 22231, 22303, 22763, 22786, 22794, 22805, 22823, 
-  22899, 23376, 23424, 23544, 23567, 23586, 23608, 23662, 
-  23665, 24027, 24037, 24049, 24062, 24178, 24186, 24191, 
-  24308, 24318, 24331, 24339, 24400, 24417, 24435, 24515, 
-  25096, 25142, 25163, 25903, 25908, 25991, 26007, 26020, 
-  26041, 26080, 26085, 26352, 26376, 26408, 27424, 27490, 
-  27513, 27571, 27595, 27604, 27611, 27663, 27668, 27700, 
-  28779, 29226, 29238, 29243, 29247, 29255, 29273, 29275, 
-  29356, 29572, 29577, 29916, 29926, 29976, 29983, 29992, 
-  30000, 30091, 30098, 30326, 30333, 30382, 30399, 30446, 
-  30683, 30690, 30707, 31034, 31160, 31166, 31348, 31435, 
-  31481, 31859, 31992, 32566, 32593, 32650, 32701, 32769, 
-  32780, 32786, 32819, 32895, 32905, 33251, 33258, 33267, 
-  33276, 33292, 33307, 33311, 33390, 33394, 33400, 34381, 
-  34411, 34880, 34892, 34915, 35198, 35211, 35282, 35328, 
-  35895, 35910, 35925, 35960, 35997, 36196, 36208, 36275, 
-  36523, 36554, 36763, 36784, 36789, 37009, 37193, 37318, 
-  37324, 37329, 38263, 38272, 38428, 38582, 38585, 38632, 
-  38737, 38750, 38754, 38761, 38859, 38893, 38899, 38913, 
-  39080, 39131, 39135, 39318, 39321, 39340, 39592, 39640, 
-  39647, 39717, 39727, 39730, 39740, 39770, 40165, 40565, 
-  40575, 40613, 40635, 40643, 40653, 40657, 40697, 40701, 
-  40718, 40723, 40736, 40763, 40778, 40786, 40845, 40860, 
-  40864, 12306, 21316, 21317, 12363, 12441, 12365, 12441, 
-  12367, 12441, 12369, 12441, 12371, 12441, 12373, 12441, 
-  12375, 12441, 12377, 12441, 12379, 12441, 12381, 12441, 
-  12383, 12441, 12385, 12441, 12388, 12441, 12390, 12441, 
-  12392, 12441, 12399, 12441, 12399, 12442, 12402, 12441, 
-  12402, 12442, 12405, 12441, 12405, 12442, 12408, 12441, 
-  12408, 12442, 12411, 12441, 12411, 12442, 12358, 12441, 
-  32, 12441, 32, 12442, 12445, 12441, 12424, 12426, 
-  12459, 12441, 12461, 12441, 12463, 12441, 12465, 12441, 
-  12467, 12441, 12469, 12441, 12471, 12441, 12473, 12441, 
-  12475, 12441, 12477, 12441, 12479, 12441, 12481, 12441, 
-  12484, 12441, 12486, 12441, 12488, 12441, 12495, 12441, 
-  12495, 12442, 12498, 12441, 12498, 12442, 12501, 12441, 
-  12501, 12442, 12504, 12441, 12504, 12442, 12507, 12441, 
-  12507, 12442, 12454, 12441, 12527, 12441, 12528, 12441, 
-  12529, 12441, 12530, 12441, 12541, 12441, 12467, 12488, 
-  4352, 4353, 4522, 4354, 4524, 4525, 4355, 4356, 
-  4357, 4528, 4529, 4530, 4531, 4532, 4533, 4378, 
-  4358, 4359, 4360, 4385, 4361, 4362, 4363, 4364, 
-  4365, 4366, 4367, 4368, 4369, 4370, 4449, 4450, 
-  4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458, 
-  4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 
-  4467, 4468, 4469, 4448, 4372, 4373, 4551, 4552, 
-  4556, 4558, 4563, 4567, 4569, 4380, 4573, 4575, 
-  4381, 4382, 4384, 4386, 4387, 4391, 4393, 4395, 
-  4396, 4397, 4398, 4399, 4402, 4406, 4416, 4423, 
-  4428, 4593, 4594, 4439, 4440, 4441, 4484, 4485, 
-  4488, 4497, 4498, 4500, 4510, 4513, 19977, 22235, 
-  19978, 20013, 19979, 30002, 19993, 19969, 22825, 22320, 
-  40, 4352, 41, 40, 4354, 41, 40, 4355, 
-  41, 40, 4357, 41, 40, 4358, 41, 40, 
-  4359, 41, 40, 4361, 41, 40, 4363, 41, 
-  40, 4364, 41, 40, 4366, 41, 40, 4367, 
-  41, 40, 4368, 41, 40, 4369, 41, 40, 
-  4370, 41, 40, 4352, 4449, 41, 40, 4354, 
-  4449, 41, 40, 4355, 4449, 41, 40, 4357, 
-  4449, 41, 40, 4358, 4449, 41, 40, 4359, 
-  4449, 41, 40, 4361, 4449, 41, 40, 4363, 
-  4449, 41, 40, 4364, 4449, 41, 40, 4366, 
-  4449, 41, 40, 4367, 4449, 41, 40, 4368, 
-  4449, 41, 40, 4369, 4449, 41, 40, 4370, 
-  4449, 41, 40, 4364, 4462, 41, 40, 4363, 
-  4457, 4364, 4453, 4523, 41, 40, 4363, 4457, 
-  4370, 4462, 41, 40, 19968, 41, 40, 20108, 
-  41, 40, 19977, 41, 40, 22235, 41, 40, 
-  20116, 41, 40, 20845, 41, 40, 19971, 41, 
-  40, 20843, 41, 40, 20061, 41, 40, 21313, 
-  41, 40, 26376, 41, 40, 28779, 41, 40, 
-  27700, 41, 40, 26408, 41, 40, 37329, 41, 
-  40, 22303, 41, 40, 26085, 41, 40, 26666, 
-  41, 40, 26377, 41, 40, 31038, 41, 40, 
-  21517, 41, 40, 29305, 41, 40, 36001, 41, 
-  40, 31069, 41, 40, 21172, 41, 40, 20195, 
-  41, 40, 21628, 41, 40, 23398, 41, 40, 
-  30435, 41, 40, 20225, 41, 40, 36039, 41, 
-  40, 21332, 41, 40, 31085, 41, 40, 20241, 
-  41, 40, 33258, 41, 40, 33267, 41, 21839, 
-  24188, 31631, 80, 84, 69, 50, 49, 50, 
-  50, 50, 51, 50, 52, 50, 53, 50, 
-  54, 50, 55, 50, 56, 50, 57, 51, 
-  48, 51, 49, 51, 50, 51, 51, 51, 
-  52, 51, 53, 4352, 4449, 4354, 4449, 4355, 
-  4449, 4357, 4449, 4358, 4449, 4359, 4449, 4361, 
-  4449, 4363, 4449, 4364, 4449, 4366, 4449, 4367, 
-  4449, 4368, 4449, 4369, 4449, 4370, 4449, 4366, 
-  4449, 4535, 4352, 4457, 4364, 4462, 4363, 4468, 
-  4363, 4462, 20116, 20845, 19971, 20061, 26666, 26377, 
-  31038, 21517, 29305, 36001, 31069, 21172, 31192, 30007, 
-  36969, 20778, 21360, 27880, 38917, 20241, 20889, 27491, 
-  24038, 21491, 21307, 23447, 23398, 30435, 20225, 36039, 
-  21332, 22812, 51, 54, 51, 55, 51, 56, 
-  51, 57, 52, 48, 52, 49, 52, 50, 
-  52, 51, 52, 52, 52, 53, 52, 54, 
-  52, 55, 52, 56, 52, 57, 53, 48, 
-  49, 26376, 50, 26376, 51, 26376, 52, 26376, 
-  53, 26376, 54, 26376, 55, 26376, 56, 26376, 
-  57, 26376, 49, 48, 26376, 49, 49, 26376, 
-  49, 50, 26376, 72, 103, 101, 114, 103, 
-  101, 86, 76, 84, 68, 12450, 12452, 12454, 
-  12456, 12458, 12459, 12461, 12463, 12465, 12467, 12469, 
-  12471, 12473, 12475, 12477, 12479, 12481, 12484, 12486, 
-  12488, 12490, 12491, 12492, 12493, 12494, 12495, 12498, 
-  12501, 12504, 12507, 12510, 12511, 12512, 12513, 12514, 
-  12516, 12518, 12520, 12521, 12522, 12523, 12524, 12525, 
-  12527, 12528, 12529, 12530, 12450, 12497, 12540, 12488, 
-  12450, 12523, 12501, 12449, 12450, 12531, 12506, 12450, 
-  12450, 12540, 12523, 12452, 12491, 12531, 12464, 12452, 
-  12531, 12481, 12454, 12457, 12531, 12456, 12473, 12463, 
-  12540, 12489, 12456, 12540, 12459, 12540, 12458, 12531, 
-  12473, 12458, 12540, 12512, 12459, 12452, 12522, 12459, 
-  12521, 12483, 12488, 12459, 12525, 12522, 12540, 12460, 
-  12525, 12531, 12460, 12531, 12510, 12462, 12460, 12462, 
-  12491, 12540, 12461, 12517, 12522, 12540, 12462, 12523, 
-  12480, 12540, 12461, 12525, 12461, 12525, 12464, 12521, 
-  12512, 12461, 12525, 12513, 12540, 12488, 12523, 12461, 
-  12525, 12527, 12483, 12488, 12464, 12521, 12512, 12464, 
-  12521, 12512, 12488, 12531, 12463, 12523, 12476, 12452, 
-  12525, 12463, 12525, 12540, 12493, 12465, 12540, 12473, 
-  12467, 12523, 12490, 12467, 12540, 12509, 12469, 12452, 
-  12463, 12523, 12469, 12531, 12481, 12540, 12512, 12471, 
-  12522, 12531, 12464, 12475, 12531, 12481, 12475, 12531, 
-  12488, 12480, 12540, 12473, 12487, 12471, 12489, 12523, 
-  12488, 12531, 12490, 12494, 12494, 12483, 12488, 12495, 
-  12452, 12484, 12497, 12540, 12475, 12531, 12488, 12497, 
-  12540, 12484, 12496, 12540, 12524, 12523, 12500, 12450, 
-  12473, 12488, 12523, 12500, 12463, 12523, 12500, 12467, 
-  12499, 12523, 12501, 12449, 12521, 12483, 12489, 12501, 
-  12451, 12540, 12488, 12502, 12483, 12471, 12455, 12523, 
-  12501, 12521, 12531, 12504, 12463, 12479, 12540, 12523, 
-  12506, 12477, 12506, 12491, 12498, 12504, 12523, 12484, 
-  12506, 12531, 12473, 12506, 12540, 12472, 12505, 12540, 
-  12479, 12509, 12452, 12531, 12488, 12508, 12523, 12488, 
-  12507, 12531, 12509, 12531, 12489, 12507, 12540, 12523, 
-  12507, 12540, 12531, 12510, 12452, 12463, 12525, 12510, 
-  12452, 12523, 12510, 12483, 12495, 12510, 12523, 12463, 
-  12510, 12531, 12471, 12519, 12531, 12511, 12463, 12525, 
-  12531, 12511, 12522, 12511, 12522, 12496, 12540, 12523, 
-  12513, 12460, 12513, 12460, 12488, 12531, 12513, 12540, 
-  12488, 12523, 12516, 12540, 12489, 12516, 12540, 12523, 
-  12518, 12450, 12531, 12522, 12483, 12488, 12523, 12522, 
-  12521, 12523, 12500, 12540, 12523, 12540, 12502, 12523, 
-  12524, 12512, 12524, 12531, 12488, 12466, 12531, 12527, 
-  12483, 12488, 48, 28857, 49, 28857, 50, 28857, 
-  51, 28857, 52, 28857, 53, 28857, 54, 28857, 
-  55, 28857, 56, 28857, 57, 28857, 49, 48, 
-  28857, 49, 49, 28857, 49, 50, 28857, 49, 
-  51, 28857, 49, 52, 28857, 49, 53, 28857, 
-  49, 54, 28857, 49, 55, 28857, 49, 56, 
-  28857, 49, 57, 28857, 50, 48, 28857, 50, 
-  49, 28857, 50, 50, 28857, 50, 51, 28857, 
-  50, 52, 28857, 104, 80, 97, 100, 97, 
-  65, 85, 98, 97, 114, 111, 86, 112, 
-  99, 100, 109, 100, 109, 178, 100, 109, 
-  179, 73, 85, 24179, 25104, 26157, 21644, 22823, 
-  27491, 26126, 27835, 26666, 24335, 20250, 31038, 112, 
-  65, 110, 65, 956, 65, 109, 65, 107, 
-  65, 75, 66, 77, 66, 71, 66, 99, 
-  97, 108, 107, 99, 97, 108, 112, 70, 
-  110, 70, 956, 70, 956, 103, 109, 103, 
-  107, 103, 72, 122, 107, 72, 122, 77, 
-  72, 122, 71, 72, 122, 84, 72, 122, 
-  956, 8467, 109, 8467, 100, 8467, 107, 8467, 
-  102, 109, 110, 109, 956, 109, 109, 109, 
-  99, 109, 107, 109, 109, 109, 178, 99, 
-  109, 178, 109, 178, 107, 109, 178, 109, 
-  109, 179, 99, 109, 179, 109, 179, 107, 
-  109, 179, 109, 8725, 115, 109, 8725, 115, 
-  178, 80, 97, 107, 80, 97, 77, 80, 
-  97, 71, 80, 97, 114, 97, 100, 114, 
-  97, 100, 8725, 115, 114, 97, 100, 8725, 
-  115, 178, 112, 115, 110, 115, 956, 115, 
-  109, 115, 112, 86, 110, 86, 956, 86, 
-  109, 86, 107, 86, 77, 86, 112, 87, 
-  110, 87, 956, 87, 109, 87, 107, 87, 
-  77, 87, 107, 937, 77, 937, 97, 46, 
-  109, 46, 66, 113, 99, 99, 99, 100, 
-  67, 8725, 107, 103, 67, 111, 46, 100, 
-  66, 71, 121, 104, 97, 72, 80, 105, 
-  110, 75, 75, 75, 77, 107, 116, 108, 
-  109, 108, 110, 108, 111, 103, 108, 120, 
-  109, 98, 109, 105, 108, 109, 111, 108, 
-  80, 72, 112, 46, 109, 46, 80, 80, 
-  77, 80, 82, 115, 114, 83, 118, 87, 
-  98, 86, 8725, 109, 65, 8725, 109, 49, 
-  26085, 50, 26085, 51, 26085, 52, 26085, 53, 
-  26085, 54, 26085, 55, 26085, 56, 26085, 57, 
-  26085, 49, 48, 26085, 49, 49, 26085, 49, 
-  50, 26085, 49, 51, 26085, 49, 52, 26085, 
-  49, 53, 26085, 49, 54, 26085, 49, 55, 
-  26085, 49, 56, 26085, 49, 57, 26085, 50, 
-  48, 26085, 50, 49, 26085, 50, 50, 26085, 
-  50, 51, 26085, 50, 52, 26085, 50, 53, 
-  26085, 50, 54, 26085, 50, 55, 26085, 50, 
-  56, 26085, 50, 57, 26085, 51, 48, 26085, 
-  51, 49, 26085, 103, 97, 108, 42561, 42563, 
-  42565, 42567, 42569, 42573, 42575, 42577, 42579, 42581, 
-  42583, 42585, 42587, 42589, 42591, 42593, 42595, 42597, 
-  42599, 42601, 42603, 42605, 42625, 42627, 42629, 42631, 
-  42633, 42635, 42637, 42639, 42641, 42643, 42645, 42647, 
-  42649, 42651, 42787, 42789, 42791, 42793, 42795, 42797, 
-  42799, 42803, 42805, 42807, 42809, 42811, 42813, 42815, 
-  42817, 42819, 42821, 42823, 42825, 42827, 42829, 42831, 
-  42833, 42835, 42837, 42839, 42841, 42843, 42845, 42847, 
-  42849, 42851, 42853, 42855, 42857, 42859, 42861, 42863, 
-  42874, 42876, 7545, 42879, 42881, 42883, 42885, 42887, 
-  42892, 42897, 42899, 42903, 42905, 42907, 42909, 42911, 
-  42913, 42915, 42917, 42919, 42921, 620, 670, 647, 
-  43859, 42933, 42935, 294, 43831, 43858, 5024, 5025, 
-  5026, 5027, 5028, 5029, 5030, 5031, 5032, 5033, 
-  5034, 5035, 5036, 5037, 5038, 5039, 5040, 5041, 
-  5042, 5043, 5044, 5045, 5046, 5047, 5048, 5049, 
-  5050, 5051, 5052, 5053, 5054, 5055, 5056, 5057, 
-  5058, 5059, 5060, 5061, 5062, 5063, 5064, 5065, 
-  5066, 5067, 5068, 5069, 5070, 5071, 5072, 5073, 
-  5074, 5075, 5076, 5077, 5078, 5079, 5080, 5081, 
-  5082, 5083, 5084, 5085, 5086, 5087, 5088, 5089, 
-  5090, 5091, 5092, 5093, 5094, 5095, 5096, 5097, 
-  5098, 5099, 5100, 5101, 5102, 5103, 35912, 26356, 
-  36040, 28369, 20018, 21477, 22865, 21895, 22856, 25078, 
-  30313, 32645, 34367, 34746, 35064, 37007, 27138, 27931, 
-  28889, 29662, 33853, 37226, 39409, 20098, 21365, 27396, 
-  29211, 34349, 40478, 23888, 28651, 34253, 35172, 25289, 
-  33240, 34847, 24266, 26391, 28010, 29436, 37070, 20358, 
-  20919, 21214, 25796, 27347, 29200, 30439, 34310, 34396, 
-  36335, 38706, 39791, 40442, 30860, 31103, 32160, 33737, 
-  37636, 35542, 22751, 24324, 31840, 32894, 29282, 30922, 
-  36034, 38647, 22744, 23650, 27155, 28122, 28431, 32047, 
-  32311, 38475, 21202, 32907, 20956, 20940, 31260, 32190, 
-  33777, 38517, 35712, 25295, 35582, 20025, 23527, 24594, 
-  29575, 30064, 21271, 30971, 20415, 24489, 19981, 27852, 
-  25976, 32034, 21443, 22622, 30465, 33865, 35498, 27578, 
-  27784, 25342, 33509, 25504, 30053, 20142, 20841, 20937, 
-  26753, 31975, 33391, 35538, 37327, 21237, 21570, 24300, 
-  26053, 28670, 31018, 38317, 39530, 40599, 40654, 26310, 
-  27511, 36706, 24180, 24976, 25088, 25754, 28451, 29001, 
-  29833, 31178, 32244, 32879, 36646, 34030, 36899, 37706, 
-  21015, 21155, 21693, 28872, 35010, 24265, 24565, 25467, 
-  27566, 31806, 29557, 20196, 22265, 23994, 24604, 29618, 
-  29801, 32666, 32838, 37428, 38646, 38728, 38936, 20363, 
-  31150, 37300, 38584, 24801, 20102, 20698, 23534, 23615, 
-  26009, 29134, 30274, 34044, 36988, 26248, 38446, 21129, 
-  26491, 26611, 27969, 28316, 29705, 30041, 30827, 32016, 
-  39006, 25134, 38520, 20523, 23833, 28138, 36650, 24459, 
-  24900, 26647, 38534, 21033, 21519, 23653, 26131, 26446, 
-  26792, 27877, 29702, 30178, 32633, 35023, 35041, 38626, 
-  21311, 28346, 21533, 29136, 29848, 34298, 38563, 40023, 
-  40607, 26519, 28107, 33256, 31520, 31890, 29376, 28825, 
-  35672, 20160, 33590, 21050, 20999, 24230, 25299, 31958, 
-  23429, 27934, 26292, 36667, 38477, 24275, 20800, 21952, 
-  22618, 26228, 20958, 29482, 30410, 31036, 31070, 31077, 
-  31119, 38742, 31934, 34322, 35576, 36920, 37117, 39151, 
-  39164, 39208, 40372, 37086, 38583, 20398, 20711, 20813, 
-  21193, 21220, 21329, 21917, 22022, 22120, 22592, 22696, 
-  23652, 24724, 24936, 24974, 25074, 25935, 26082, 26257, 
-  26757, 28023, 28186, 28450, 29038, 29227, 29730, 30865, 
-  31049, 31048, 31056, 31062, 31117, 31118, 31296, 31361, 
-  31680, 32265, 32321, 32626, 32773, 33261, 33401, 33879, 
-  35088, 35222, 35585, 35641, 36051, 36104, 36790, 38627, 
-  38911, 38971, 24693, 55376, 57070, 33304, 20006, 20917, 
-  20840, 20352, 20805, 20864, 21191, 21242, 21845, 21913, 
-  21986, 22707, 22852, 22868, 23138, 23336, 24274, 24281, 
-  24425, 24493, 24792, 24910, 24840, 24928, 25140, 25540, 
-  25628, 25682, 25942, 26395, 26454, 28379, 28363, 28702, 
-  30631, 29237, 29359, 29809, 29958, 30011, 30237, 30239, 
-  30427, 30452, 30538, 30528, 30924, 31409, 31867, 32091, 
-  32574, 33618, 33775, 34681, 35137, 35206, 35519, 35531, 
-  35565, 35722, 36664, 36978, 37273, 37494, 38524, 38875, 
-  38923, 39698, 55370, 56394, 55370, 56388, 55372, 57301, 
-  15261, 16408, 16441, 55380, 56905, 55383, 56528, 55391, 
-  57043, 40771, 40846, 102, 102, 102, 105, 102, 
-  108, 102, 102, 105, 102, 102, 108, 383, 
-  116, 115, 116, 1396, 1398, 1396, 1381, 1396, 
-  1387, 1406, 1398, 1396, 1389, 1497, 1460, 1522, 
-  1463, 1506, 1492, 1499, 1500, 1501, 1512, 1514, 
-  1513, 1473, 1513, 1474, 64329, 1473, 64329, 1474, 
-  1488, 1463, 1488, 1464, 1488, 1468, 1489, 1468, 
-  1490, 1468, 1491, 1468, 1492, 1468, 1493, 1468, 
-  1494, 1468, 1496, 1468, 1497, 1468, 1498, 1468, 
-  1499, 1468, 1500, 1468, 1502, 1468, 1504, 1468, 
-  1505, 1468, 1507, 1468, 1508, 1468, 1510, 1468, 
-  1511, 1468, 1512, 1468, 1513, 1468, 1514, 1468, 
-  1493, 1465, 1489, 1471, 1499, 1471, 1508, 1471, 
-  1488, 1500, 1649, 1659, 1662, 1664, 1658, 1663, 
-  1657, 1700, 1702, 1668, 1667, 1670, 1671, 1677, 
-  1676, 1678, 1672, 1688, 1681, 1705, 1711, 1715, 
-  1713, 1722, 1723, 1728, 1729, 1726, 1746, 1747, 
-  1709, 1735, 1734, 1736, 1655, 1739, 1733, 1737, 
-  1744, 1609, 1574, 1575, 1574, 1749, 1574, 1608, 
-  1574, 1735, 1574, 1734, 1574, 1736, 1574, 1744, 
-  1574, 1609, 1740, 1574, 1580, 1574, 1581, 1574, 
-  1605, 1574, 1610, 1576, 1580, 1576, 1581, 1576, 
-  1582, 1576, 1605, 1576, 1609, 1576, 1610, 1578, 
-  1580, 1578, 1581, 1578, 1582, 1578, 1605, 1578, 
-  1609, 1578, 1610, 1579, 1580, 1579, 1605, 1579, 
-  1609, 1579, 1610, 1580, 1581, 1580, 1605, 1581, 
-  1580, 1581, 1605, 1582, 1580, 1582, 1581, 1582, 
-  1605, 1587, 1580, 1587, 1581, 1587, 1582, 1587, 
-  1605, 1589, 1581, 1589, 1605, 1590, 1580, 1590, 
-  1581, 1590, 1582, 1590, 1605, 1591, 1581, 1591, 
-  1605, 1592, 1605, 1593, 1580, 1593, 1605, 1594, 
-  1580, 1594, 1605, 1601, 1580, 1601, 1581, 1601, 
-  1582, 1601, 1605, 1601, 1609, 1601, 1610, 1602, 
-  1581, 1602, 1605, 1602, 1609, 1602, 1610, 1603, 
-  1575, 1603, 1580, 1603, 1581, 1603, 1582, 1603, 
-  1604, 1603, 1605, 1603, 1609, 1603, 1610, 1604, 
-  1580, 1604, 1581, 1604, 1582, 1604, 1605, 1604, 
-  1609, 1604, 1610, 1605, 1580, 1605, 1581, 1605, 
-  1582, 1605, 1605, 1605, 1609, 1605, 1610, 1606, 
-  1580, 1606, 1581, 1606, 1582, 1606, 1605, 1606, 
-  1609, 1606, 1610, 1607, 1580, 1607, 1605, 1607, 
-  1609, 1607, 1610, 1610, 1580, 1610, 1581, 1610, 
-  1582, 1610, 1605, 1610, 1609, 1610, 1610, 1584, 
-  1648, 1585, 1648, 1609, 1648, 32, 1612, 1617, 
-  32, 1613, 1617, 32, 1614, 1617, 32, 1615, 
-  1617, 32, 1616, 1617, 32, 1617, 1648, 1574, 
-  1585, 1574, 1586, 1574, 1606, 1576, 1585, 1576, 
-  1586, 1576, 1606, 1578, 1585, 1578, 1586, 1578, 
-  1606, 1579, 1585, 1579, 1586, 1579, 1606, 1605, 
-  1575, 1606, 1585, 1606, 1586, 1606, 1606, 1610, 
-  1585, 1610, 1586, 1610, 1606, 1574, 1582, 1574, 
-  1607, 1576, 1607, 1578, 1607, 1589, 1582, 1604, 
-  1607, 1606, 1607, 1607, 1648, 1610, 1607, 1579, 
-  1607, 1587, 1607, 1588, 1605, 1588, 1607, 1600, 
-  1614, 1617, 1600, 1615, 1617, 1600, 1616, 1617, 
-  1591, 1609, 1591, 1610, 1593, 1609, 1593, 1610, 
-  1594, 1609, 1594, 1610, 1587, 1609, 1587, 1610, 
-  1588, 1609, 1588, 1610, 1581, 1609, 1581, 1610, 
-  1580, 1609, 1580, 1610, 1582, 1609, 1582, 1610, 
-  1589, 1609, 1589, 1610, 1590, 1609, 1590, 1610, 
-  1588, 1580, 1588, 1581, 1588, 1582, 1588, 1585, 
-  1587, 1585, 1589, 1585, 1590, 1585, 1575, 1611, 
-  1578, 1580, 1605, 1578, 1581, 1580, 1578, 1581, 
-  1605, 1578, 1582, 1605, 1578, 1605, 1580, 1578, 
-  1605, 1581, 1578, 1605, 1582, 1580, 1605, 1581, 
-  1581, 1605, 1610, 1581, 1605, 1609, 1587, 1581, 
-  1580, 1587, 1580, 1581, 1587, 1580, 1609, 1587, 
-  1605, 1581, 1587, 1605, 1580, 1587, 1605, 1605, 
-  1589, 1581, 1581, 1589, 1605, 1605, 1588, 1581, 
-  1605, 1588, 1580, 1610, 1588, 1605, 1582, 1588, 
-  1605, 1605, 1590, 1581, 1609, 1590, 1582, 1605, 
-  1591, 1605, 1581, 1591, 1605, 1605, 1591, 1605, 
-  1610, 1593, 1580, 1605, 1593, 1605, 1605, 1593, 
-  1605, 1609, 1594, 1605, 1605, 1594, 1605, 1610, 
-  1594, 1605, 1609, 1601, 1582, 1605, 1602, 1605, 
-  1581, 1602, 1605, 1605, 1604, 1581, 1605, 1604, 
-  1581, 1610, 1604, 1581, 1609, 1604, 1580, 1580, 
-  1604, 1582, 1605, 1604, 1605, 1581, 1605, 1581, 
-  1580, 1605, 1581, 1605, 1605, 1581, 1610, 1605, 
-  1580, 1581, 1605, 1580, 1605, 1605, 1582, 1580, 
-  1605, 1582, 1605, 1605, 1580, 1582, 1607, 1605, 
-  1580, 1607, 1605, 1605, 1606, 1581, 1605, 1606, 
-  1581, 1609, 1606, 1580, 1605, 1606, 1580, 1609, 
-  1606, 1605, 1610, 1606, 1605, 1609, 1610, 1605, 
-  1605, 1576, 1582, 1610, 1578, 1580, 1610, 1578, 
-  1580, 1609, 1578, 1582, 1610, 1578, 1582, 1609, 
-  1578, 1605, 1610, 1578, 1605, 1609, 1580, 1605, 
-  1610, 1580, 1581, 1609, 1580, 1605, 1609, 1587, 
-  1582, 1609, 1589, 1581, 1610, 1588, 1581, 1610, 
-  1590, 1581, 1610, 1604, 1580, 1610, 1604, 1605, 
-  1610, 1610, 1581, 1610, 1610, 1580, 1610, 1610, 
-  1605, 1610, 1605, 1605, 1610, 1602, 1605, 1610, 
-  1606, 1581, 1610, 1593, 1605, 1610, 1603, 1605, 
-  1610, 1606, 1580, 1581, 1605, 1582, 1610, 1604, 
-  1580, 1605, 1603, 1605, 1605, 1580, 1581, 1610, 
-  1581, 1580, 1610, 1605, 1580, 1610, 1601, 1605, 
-  1610, 1576, 1581, 1610, 1587, 1582, 1610, 1606, 
-  1580, 1610, 1589, 1604, 1746, 1602, 1604, 1746, 
-  1575, 1604, 1604, 1607, 1575, 1603, 1576, 1585, 
-  1605, 1581, 1605, 1583, 1589, 1604, 1593, 1605, 
-  1585, 1587, 1608, 1604, 1593, 1604, 1610, 1607, 
-  1608, 1587, 1604, 1605, 1589, 1604, 1609, 17, 
-  1589, 1604, 1609, 32, 1575, 1604, 1604, 1607, 
-  32, 1593, 1604, 1610, 1607, 32, 1608, 1587, 
-  1604, 1605, 7, 1580, 1604, 32, 1580, 1604, 
-  1575, 1604, 1607, 1585, 1740, 1575, 1604, 44, 
-  12289, 12290, 58, 33, 63, 12310, 12311, 8230, 
-  8229, 8212, 8211, 95, 123, 125, 12308, 12309, 
-  12304, 12305, 12298, 12299, 12300, 12301, 12302, 12303, 
-  91, 93, 8254, 35, 38, 42, 45, 60, 
-  62, 92, 36, 37, 64, 32, 1611, 1600, 
-  1611, 32, 1612, 32, 1613, 32, 1614, 1600, 
-  1614, 32, 1615, 1600, 1615, 32, 1616, 1600, 
-  1616, 32, 1617, 1600, 1617, 32, 1618, 1600, 
-  1618, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 
-  1576, 1577, 1578, 1579, 1580, 1581, 1582, 1583, 
-  1584, 1585, 1586, 1587, 1588, 1589, 1590, 1591, 
-  1592, 1593, 1594, 1601, 1602, 1603, 1604, 1605, 
-  1606, 1607, 1608, 1610, 1604, 1570, 1604, 1571, 
-  1604, 1573, 1604, 1575, 34, 39, 47, 65345, 
-  65346, 65347, 65348, 65349, 65350, 65351, 65352, 65353, 
-  65354, 65355, 65356, 65357, 65358, 65359, 65360, 65361, 
-  65362, 65363, 65364, 65365, 65366, 65367, 65368, 65369, 
-  65370, 94, 124, 126, 10629, 10630, 12539, 12449, 
-  12451, 12453, 12455, 12457, 12515, 12517, 12519, 12483, 
-  12540, 12531, 12441, 12442, 12644, 12593, 12594, 12595, 
-  12596, 12597, 12598, 12599, 12600, 12601, 12602, 12603, 
-  12604, 12605, 12606, 12607, 12608, 12609, 12610, 12611, 
-  12612, 12613, 12614, 12615, 12616, 12617, 12618, 12619, 
-  12620, 12621, 12622, 12623, 12624, 12625, 12626, 12627, 
-  12628, 12629, 12630, 12631, 12632, 12633, 12634, 12635, 
-  12636, 12637, 12638, 12639, 12640, 12641, 12642, 12643, 
-  162, 163, 172, 175, 166, 165, 8361, 9474, 
-  8592, 8593, 8594, 8595, 9632, 9675, 55297, 56360, 
-  55297, 56361, 55297, 56362, 55297, 56363, 55297, 56364, 
-  55297, 56365, 55297, 56366, 55297, 56367, 55297, 56368, 
-  55297, 56369, 55297, 56370, 55297, 56371, 55297, 56372, 
-  55297, 56373, 55297, 56374, 55297, 56375, 55297, 56376, 
-  55297, 56377, 55297, 56378, 55297, 56379, 55297, 56380, 
-  55297, 56381, 55297, 56382, 55297, 56383, 55297, 56384, 
-  55297, 56385, 55297, 56386, 55297, 56387, 55297, 56388, 
-  55297, 56389, 55297, 56390, 55297, 56391, 55297, 56392, 
-  55297, 56393, 55297, 56394, 55297, 56395, 55297, 56396, 
-  55297, 56397, 55297, 56398, 55297, 56399, 55297, 56536, 
-  55297, 56537, 55297, 56538, 55297, 56539, 55297, 56540, 
-  55297, 56541, 55297, 56542, 55297, 56543, 55297, 56544, 
-  55297, 56545, 55297, 56546, 55297, 56547, 55297, 56548, 
-  55297, 56549, 55297, 56550, 55297, 56551, 55297, 56552, 
-  55297, 56553, 55297, 56554, 55297, 56555, 55297, 56556, 
-  55297, 56557, 55297, 56558, 55297, 56559, 55297, 56560, 
-  55297, 56561, 55297, 56562, 55297, 56563, 55297, 56564, 
-  55297, 56565, 55297, 56566, 55297, 56567, 55297, 56568, 
-  55297, 56569, 55297, 56570, 55297, 56571, 55299, 56512, 
-  55299, 56513, 55299, 56514, 55299, 56515, 55299, 56516, 
-  55299, 56517, 55299, 56518, 55299, 56519, 55299, 56520, 
-  55299, 56521, 55299, 56522, 55299, 56523, 55299, 56524, 
-  55299, 56525, 55299, 56526, 55299, 56527, 55299, 56528, 
-  55299, 56529, 55299, 56530, 55299, 56531, 55299, 56532, 
-  55299, 56533, 55299, 56534, 55299, 56535, 55299, 56536, 
-  55299, 56537, 55299, 56538, 55299, 56539, 55299, 56540, 
-  55299, 56541, 55299, 56542, 55299, 56543, 55299, 56544, 
-  55299, 56545, 55299, 56546, 55299, 56547, 55299, 56548, 
-  55299, 56549, 55299, 56550, 55299, 56551, 55299, 56552, 
-  55299, 56553, 55299, 56554, 55299, 56555, 55299, 56556, 
-  55299, 56557, 55299, 56558, 55299, 56559, 55299, 56560, 
-  55299, 56561, 55299, 56562, 55300, 56473, 55300, 56506, 
-  55300, 56475, 55300, 56506, 55300, 56485, 55300, 56506, 
-  55300, 56625, 55300, 56615, 55300, 56626, 55300, 56615, 
-  55300, 57159, 55300, 57150, 55300, 57159, 55300, 57175, 
-  55301, 56505, 55301, 56506, 55301, 56505, 55301, 56496, 
-  55301, 56505, 55301, 56509, 55301, 56760, 55301, 56751, 
-  55301, 56761, 55301, 56751, 55302, 56512, 55302, 56513, 
-  55302, 56514, 55302, 56515, 55302, 56516, 55302, 56517, 
-  55302, 56518, 55302, 56519, 55302, 56520, 55302, 56521, 
-  55302, 56522, 55302, 56523, 55302, 56524, 55302, 56525, 
-  55302, 56526, 55302, 56527, 55302, 56528, 55302, 56529, 
-  55302, 56530, 55302, 56531, 55302, 56532, 55302, 56533, 
-  55302, 56534, 55302, 56535, 55302, 56536, 55302, 56537, 
-  55302, 56538, 55302, 56539, 55302, 56540, 55302, 56541, 
-  55302, 56542, 55302, 56543, 55348, 56663, 55348, 56677, 
-  55348, 56664, 55348, 56677, 55348, 56671, 55348, 56686, 
-  55348, 56671, 55348, 56687, 55348, 56671, 55348, 56688, 
-  55348, 56671, 55348, 56689, 55348, 56671, 55348, 56690, 
-  55348, 56761, 55348, 56677, 55348, 56762, 55348, 56677, 
-  55348, 56763, 55348, 56686, 55348, 56764, 55348, 56686, 
-  55348, 56763, 55348, 56687, 55348, 56764, 55348, 56687, 
-  305, 567, 913, 914, 916, 917, 918, 919, 
-  921, 922, 923, 924, 925, 926, 927, 929, 
-  1012, 932, 934, 935, 936, 8711, 8706, 1013, 
-  977, 1008, 981, 1009, 982, 988, 55354, 56610, 
-  55354, 56611, 55354, 56612, 55354, 56613, 55354, 56614, 
-  55354, 56615, 55354, 56616, 55354, 56617, 55354, 56618, 
-  55354, 56619, 55354, 56620, 55354, 56621, 55354, 56622, 
-  55354, 56623, 55354, 56624, 55354, 56625, 55354, 56626, 
-  55354, 56627, 55354, 56628, 55354, 56629, 55354, 56630, 
-  55354, 56631, 55354, 56632, 55354, 56633, 55354, 56634, 
-  55354, 56635, 55354, 56636, 55354, 56637, 55354, 56638, 
-  55354, 56639, 55354, 56640, 55354, 56641, 55354, 56642, 
-  55354, 56643, 1646, 1697, 1647, 48, 46, 48, 
-  44, 49, 44, 50, 44, 51, 44, 52, 
-  44, 53, 44, 54, 44, 55, 44, 56, 
-  44, 57, 44, 40, 65, 41, 40, 66, 
-  41, 40, 67, 41, 40, 68, 41, 40, 
-  69, 41, 40, 70, 41, 40, 71, 41, 
-  40, 72, 41, 40, 73, 41, 40, 74, 
-  41, 40, 75, 41, 40, 76, 41, 40, 
-  77, 41, 40, 78, 41, 40, 79, 41, 
-  40, 80, 41, 40, 81, 41, 40, 82, 
-  41, 40, 83, 41, 40, 84, 41, 40, 
-  85, 41, 40, 86, 41, 40, 87, 41, 
-  40, 88, 41, 40, 89, 41, 40, 90, 
-  41, 12308, 83, 12309, 67, 68, 87, 90, 
-  72, 86, 83, 68, 83, 83, 80, 80, 
-  86, 87, 67, 77, 67, 77, 68, 68, 
-  74, 12411, 12363, 12467, 12467, 23383, 21452, 12487, 
-  22810, 35299, 20132, 26144, 28961, 21069, 24460, 20877, 
-  26032, 21021, 32066, 36009, 22768, 21561, 28436, 25237, 
-  25429, 36938, 25351, 25171, 31105, 31354, 21512, 28288, 
-  30003, 21106, 21942, 37197, 12308, 26412, 12309, 12308, 
-  19977, 12309, 12308, 20108, 12309, 12308, 23433, 12309, 
-  12308, 28857, 12309, 12308, 25171, 12309, 12308, 30423, 
-  12309, 12308, 21213, 12309, 12308, 25943, 12309, 24471, 
-  21487, 20029, 20024, 20033, 55360, 56610, 20320, 20411, 
-  20482, 20602, 20633, 20687, 13470, 55361, 56890, 20820, 
-  20836, 20855, 55361, 56604, 13497, 20839, 55361, 56651, 
-  20887, 20900, 20172, 20908, 55396, 56799, 20995, 13535, 
-  21051, 21062, 21111, 13589, 21253, 21254, 21321, 21338, 
-  21363, 21373, 21375, 55362, 56876, 28784, 21450, 21471, 
-  55362, 57187, 21483, 21489, 21510, 21662, 21560, 21576, 
-  21608, 21666, 21750, 21776, 21843, 21859, 21892, 21931, 
-  21939, 21954, 22294, 22295, 22097, 22132, 22766, 22478, 
-  22516, 22541, 22411, 22578, 22577, 22700, 55365, 56548, 
-  22770, 22775, 22790, 22818, 22882, 55365, 57000, 55365, 
-  57066, 23020, 23067, 23079, 23000, 23142, 14062, 14076, 
-  23304, 23358, 55366, 56776, 23491, 23512, 23539, 55366, 
-  57112, 23551, 23558, 24403, 14209, 23648, 23744, 23693, 
-  55367, 56804, 23875, 55367, 56806, 23918, 23915, 23932, 
-  24033, 24034, 14383, 24061, 24104, 24125, 24169, 14434, 
-  55368, 56707, 14460, 24240, 24243, 24246, 55400, 57234, 
-  55368, 57137, 33281, 24354, 14535, 55372, 57016, 55384, 
-  56794, 24418, 24427, 14563, 24474, 24525, 24535, 24569, 
-  24705, 14650, 14620, 55369, 57044, 24775, 24904, 24908, 
-  24954, 25010, 24996, 25007, 25054, 25104, 25115, 25181, 
-  25265, 25300, 25424, 55370, 57100, 25405, 25340, 25448, 
-  25475, 25572, 55370, 57329, 25634, 25541, 25513, 14894, 
-  25705, 25726, 25757, 25719, 14956, 25964, 55372, 56330, 
-  26083, 26360, 26185, 15129, 15112, 15076, 20882, 20885, 
-  26368, 26268, 32941, 17369, 26401, 26462, 26451, 55372, 
-  57283, 15177, 26618, 26501, 26706, 55373, 56429, 26766, 
-  26655, 26900, 26946, 27043, 27114, 27304, 55373, 56995, 
-  27355, 15384, 27425, 55374, 56487, 27476, 15438, 27506, 
-  27551, 27579, 55374, 56973, 55367, 56587, 55374, 57082, 
-  27726, 55375, 56508, 27839, 27853, 27751, 27926, 27966, 
-  28009, 28024, 28037, 55375, 56606, 27956, 28207, 28270, 
-  15667, 28359, 55375, 57041, 28153, 28526, 55375, 57182, 
-  55375, 57230, 28614, 28729, 28699, 15766, 28746, 28797, 
-  28791, 28845, 55361, 56613, 28997, 55376, 56931, 29084, 
-  55376, 57259, 29224, 29264, 55377, 56840, 29312, 29333, 
-  55377, 57141, 55378, 56340, 29562, 29579, 16044, 29605, 
-  16056, 29767, 29788, 29829, 29898, 16155, 29988, 55379, 
-  56374, 30014, 55379, 56466, 55368, 56735, 30224, 55379, 
-  57249, 55379, 57272, 55380, 56388, 16380, 16392, 55380, 
-  56563, 55380, 56562, 55380, 56601, 55380, 56627, 30494, 
-  30495, 30603, 16454, 16534, 55381, 56349, 30798, 16611, 
-  55381, 56870, 55381, 56986, 55381, 57029, 31211, 16687, 
-  31306, 31311, 55382, 56700, 55382, 56999, 31470, 16898, 
-  55382, 57259, 31686, 31689, 16935, 55383, 56448, 31954, 
-  17056, 31976, 31971, 32000, 55383, 57222, 32099, 17153, 
-  32199, 32258, 32325, 17204, 55384, 56872, 55384, 56903, 
-  17241, 55384, 57049, 32634, 55384, 57150, 32661, 32762, 
-  55385, 56538, 55385, 56611, 32864, 55385, 56744, 32880, 
-  55372, 57183, 17365, 32946, 33027, 17419, 33086, 23221, 
-  55385, 57255, 55385, 57269, 55372, 57235, 55372, 57244, 
-  33284, 36766, 17515, 33425, 33419, 33437, 21171, 33457, 
-  33459, 33469, 33510, 55386, 57148, 33565, 33635, 33709, 
-  33571, 33725, 33767, 33619, 33738, 33740, 33756, 55387, 
-  56374, 55387, 56683, 55387, 56533, 17707, 34033, 34035, 
-  34070, 55388, 57290, 34148, 55387, 57132, 17757, 17761, 
-  55387, 57265, 55388, 56530, 17771, 34384, 34407, 34409, 
-  34473, 34440, 34574, 34530, 34600, 34667, 34694, 17879, 
-  34785, 34817, 17913, 34912, 55389, 56935, 35031, 35038, 
-  17973, 35066, 13499, 55390, 56494, 55390, 56678, 18110, 
-  18119, 35488, 55391, 56488, 36011, 36033, 36123, 36215, 
-  55391, 57135, 55362, 56324, 36299, 36284, 36336, 55362, 
-  56542, 36564, 55393, 56786, 55393, 56813, 37012, 37105, 
-  37137, 55393, 57134, 37147, 37432, 37591, 37592, 37500, 
-  37881, 37909, 55394, 57338, 38283, 18837, 38327, 55395, 
-  56695, 18918, 38595, 23986, 38691, 55396, 56645, 55396, 
-  56858, 19054, 19062, 38880, 55397, 56330, 19122, 55397, 
-  56470, 38953, 55397, 56758, 39138, 19251, 39209, 39335, 
-  39362, 39422, 19406, 55398, 57136, 40000, 40189, 19662, 
-  19693, 40295, 55400, 56526, 19704, 55400, 56581, 55400, 
-  56846, 55400, 56977, 19798, 40702, 40709, 40719, 40726, 
-  55401, 56832, 192, 193, 194, 195, 196, 199, 
-  200, 201, 202, 203, 204, 205, 206, 207, 
-  208, 209, 210, 211, 212, 213, 214, 216, 
-  217, 218, 219, 220, 221, 222, 376, 256, 
-  258, 260, 262, 264, 266, 268, 270, 272, 
-  274, 276, 278, 280, 282, 284, 286, 288, 
-  290, 292, 296, 298, 300, 302, 306, 308, 
-  310, 313, 315, 317, 319, 321, 323, 325, 
-  327, 330, 332, 334, 336, 338, 340, 342, 
-  344, 346, 348, 350, 352, 354, 356, 358, 
-  360, 362, 364, 366, 368, 370, 372, 374, 
-  377, 379, 381, 579, 386, 388, 391, 395, 
-  401, 502, 408, 573, 544, 416, 418, 420, 
-  423, 428, 431, 435, 437, 440, 444, 503, 
-  453, 452, 456, 455, 459, 458, 461, 463, 
-  465, 467, 469, 471, 473, 475, 478, 480, 
-  482, 484, 486, 488, 490, 492, 494, 498, 
-  497, 500, 504, 506, 508, 510, 512, 514, 
-  516, 518, 520, 522, 524, 526, 528, 530, 
-  532, 534, 536, 538, 540, 542, 548, 550, 
-  552, 554, 556, 558, 560, 562, 571, 11390, 
-  11391, 577, 582, 584, 586, 588, 590, 11375, 
-  11373, 11376, 385, 390, 393, 394, 399, 42923, 
-  403, 42924, 404, 42893, 42922, 407, 406, 42926, 
-  11362, 42925, 412, 11374, 413, 415, 11364, 422, 
-  425, 42929, 430, 580, 433, 434, 581, 439, 
-  42930, 42928, 880, 882, 886, 1021, 1022, 1023, 
-  938, 939, 975, 984, 986, 990, 992, 994, 
-  996, 998, 1000, 1002, 1004, 1006, 1017, 895, 
-  1015, 1018, 1040, 1041, 1042, 1043, 1044, 1045, 
-  1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 
-  1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 
-  1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 
-  1070, 1071, 1024, 1025, 1026, 1027, 1028, 1029, 
-  1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 
-  1038, 1039, 1120, 1122, 1124, 1126, 1128, 1130, 
-  1132, 1134, 1136, 1138, 1140, 1142, 1144, 1146, 
-  1148, 1150, 1152, 1162, 1164, 1166, 1168, 1170, 
-  1172, 1174, 1176, 1178, 1180, 1182, 1184, 1186, 
-  1188, 1190, 1192, 1194, 1196, 1198, 1200, 1202, 
-  1204, 1206, 1208, 1210, 1212, 1214, 1217, 1219, 
-  1221, 1223, 1225, 1227, 1229, 1216, 1232, 1234, 
-  1236, 1238, 1240, 1242, 1244, 1246, 1248, 1250, 
-  1252, 1254, 1256, 1258, 1260, 1262, 1264, 1266, 
-  1268, 1270, 1272, 1274, 1276, 1278, 1280, 1282, 
-  1284, 1286, 1288, 1290, 1292, 1294, 1296, 1298, 
-  1300, 1302, 1304, 1306, 1308, 1310, 1312, 1314, 
-  1316, 1318, 1320, 1322, 1324, 1326, 1329, 1330, 
-  1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 
-  1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 
-  1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354, 
-  1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 
-  1363, 1364, 1365, 1366, 43888, 43889, 43890, 43891, 
-  43892, 43893, 43894, 43895, 43896, 43897, 43898, 43899, 
-  43900, 43901, 43902, 43903, 43904, 43905, 43906, 43907, 
-  43908, 43909, 43910, 43911, 43912, 43913, 43914, 43915, 
-  43916, 43917, 43918, 43919, 43920, 43921, 43922, 43923, 
-  43924, 43925, 43926, 43927, 43928, 43929, 43930, 43931, 
-  43932, 43933, 43934, 43935, 43936, 43937, 43938, 43939, 
-  43940, 43941, 43942, 43943, 43944, 43945, 43946, 43947, 
-  43948, 43949, 43950, 43951, 43952, 43953, 43954, 43955, 
-  43956, 43957, 43958, 43959, 43960, 43961, 43962, 43963, 
-  43964, 43965, 43966, 43967, 5112, 5113, 5114, 5115, 
-  5116, 5117, 42570, 42877, 11363, 7680, 7682, 7684, 
-  7686, 7688, 7690, 7692, 7694, 7696, 7698, 7700, 
-  7702, 7704, 7706, 7708, 7710, 7712, 7714, 7716, 
-  7718, 7720, 7722, 7724, 7726, 7728, 7730, 7732, 
-  7734, 7736, 7738, 7740, 7742, 7744, 7746, 7748, 
-  7750, 7752, 7754, 7756, 7758, 7760, 7762, 7764, 
-  7766, 7768, 7770, 7772, 7774, 7776, 7778, 7780, 
-  7782, 7784, 7786, 7788, 7790, 7792, 7794, 7796, 
-  7798, 7800, 7802, 7804, 7806, 7808, 7810, 7812, 
-  7814, 7816, 7818, 7820, 7822, 7824, 7826, 7828, 
-  7840, 7842, 7844, 7846, 7848, 7850, 7852, 7854, 
-  7856, 7858, 7860, 7862, 7864, 7866, 7868, 7870, 
-  7872, 7874, 7876, 7878, 7880, 7882, 7884, 7886, 
-  7888, 7890, 7892, 7894, 7896, 7898, 7900, 7902, 
-  7904, 7906, 7908, 7910, 7912, 7914, 7916, 7918, 
-  7920, 7922, 7924, 7926, 7928, 7930, 7932, 7934, 
-  7944, 7945, 7946, 7947, 7948, 7949, 7950, 7951, 
-  7960, 7961, 7962, 7963, 7964, 7965, 7976, 7977, 
-  7978, 7979, 7980, 7981, 7982, 7983, 7992, 7993, 
-  7994, 7995, 7996, 7997, 7998, 7999, 8008, 8009, 
-  8010, 8011, 8012, 8013, 8025, 8027, 8029, 8031, 
-  8040, 8041, 8042, 8043, 8044, 8045, 8046, 8047, 
-  8122, 8123, 8136, 8137, 8138, 8139, 8154, 8155, 
-  8184, 8185, 8170, 8171, 8186, 8187, 8072, 8073, 
-  8074, 8075, 8076, 8077, 8078, 8079, 8088, 8089, 
-  8090, 8091, 8092, 8093, 8094, 8095, 8104, 8105, 
-  8106, 8107, 8108, 8109, 8110, 8111, 8120, 8121, 
-  8124, 8140, 8152, 8153, 8168, 8169, 8172, 8188, 
-  8498, 8544, 8545, 8546, 8547, 8548, 8549, 8550, 
-  8551, 8552, 8553, 8554, 8555, 8556, 8557, 8558, 
-  8559, 8579, 9398, 9399, 9400, 9401, 9402, 9403, 
-  9404, 9405, 9406, 9407, 9408, 9409, 9410, 9411, 
-  9412, 9413, 9414, 9415, 9416, 9417, 9418, 9419, 
-  9420, 9421, 9422, 9423, 11264, 11265, 11266, 11267, 
-  11268, 11269, 11270, 11271, 11272, 11273, 11274, 11275, 
-  11276, 11277, 11278, 11279, 11280, 11281, 11282, 11283, 
-  11284, 11285, 11286, 11287, 11288, 11289, 11290, 11291, 
-  11292, 11293, 11294, 11295, 11296, 11297, 11298, 11299, 
-  11300, 11301, 11302, 11303, 11304, 11305, 11306, 11307, 
-  11308, 11309, 11310, 11360, 570, 574, 11367, 11369, 
-  11371, 11378, 11381, 11392, 11394, 11396, 11398, 11400, 
-  11402, 11404, 11406, 11408, 11410, 11412, 11414, 11416, 
-  11418, 11420, 11422, 11424, 11426, 11428, 11430, 11432, 
-  11434, 11436, 11438, 11440, 11442, 11444, 11446, 11448, 
-  11450, 11452, 11454, 11456, 11458, 11460, 11462, 11464, 
-  11466, 11468, 11470, 11472, 11474, 11476, 11478, 11480, 
-  11482, 11484, 11486, 11488, 11490, 11499, 11501, 11506, 
-  4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 
-  4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271, 
-  4272, 4273, 4274, 4275, 4276, 4277, 4278, 4279, 
-  4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 
-  4288, 4289, 4290, 4291, 4292, 4293, 4295, 4301, 
-  42560, 42562, 42564, 42566, 42568, 42572, 42574, 42576, 
-  42578, 42580, 42582, 42584, 42586, 42588, 42590, 42592, 
-  42594, 42596, 42598, 42600, 42602, 42604, 42624, 42626, 
-  42628, 42630, 42632, 42634, 42636, 42638, 42640, 42642, 
-  42644, 42646, 42648, 42650, 42786, 42788, 42790, 42792, 
-  42794, 42796, 42798, 42802, 42804, 42806, 42808, 42810, 
-  42812, 42814, 42816, 42818, 42820, 42822, 42824, 42826, 
-  42828, 42830, 42832, 42834, 42836, 42838, 42840, 42842, 
-  42844, 42846, 42848, 42850, 42852, 42854, 42856, 42858, 
-  42860, 42862, 42873, 42875, 42878, 42880, 42882, 42884, 
-  42886, 42891, 42896, 42898, 42902, 42904, 42906, 42908, 
-  42910, 42912, 42914, 42916, 42918, 42920, 42932, 42934, 
-  42931, 65313, 65314, 65315, 65316, 65317, 65318, 65319, 
-  65320, 65321, 65322, 65323, 65324, 65325, 65326, 65327, 
-  65328, 65329, 65330, 65331, 65332, 65333, 65334, 65335, 
-  65336, 65337, 65338, 55297, 56320, 55297, 56321, 55297, 
-  56322, 55297, 56323, 55297, 56324, 55297, 56325, 55297, 
-  56326, 55297, 56327, 55297, 56328, 55297, 56329, 55297, 
-  56330, 55297, 56331, 55297, 56332, 55297, 56333, 55297, 
-  56334, 55297, 56335, 55297, 56336, 55297, 56337, 55297, 
-  56338, 55297, 56339, 55297, 56340, 55297, 56341, 55297, 
-  56342, 55297, 56343, 55297, 56344, 55297, 56345, 55297, 
-  56346, 55297, 56347, 55297, 56348, 55297, 56349, 55297, 
-  56350, 55297, 56351, 55297, 56352, 55297, 56353, 55297, 
-  56354, 55297, 56355, 55297, 56356, 55297, 56357, 55297, 
-  56358, 55297, 56359, 55297, 56496, 55297, 56497, 55297, 
-  56498, 55297, 56499, 55297, 56500, 55297, 56501, 55297, 
-  56502, 55297, 56503, 55297, 56504, 55297, 56505, 55297, 
-  56506, 55297, 56507, 55297, 56508, 55297, 56509, 55297, 
-  56510, 55297, 56511, 55297, 56512, 55297, 56513, 55297, 
-  56514, 55297, 56515, 55297, 56516, 55297, 56517, 55297, 
-  56518, 55297, 56519, 55297, 56520, 55297, 56521, 55297, 
-  56522, 55297, 56523, 55297, 56524, 55297, 56525, 55297, 
-  56526, 55297, 56527, 55297, 56528, 55297, 56529, 55297, 
-  56530, 55297, 56531, 55299, 56448, 55299, 56449, 55299, 
-  56450, 55299, 56451, 55299, 56452, 55299, 56453, 55299, 
-  56454, 55299, 56455, 55299, 56456, 55299, 56457, 55299, 
-  56458, 55299, 56459, 55299, 56460, 55299, 56461, 55299, 
-  56462, 55299, 56463, 55299, 56464, 55299, 56465, 55299, 
-  56466, 55299, 56467, 55299, 56468, 55299, 56469, 55299, 
-  56470, 55299, 56471, 55299, 56472, 55299, 56473, 55299, 
-  56474, 55299, 56475, 55299, 56476, 55299, 56477, 55299, 
-  56478, 55299, 56479, 55299, 56480, 55299, 56481, 55299, 
-  56482, 55299, 56483, 55299, 56484, 55299, 56485, 55299, 
-  56486, 55299, 56487, 55299, 56488, 55299, 56489, 55299, 
-  56490, 55299, 56491, 55299, 56492, 55299, 56493, 55299, 
-  56494, 55299, 56495, 55299, 56496, 55299, 56497, 55299, 
-  56498, 55302, 56480, 55302, 56481, 55302, 56482, 55302, 
-  56483, 55302, 56484, 55302, 56485, 55302, 56486, 55302, 
-  56487, 55302, 56488, 55302, 56489, 55302, 56490, 55302, 
-  56491, 55302, 56492, 55302, 56493, 55302, 56494, 55302, 
-  56495, 55302, 56496, 55302, 56497, 55302, 56498, 55302, 
-  56499, 55302, 56500, 55302, 56501, 55302, 56502, 55302, 
-  56503, 55302, 56504, 55302, 56505, 55302, 56506, 55302, 
-  56507, 55302, 56508, 55302, 56509, 55302, 56510, 55302, 
-  56511, 55354, 56576, 55354, 56577, 55354, 56578, 55354, 
-  56579, 55354, 56580, 55354, 56581, 55354, 56582, 55354, 
-  56583, 55354, 56584, 55354, 56585, 55354, 56586, 55354, 
-  56587, 55354, 56588, 55354, 56589, 55354, 56590, 55354, 
-  56591, 55354, 56592, 55354, 56593, 55354, 56594, 55354, 
-  56595, 55354, 56596, 55354, 56597, 55354, 56598, 55354, 
-  56599, 55354, 56600, 55354, 56601, 55354, 56602, 55354, 
-  56603, 55354, 56604, 55354, 56605, 55354, 56606, 55354, 
+  97, 98, 99, 100, 101, 102, 103,
+  104, 105, 106, 107, 108, 109, 110, 111,
+  112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 32, 32, 776, 32, 772,
+  50, 51, 32, 769, 956, 32, 807, 49,
+  49, 8260, 52, 49, 8260, 50, 51, 8260,
+  52, 65, 768, 224, 65, 769, 225, 65,
+  770, 226, 65, 771, 227, 65, 776, 228,
+  65, 778, 229, 230, 67, 807, 231, 69,
+  768, 232, 69, 769, 233, 69, 770, 234,
+  69, 776, 235, 73, 768, 236, 73, 769,
+  237, 73, 770, 238, 73, 776, 239, 240,
+  78, 771, 241, 79, 768, 242, 79, 769,
+  243, 79, 770, 244, 79, 771, 245, 79,
+  776, 246, 248, 85, 768, 249, 85, 769,
+  250, 85, 770, 251, 85, 776, 252, 89,
+  769, 253, 254, 115, 115, 97, 768, 97,
+  769, 97, 770, 97, 771, 97, 776, 97,
+  778, 99, 807, 101, 768, 101, 769, 101,
+  770, 101, 776, 105, 768, 105, 769, 105,
+  770, 105, 776, 110, 771, 111, 768, 111,
+  769, 111, 770, 111, 771, 111, 776, 117,
+  768, 117, 769, 117, 770, 117, 776, 121,
+  769, 121, 776, 65, 772, 257, 97, 772,
+  65, 774, 259, 97, 774, 65, 808, 261,
+  97, 808, 67, 769, 263, 99, 769, 67,
+  770, 265, 99, 770, 67, 775, 267, 99,
+  775, 67, 780, 269, 99, 780, 68, 780,
+  271, 100, 780, 273, 69, 772, 275, 101,
+  772, 69, 774, 277, 101, 774, 69, 775,
+  279, 101, 775, 69, 808, 281, 101, 808,
+  69, 780, 283, 101, 780, 71, 770, 285,
+  103, 770, 71, 774, 287, 103, 774, 71,
+  775, 289, 103, 775, 71, 807, 291, 103,
+  807, 72, 770, 293, 104, 770, 295, 73,
+  771, 297, 105, 771, 73, 772, 299, 105,
+  772, 73, 774, 301, 105, 774, 73, 808,
+  303, 105, 808, 73, 775, 105, 775, 73,
+  74, 307, 105, 106, 74, 770, 309, 106,
+  770, 75, 807, 311, 107, 807, 76, 769,
+  314, 108, 769, 76, 807, 316, 108, 807,
+  76, 780, 318, 108, 780, 76, 183, 320,
+  108, 183, 322, 78, 769, 324, 110, 769,
+  78, 807, 326, 110, 807, 78, 780, 328,
+  110, 780, 700, 110, 331, 79, 772, 333,
+  111, 772, 79, 774, 335, 111, 774, 79,
+  779, 337, 111, 779, 339, 82, 769, 341,
+  114, 769, 82, 807, 343, 114, 807, 82,
+  780, 345, 114, 780, 83, 769, 347, 115,
+  769, 83, 770, 349, 115, 770, 83, 807,
+  351, 115, 807, 83, 780, 353, 115, 780,
+  84, 807, 355, 116, 807, 84, 780, 357,
+  116, 780, 359, 85, 771, 361, 117, 771,
+  85, 772, 363, 117, 772, 85, 774, 365,
+  117, 774, 85, 778, 367, 117, 778, 85,
+  779, 369, 117, 779, 85, 808, 371, 117,
+  808, 87, 770, 373, 119, 770, 89, 770,
+  375, 121, 770, 89, 776, 255, 90, 769,
+  378, 122, 769, 90, 775, 380, 122, 775,
+  90, 780, 382, 122, 780, 595, 387, 389,
+  596, 392, 598, 599, 396, 477, 601, 603,
+  402, 608, 611, 617, 616, 409, 623, 626,
+  629, 79, 795, 417, 111, 795, 419, 421,
+  640, 424, 643, 429, 648, 85, 795, 432,
+  117, 795, 650, 651, 436, 438, 658, 441,
+  445, 68, 381, 454, 68, 382, 100, 382,
+  76, 74, 457, 76, 106, 108, 106, 78,
+  74, 460, 78, 106, 110, 106, 65, 780,
+  462, 97, 780, 73, 780, 464, 105, 780,
+  79, 780, 466, 111, 780, 85, 780, 468,
+  117, 780, 220, 772, 470, 252, 772, 220,
+  769, 472, 252, 769, 220, 780, 474, 252,
+  780, 220, 768, 476, 252, 768, 196, 772,
+  479, 228, 772, 550, 772, 481, 551, 772,
+  198, 772, 483, 230, 772, 485, 71, 780,
+  487, 103, 780, 75, 780, 489, 107, 780,
+  79, 808, 491, 111, 808, 490, 772, 493,
+  491, 772, 439, 780, 495, 658, 780, 106,
+  780, 68, 90, 499, 68, 122, 100, 122,
+  71, 769, 501, 103, 769, 405, 447, 78,
+  768, 505, 110, 768, 197, 769, 507, 229,
+  769, 198, 769, 509, 230, 769, 216, 769,
+  511, 248, 769, 65, 783, 513, 97, 783,
+  65, 785, 515, 97, 785, 69, 783, 517,
+  101, 783, 69, 785, 519, 101, 785, 73,
+  783, 521, 105, 783, 73, 785, 523, 105,
+  785, 79, 783, 525, 111, 783, 79, 785,
+  527, 111, 785, 82, 783, 529, 114, 783,
+  82, 785, 531, 114, 785, 85, 783, 533,
+  117, 783, 85, 785, 535, 117, 785, 83,
+  806, 537, 115, 806, 84, 806, 539, 116,
+  806, 541, 72, 780, 543, 104, 780, 414,
+  547, 549, 65, 775, 551, 97, 775, 69,
+  807, 553, 101, 807, 214, 772, 555, 246,
+  772, 213, 772, 557, 245, 772, 79, 775,
+  559, 111, 775, 558, 772, 561, 559, 772,
+  89, 772, 563, 121, 772, 11365, 572, 410,
+  11366, 578, 384, 649, 652, 583, 585, 587,
+  589, 591, 614, 633, 635, 641, 32, 774,
+  32, 775, 32, 778, 32, 808, 32, 771,
+  32, 779, 661, 768, 769, 787, 776, 769,
+  953, 881, 883, 697, 887, 32, 837, 59,
+  1011, 168, 769, 913, 769, 940, 183, 917,
+  769, 941, 919, 769, 942, 921, 769, 943,
+  927, 769, 972, 933, 769, 973, 937, 769,
+  974, 970, 769, 953, 776, 769, 945, 946,
+  947, 948, 949, 950, 951, 952, 954, 955,
+  957, 958, 959, 960, 961, 963, 964, 965,
+  966, 967, 968, 969, 921, 776, 970, 933,
+  776, 971, 945, 769, 949, 769, 951, 769,
+  953, 769, 971, 769, 965, 776, 769, 953,
+  776, 965, 776, 959, 769, 965, 769, 969,
+  769, 983, 933, 978, 769, 978, 776, 985,
+  987, 989, 991, 993, 995, 997, 999, 1001,
+  1003, 1005, 1007, 962, 920, 1016, 931, 1010,
+  1019, 891, 892, 893, 1045, 768, 1104, 1045,
+  776, 1105, 1106, 1043, 769, 1107, 1108, 1109,
+  1110, 1030, 776, 1111, 1112, 1113, 1114, 1115,
+  1050, 769, 1116, 1048, 768, 1117, 1059, 774,
+  1118, 1119, 1072, 1073, 1074, 1075, 1076, 1077,
+  1078, 1079, 1080, 1048, 774, 1081, 1082, 1083,
+  1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091,
+  1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099,
+  1100, 1101, 1102, 1103, 1080, 774, 1077, 768,
+  1077, 776, 1075, 769, 1110, 776, 1082, 769,
+  1080, 768, 1091, 774, 1121, 1123, 1125, 1127,
+  1129, 1131, 1133, 1135, 1137, 1139, 1141, 1140,
+  783, 1143, 1141, 783, 1145, 1147, 1149, 1151,
+  1153, 1163, 1165, 1167, 1169, 1171, 1173, 1175,
+  1177, 1179, 1181, 1183, 1185, 1187, 1189, 1191,
+  1193, 1195, 1197, 1199, 1201, 1203, 1205, 1207,
+  1209, 1211, 1213, 1215, 1231, 1046, 774, 1218,
+  1078, 774, 1220, 1222, 1224, 1226, 1228, 1230,
+  1040, 774, 1233, 1072, 774, 1040, 776, 1235,
+  1072, 776, 1237, 1045, 774, 1239, 1077, 774,
+  1241, 1240, 776, 1243, 1241, 776, 1046, 776,
+  1245, 1078, 776, 1047, 776, 1247, 1079, 776,
+  1249, 1048, 772, 1251, 1080, 772, 1048, 776,
+  1253, 1080, 776, 1054, 776, 1255, 1086, 776,
+  1257, 1256, 776, 1259, 1257, 776, 1069, 776,
+  1261, 1101, 776, 1059, 772, 1263, 1091, 772,
+  1059, 776, 1265, 1091, 776, 1059, 779, 1267,
+  1091, 779, 1063, 776, 1269, 1095, 776, 1271,
+  1067, 776, 1273, 1099, 776, 1275, 1277, 1279,
+  1281, 1283, 1285, 1287, 1289, 1291, 1293, 1295,
+  1297, 1299, 1301, 1303, 1305, 1307, 1309, 1311,
+  1313, 1315, 1317, 1319, 1321, 1323, 1325, 1327,
+  1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384,
+  1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392,
+  1393, 1394, 1395, 1396, 1397, 1398, 1399, 1400,
+  1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408,
+  1409, 1410, 1411, 1412, 1413, 1414, 1381, 1410,
+  1575, 1619, 1575, 1620, 1608, 1620, 1575, 1621,
+  1610, 1620, 1575, 1652, 1608, 1652, 1735, 1652,
+  1610, 1652, 1749, 1620, 1729, 1620, 1746, 1620,
+  2344, 2364, 2352, 2364, 2355, 2364, 2325, 2364,
+  2326, 2364, 2327, 2364, 2332, 2364, 2337, 2364,
+  2338, 2364, 2347, 2364, 2351, 2364, 2503, 2494,
+  2503, 2519, 2465, 2492, 2466, 2492, 2479, 2492,
+  2610, 2620, 2616, 2620, 2582, 2620, 2583, 2620,
+  2588, 2620, 2603, 2620, 2887, 2902, 2887, 2878,
+  2887, 2903, 2849, 2876, 2850, 2876, 2962, 3031,
+  3014, 3006, 3015, 3006, 3014, 3031, 3142, 3158,
+  3263, 3285, 3270, 3285, 3270, 3286, 3270, 3266,
+  3274, 3285, 3398, 3390, 3399, 3390, 3398, 3415,
+  3545, 3530, 3545, 3535, 3548, 3530, 3545, 3551,
+  3661, 3634, 3789, 3762, 3755, 3737, 3755, 3745,
+  3851, 3906, 4023, 3916, 4023, 3921, 4023, 3926,
+  4023, 3931, 4023, 3904, 4021, 3953, 3954, 3953,
+  3956, 4018, 3968, 4018, 3969, 4019, 3968, 4019,
+  3969, 3953, 3968, 3986, 4023, 3996, 4023, 4001,
+  4023, 4006, 4023, 4011, 4023, 3984, 4021, 4133,
+  4142, 11520, 11521, 11522, 11523, 11524, 11525, 11526,
+  11527, 11528, 11529, 11530, 11531, 11532, 11533, 11534,
+  11535, 11536, 11537, 11538, 11539, 11540, 11541, 11542,
+  11543, 11544, 11545, 11546, 11547, 11548, 11549, 11550,
+  11551, 11552, 11553, 11554, 11555, 11556, 11557, 11559,
+  11565, 4316, 5104, 5105, 5106, 5107, 5108, 5109,
+  6917, 6965, 6919, 6965, 6921, 6965, 6923, 6965,
+  6925, 6965, 6929, 6965, 6970, 6965, 6972, 6965,
+  6974, 6965, 6975, 6965, 6978, 6965, 42571, 65,
+  198, 66, 68, 69, 398, 71, 72, 73,
+  74, 75, 76, 77, 78, 79, 546, 80,
+  82, 84, 85, 87, 592, 593, 7426, 604,
+  7446, 7447, 7453, 7461, 594, 597, 607, 609,
+  613, 618, 7547, 669, 621, 7557, 671, 625,
+  624, 627, 628, 632, 642, 427, 7452, 656,
+  657, 65, 805, 7681, 97, 805, 66, 775,
+  7683, 98, 775, 66, 803, 7685, 98, 803,
+  66, 817, 7687, 98, 817, 199, 769, 7689,
+  231, 769, 68, 775, 7691, 100, 775, 68,
+  803, 7693, 100, 803, 68, 817, 7695, 100,
+  817, 68, 807, 7697, 100, 807, 68, 813,
+  7699, 100, 813, 274, 768, 7701, 275, 768,
+  274, 769, 7703, 275, 769, 69, 813, 7705,
+  101, 813, 69, 816, 7707, 101, 816, 552,
+  774, 7709, 553, 774, 70, 775, 7711, 102,
+  775, 71, 772, 7713, 103, 772, 72, 775,
+  7715, 104, 775, 72, 803, 7717, 104, 803,
+  72, 776, 7719, 104, 776, 72, 807, 7721,
+  104, 807, 72, 814, 7723, 104, 814, 73,
+  816, 7725, 105, 816, 207, 769, 7727, 239,
+  769, 75, 769, 7729, 107, 769, 75, 803,
+  7731, 107, 803, 75, 817, 7733, 107, 817,
+  76, 803, 7735, 108, 803, 7734, 772, 7737,
+  7735, 772, 76, 817, 7739, 108, 817, 76,
+  813, 7741, 108, 813, 77, 769, 7743, 109,
+  769, 77, 775, 7745, 109, 775, 77, 803,
+  7747, 109, 803, 78, 775, 7749, 110, 775,
+  78, 803, 7751, 110, 803, 78, 817, 7753,
+  110, 817, 78, 813, 7755, 110, 813, 213,
+  769, 7757, 245, 769, 213, 776, 7759, 245,
+  776, 332, 768, 7761, 333, 768, 332, 769,
+  7763, 333, 769, 80, 769, 7765, 112, 769,
+  80, 775, 7767, 112, 775, 82, 775, 7769,
+  114, 775, 82, 803, 7771, 114, 803, 7770,
+  772, 7773, 7771, 772, 82, 817, 7775, 114,
+  817, 83, 775, 7777, 115, 775, 83, 803,
+  7779, 115, 803, 346, 775, 7781, 347, 775,
+  352, 775, 7783, 353, 775, 7778, 775, 7785,
+  7779, 775, 84, 775, 7787, 116, 775, 84,
+  803, 7789, 116, 803, 84, 817, 7791, 116,
+  817, 84, 813, 7793, 116, 813, 85, 804,
+  7795, 117, 804, 85, 816, 7797, 117, 816,
+  85, 813, 7799, 117, 813, 360, 769, 7801,
+  361, 769, 362, 776, 7803, 363, 776, 86,
+  771, 7805, 118, 771, 86, 803, 7807, 118,
+  803, 87, 768, 7809, 119, 768, 87, 769,
+  7811, 119, 769, 87, 776, 7813, 119, 776,
+  87, 775, 7815, 119, 775, 87, 803, 7817,
+  119, 803, 88, 775, 7819, 120, 775, 88,
+  776, 7821, 120, 776, 89, 775, 7823, 121,
+  775, 90, 770, 7825, 122, 770, 90, 803,
+  7827, 122, 803, 90, 817, 7829, 122, 817,
+  104, 817, 116, 776, 119, 778, 121, 778,
+  97, 702, 383, 775, 223, 65, 803, 7841,
+  97, 803, 65, 777, 7843, 97, 777, 194,
+  769, 7845, 226, 769, 194, 768, 7847, 226,
+  768, 194, 777, 7849, 226, 777, 194, 771,
+  7851, 226, 771, 7840, 770, 7853, 7841, 770,
+  258, 769, 7855, 259, 769, 258, 768, 7857,
+  259, 768, 258, 777, 7859, 259, 777, 258,
+  771, 7861, 259, 771, 7840, 774, 7863, 7841,
+  774, 69, 803, 7865, 101, 803, 69, 777,
+  7867, 101, 777, 69, 771, 7869, 101, 771,
+  202, 769, 7871, 234, 769, 202, 768, 7873,
+  234, 768, 202, 777, 7875, 234, 777, 202,
+  771, 7877, 234, 771, 7864, 770, 7879, 7865,
+  770, 73, 777, 7881, 105, 777, 73, 803,
+  7883, 105, 803, 79, 803, 7885, 111, 803,
+  79, 777, 7887, 111, 777, 212, 769, 7889,
+  244, 769, 212, 768, 7891, 244, 768, 212,
+  777, 7893, 244, 777, 212, 771, 7895, 244,
+  771, 7884, 770, 7897, 7885, 770, 416, 769,
+  7899, 417, 769, 416, 768, 7901, 417, 768,
+  416, 777, 7903, 417, 777, 416, 771, 7905,
+  417, 771, 416, 803, 7907, 417, 803, 85,
+  803, 7909, 117, 803, 85, 777, 7911, 117,
+  777, 431, 769, 7913, 432, 769, 431, 768,
+  7915, 432, 768, 431, 777, 7917, 432, 777,
+  431, 771, 7919, 432, 771, 431, 803, 7921,
+  432, 803, 89, 768, 7923, 121, 768, 89,
+  803, 7925, 121, 803, 89, 777, 7927, 121,
+  777, 89, 771, 7929, 121, 771, 7931, 7933,
+  7935, 945, 787, 945, 788, 7936, 768, 7937,
+  768, 7936, 769, 7937, 769, 7936, 834, 7937,
+  834, 913, 787, 7936, 913, 788, 7937, 7944,
+  768, 7938, 7945, 768, 7939, 7944, 769, 7940,
+  7945, 769, 7941, 7944, 834, 7942, 7945, 834,
+  7943, 949, 787, 949, 788, 7952, 768, 7953,
+  768, 7952, 769, 7953, 769, 917, 787, 7952,
+  917, 788, 7953, 7960, 768, 7954, 7961, 768,
+  7955, 7960, 769, 7956, 7961, 769, 7957, 951,
+  787, 951, 788, 7968, 768, 7969, 768, 7968,
+  769, 7969, 769, 7968, 834, 7969, 834, 919,
+  787, 7968, 919, 788, 7969, 7976, 768, 7970,
+  7977, 768, 7971, 7976, 769, 7972, 7977, 769,
+  7973, 7976, 834, 7974, 7977, 834, 7975, 953,
+  787, 953, 788, 7984, 768, 7985, 768, 7984,
+  769, 7985, 769, 7984, 834, 7985, 834, 921,
+  787, 7984, 921, 788, 7985, 7992, 768, 7986,
+  7993, 768, 7987, 7992, 769, 7988, 7993, 769,
+  7989, 7992, 834, 7990, 7993, 834, 7991, 959,
+  787, 959, 788, 8000, 768, 8001, 768, 8000,
+  769, 8001, 769, 927, 787, 8000, 927, 788,
+  8001, 8008, 768, 8002, 8009, 768, 8003, 8008,
+  769, 8004, 8009, 769, 8005, 965, 787, 965,
+  788, 8016, 768, 965, 787, 768, 8017, 768,
+  8016, 769, 965, 787, 769, 8017, 769, 8016,
+  834, 965, 787, 834, 8017, 834, 933, 788,
+  8017, 8025, 768, 8019, 8025, 769, 8021, 8025,
+  834, 8023, 969, 787, 969, 788, 8032, 768,
+  8033, 768, 8032, 769, 8033, 769, 8032, 834,
+  8033, 834, 937, 787, 8032, 937, 788, 8033,
+  8040, 768, 8034, 8041, 768, 8035, 8040, 769,
+  8036, 8041, 769, 8037, 8040, 834, 8038, 8041,
+  834, 8039, 945, 768, 949, 768, 951, 768,
+  953, 768, 959, 768, 965, 768, 969, 768,
+  7936, 837, 7936, 953, 7937, 837, 7937, 953,
+  7938, 837, 7938, 953, 7939, 837, 7939, 953,
+  7940, 837, 7940, 953, 7941, 837, 7941, 953,
+  7942, 837, 7942, 953, 7943, 837, 7943, 953,
+  7944, 837, 8064, 7945, 837, 8065, 7946, 837,
+  8066, 7947, 837, 8067, 7948, 837, 8068, 7949,
+  837, 8069, 7950, 837, 8070, 7951, 837, 8071,
+  7968, 837, 7968, 953, 7969, 837, 7969, 953,
+  7970, 837, 7970, 953, 7971, 837, 7971, 953,
+  7972, 837, 7972, 953, 7973, 837, 7973, 953,
+  7974, 837, 7974, 953, 7975, 837, 7975, 953,
+  7976, 837, 8080, 7977, 837, 8081, 7978, 837,
+  8082, 7979, 837, 8083, 7980, 837, 8084, 7981,
+  837, 8085, 7982, 837, 8086, 7983, 837, 8087,
+  8032, 837, 8032, 953, 8033, 837, 8033, 953,
+  8034, 837, 8034, 953, 8035, 837, 8035, 953,
+  8036, 837, 8036, 953, 8037, 837, 8037, 953,
+  8038, 837, 8038, 953, 8039, 837, 8039, 953,
+  8040, 837, 8096, 8041, 837, 8097, 8042, 837,
+  8098, 8043, 837, 8099, 8044, 837, 8100, 8045,
+  837, 8101, 8046, 837, 8102, 8047, 837, 8103,
+  945, 774, 945, 772, 8048, 837, 8048, 953,
+  945, 837, 945, 953, 940, 837, 940, 953,
+  945, 834, 8118, 837, 945, 834, 953, 913,
+  774, 8112, 913, 772, 8113, 913, 768, 8048,
+  902, 8049, 913, 837, 8115, 32, 787, 32,
+  834, 168, 834, 8052, 837, 8052, 953, 951,
+  837, 951, 953, 942, 837, 942, 953, 951,
+  834, 8134, 837, 951, 834, 953, 917, 768,
+  8050, 904, 8051, 919, 768, 8052, 905, 8053,
+  919, 837, 8131, 8127, 768, 8127, 769, 8127,
+  834, 953, 774, 953, 772, 970, 768, 953,
+  776, 768, 912, 953, 834, 970, 834, 953,
+  776, 834, 921, 774, 8144, 921, 772, 8145,
+  921, 768, 8054, 906, 8055, 8190, 768, 8190,
+  769, 8190, 834, 965, 774, 965, 772, 971,
+  768, 965, 776, 768, 944, 961, 787, 961,
+  788, 965, 834, 971, 834, 965, 776, 834,
+  933, 774, 8160, 933, 772, 8161, 933, 768,
+  8058, 910, 8059, 929, 788, 8165, 168, 768,
+  901, 96, 8060, 837, 8060, 953, 969, 837,
+  969, 953, 974, 837, 974, 953, 969, 834,
+  8182, 837, 969, 834, 953, 927, 768, 8056,
+  908, 8057, 937, 768, 8060, 911, 8061, 937,
+  837, 8179, 180, 32, 788, 8194, 8195, 8208,
+  32, 819, 46, 46, 46, 46, 46, 46,
+  8242, 8242, 8242, 8242, 8242, 8245, 8245, 8245,
+  8245, 8245, 33, 33, 32, 773, 63, 63,
+  63, 33, 33, 63, 8242, 8242, 8242, 8242,
+  48, 52, 53, 54, 55, 56, 57, 43,
+  8722, 61, 40, 41, 82, 115, 97, 47,
+  99, 97, 47, 115, 67, 176, 67, 99,
+  47, 111, 99, 47, 117, 400, 176, 70,
+  78, 111, 81, 83, 77, 84, 69, 76,
+  84, 77, 90, 937, 197, 70, 8526, 1488,
+  1489, 1490, 1491, 70, 65, 88, 915, 928,
+  8721, 49, 8260, 55, 49, 8260, 57, 49,
+  8260, 49, 48, 49, 8260, 51, 50, 8260,
+  51, 49, 8260, 53, 50, 8260, 53, 51,
+  8260, 53, 52, 8260, 53, 49, 8260, 54,
+  53, 8260, 54, 49, 8260, 56, 51, 8260,
+  56, 53, 8260, 56, 55, 8260, 56, 49,
+  8260, 8560, 73, 73, 8561, 73, 73, 73,
+  8562, 73, 86, 8563, 86, 8564, 86, 73,
+  8565, 86, 73, 73, 8566, 86, 73, 73,
+  73, 8567, 73, 88, 8568, 88, 8569, 88,
+  73, 8570, 88, 73, 73, 8571, 8572, 8573,
+  8574, 8575, 105, 105, 105, 105, 105, 105,
+  118, 118, 105, 118, 105, 105, 118, 105,
+  105, 105, 105, 120, 120, 105, 120, 105,
+  105, 8580, 48, 8260, 51, 8592, 824, 8594,
+  824, 8596, 824, 8656, 824, 8660, 824, 8658,
+  824, 8707, 824, 8712, 824, 8715, 824, 8739,
+  824, 8741, 824, 8747, 8747, 8747, 8747, 8747,
+  8750, 8750, 8750, 8750, 8750, 8764, 824, 8771,
+  824, 8773, 824, 8776, 824, 61, 824, 8801,
+  824, 8781, 824, 60, 824, 62, 824, 8804,
+  824, 8805, 824, 8818, 824, 8819, 824, 8822,
+  824, 8823, 824, 8826, 824, 8827, 824, 8834,
+  824, 8835, 824, 8838, 824, 8839, 824, 8866,
+  824, 8872, 824, 8873, 824, 8875, 824, 8828,
+  824, 8829, 824, 8849, 824, 8850, 824, 8882,
+  824, 8883, 824, 8884, 824, 8885, 824, 12296,
+  12297, 49, 48, 49, 49, 49, 50, 49,
+  51, 49, 52, 49, 53, 49, 54, 49,
+  55, 49, 56, 49, 57, 50, 48, 40,
+  49, 41, 40, 50, 41, 40, 51, 41,
+  40, 52, 41, 40, 53, 41, 40, 54,
+  41, 40, 55, 41, 40, 56, 41, 40,
+  57, 41, 40, 49, 48, 41, 40, 49,
+  49, 41, 40, 49, 50, 41, 40, 49,
+  51, 41, 40, 49, 52, 41, 40, 49,
+  53, 41, 40, 49, 54, 41, 40, 49,
+  55, 41, 40, 49, 56, 41, 40, 49,
+  57, 41, 40, 50, 48, 41, 49, 46,
+  50, 46, 51, 46, 52, 46, 53, 46,
+  54, 46, 55, 46, 56, 46, 57, 46,
+  49, 48, 46, 49, 49, 46, 49, 50,
+  46, 49, 51, 46, 49, 52, 46, 49,
+  53, 46, 49, 54, 46, 49, 55, 46,
+  49, 56, 46, 49, 57, 46, 50, 48,
+  46, 40, 97, 41, 40, 98, 41, 40,
+  99, 41, 40, 100, 41, 40, 101, 41,
+  40, 102, 41, 40, 103, 41, 40, 104,
+  41, 40, 105, 41, 40, 106, 41, 40,
+  107, 41, 40, 108, 41, 40, 109, 41,
+  40, 110, 41, 40, 111, 41, 40, 112,
+  41, 40, 113, 41, 40, 114, 41, 40,
+  115, 41, 40, 116, 41, 40, 117, 41,
+  40, 118, 41, 40, 119, 41, 40, 120,
+  41, 40, 121, 41, 40, 122, 41, 9424,
+  9425, 9426, 9427, 9428, 9429, 9430, 9431, 9432,
+  9433, 9434, 9435, 9436, 9437, 9438, 9439, 9440,
+  9441, 83, 9442, 9443, 9444, 9445, 9446, 9447,
+  89, 9448, 9449, 8747, 8747, 8747, 8747, 58,
+  58, 61, 61, 61, 61, 61, 61, 10973,
+  824, 11312, 11313, 11314, 11315, 11316, 11317, 11318,
+  11319, 11320, 11321, 11322, 11323, 11324, 11325, 11326,
+  11327, 11328, 11329, 11330, 11331, 11332, 11333, 11334,
+  11335, 11336, 11337, 11338, 11339, 11340, 11341, 11342,
+  11343, 11344, 11345, 11346, 11347, 11348, 11349, 11350,
+  11351, 11352, 11353, 11354, 11355, 11356, 11357, 11358,
+  11361, 619, 7549, 637, 11368, 11370, 11372, 11379,
+  11382, 575, 576, 11393, 11395, 11397, 11399, 11401,
+  11403, 11405, 11407, 11409, 11411, 11413, 11415, 11417,
+  11419, 11421, 11423, 11425, 11427, 11429, 11431, 11433,
+  11435, 11437, 11439, 11441, 11443, 11445, 11447, 11449,
+  11451, 11453, 11455, 11457, 11459, 11461, 11463, 11465,
+  11467, 11469, 11471, 11473, 11475, 11477, 11479, 11481,
+  11483, 11485, 11487, 11489, 11491, 11500, 11502, 11507,
+  11617, 27597, 40863, 19968, 20008, 20022, 20031, 20057,
+  20101, 20108, 20128, 20154, 20799, 20837, 20843, 20866,
+  20886, 20907, 20960, 20981, 20992, 21147, 21241, 21269,
+  21274, 21304, 21313, 21340, 21353, 21378, 21430, 21448,
+  21475, 22231, 22303, 22763, 22786, 22794, 22805, 22823,
+  22899, 23376, 23424, 23544, 23567, 23586, 23608, 23662,
+  23665, 24027, 24037, 24049, 24062, 24178, 24186, 24191,
+  24308, 24318, 24331, 24339, 24400, 24417, 24435, 24515,
+  25096, 25142, 25163, 25903, 25908, 25991, 26007, 26020,
+  26041, 26080, 26085, 26352, 26376, 26408, 27424, 27490,
+  27513, 27571, 27595, 27604, 27611, 27663, 27668, 27700,
+  28779, 29226, 29238, 29243, 29247, 29255, 29273, 29275,
+  29356, 29572, 29577, 29916, 29926, 29976, 29983, 29992,
+  30000, 30091, 30098, 30326, 30333, 30382, 30399, 30446,
+  30683, 30690, 30707, 31034, 31160, 31166, 31348, 31435,
+  31481, 31859, 31992, 32566, 32593, 32650, 32701, 32769,
+  32780, 32786, 32819, 32895, 32905, 33251, 33258, 33267,
+  33276, 33292, 33307, 33311, 33390, 33394, 33400, 34381,
+  34411, 34880, 34892, 34915, 35198, 35211, 35282, 35328,
+  35895, 35910, 35925, 35960, 35997, 36196, 36208, 36275,
+  36523, 36554, 36763, 36784, 36789, 37009, 37193, 37318,
+  37324, 37329, 38263, 38272, 38428, 38582, 38585, 38632,
+  38737, 38750, 38754, 38761, 38859, 38893, 38899, 38913,
+  39080, 39131, 39135, 39318, 39321, 39340, 39592, 39640,
+  39647, 39717, 39727, 39730, 39740, 39770, 40165, 40565,
+  40575, 40613, 40635, 40643, 40653, 40657, 40697, 40701,
+  40718, 40723, 40736, 40763, 40778, 40786, 40845, 40860,
+  40864, 12306, 21316, 21317, 12363, 12441, 12365, 12441,
+  12367, 12441, 12369, 12441, 12371, 12441, 12373, 12441,
+  12375, 12441, 12377, 12441, 12379, 12441, 12381, 12441,
+  12383, 12441, 12385, 12441, 12388, 12441, 12390, 12441,
+  12392, 12441, 12399, 12441, 12399, 12442, 12402, 12441,
+  12402, 12442, 12405, 12441, 12405, 12442, 12408, 12441,
+  12408, 12442, 12411, 12441, 12411, 12442, 12358, 12441,
+  32, 12441, 32, 12442, 12445, 12441, 12424, 12426,
+  12459, 12441, 12461, 12441, 12463, 12441, 12465, 12441,
+  12467, 12441, 12469, 12441, 12471, 12441, 12473, 12441,
+  12475, 12441, 12477, 12441, 12479, 12441, 12481, 12441,
+  12484, 12441, 12486, 12441, 12488, 12441, 12495, 12441,
+  12495, 12442, 12498, 12441, 12498, 12442, 12501, 12441,
+  12501, 12442, 12504, 12441, 12504, 12442, 12507, 12441,
+  12507, 12442, 12454, 12441, 12527, 12441, 12528, 12441,
+  12529, 12441, 12530, 12441, 12541, 12441, 12467, 12488,
+  4352, 4353, 4522, 4354, 4524, 4525, 4355, 4356,
+  4357, 4528, 4529, 4530, 4531, 4532, 4533, 4378,
+  4358, 4359, 4360, 4385, 4361, 4362, 4363, 4364,
+  4365, 4366, 4367, 4368, 4369, 4370, 4449, 4450,
+  4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458,
+  4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466,
+  4467, 4468, 4469, 4448, 4372, 4373, 4551, 4552,
+  4556, 4558, 4563, 4567, 4569, 4380, 4573, 4575,
+  4381, 4382, 4384, 4386, 4387, 4391, 4393, 4395,
+  4396, 4397, 4398, 4399, 4402, 4406, 4416, 4423,
+  4428, 4593, 4594, 4439, 4440, 4441, 4484, 4485,
+  4488, 4497, 4498, 4500, 4510, 4513, 19977, 22235,
+  19978, 20013, 19979, 30002, 19993, 19969, 22825, 22320,
+  40, 4352, 41, 40, 4354, 41, 40, 4355,
+  41, 40, 4357, 41, 40, 4358, 41, 40,
+  4359, 41, 40, 4361, 41, 40, 4363, 41,
+  40, 4364, 41, 40, 4366, 41, 40, 4367,
+  41, 40, 4368, 41, 40, 4369, 41, 40,
+  4370, 41, 40, 4352, 4449, 41, 40, 4354,
+  4449, 41, 40, 4355, 4449, 41, 40, 4357,
+  4449, 41, 40, 4358, 4449, 41, 40, 4359,
+  4449, 41, 40, 4361, 4449, 41, 40, 4363,
+  4449, 41, 40, 4364, 4449, 41, 40, 4366,
+  4449, 41, 40, 4367, 4449, 41, 40, 4368,
+  4449, 41, 40, 4369, 4449, 41, 40, 4370,
+  4449, 41, 40, 4364, 4462, 41, 40, 4363,
+  4457, 4364, 4453, 4523, 41, 40, 4363, 4457,
+  4370, 4462, 41, 40, 19968, 41, 40, 20108,
+  41, 40, 19977, 41, 40, 22235, 41, 40,
+  20116, 41, 40, 20845, 41, 40, 19971, 41,
+  40, 20843, 41, 40, 20061, 41, 40, 21313,
+  41, 40, 26376, 41, 40, 28779, 41, 40,
+  27700, 41, 40, 26408, 41, 40, 37329, 41,
+  40, 22303, 41, 40, 26085, 41, 40, 26666,
+  41, 40, 26377, 41, 40, 31038, 41, 40,
+  21517, 41, 40, 29305, 41, 40, 36001, 41,
+  40, 31069, 41, 40, 21172, 41, 40, 20195,
+  41, 40, 21628, 41, 40, 23398, 41, 40,
+  30435, 41, 40, 20225, 41, 40, 36039, 41,
+  40, 21332, 41, 40, 31085, 41, 40, 20241,
+  41, 40, 33258, 41, 40, 33267, 41, 21839,
+  24188, 31631, 80, 84, 69, 50, 49, 50,
+  50, 50, 51, 50, 52, 50, 53, 50,
+  54, 50, 55, 50, 56, 50, 57, 51,
+  48, 51, 49, 51, 50, 51, 51, 51,
+  52, 51, 53, 4352, 4449, 4354, 4449, 4355,
+  4449, 4357, 4449, 4358, 4449, 4359, 4449, 4361,
+  4449, 4363, 4449, 4364, 4449, 4366, 4449, 4367,
+  4449, 4368, 4449, 4369, 4449, 4370, 4449, 4366,
+  4449, 4535, 4352, 4457, 4364, 4462, 4363, 4468,
+  4363, 4462, 20116, 20845, 19971, 20061, 26666, 26377,
+  31038, 21517, 29305, 36001, 31069, 21172, 31192, 30007,
+  36969, 20778, 21360, 27880, 38917, 20241, 20889, 27491,
+  24038, 21491, 21307, 23447, 23398, 30435, 20225, 36039,
+  21332, 22812, 51, 54, 51, 55, 51, 56,
+  51, 57, 52, 48, 52, 49, 52, 50,
+  52, 51, 52, 52, 52, 53, 52, 54,
+  52, 55, 52, 56, 52, 57, 53, 48,
+  49, 26376, 50, 26376, 51, 26376, 52, 26376,
+  53, 26376, 54, 26376, 55, 26376, 56, 26376,
+  57, 26376, 49, 48, 26376, 49, 49, 26376,
+  49, 50, 26376, 72, 103, 101, 114, 103,
+  101, 86, 76, 84, 68, 12450, 12452, 12454,
+  12456, 12458, 12459, 12461, 12463, 12465, 12467, 12469,
+  12471, 12473, 12475, 12477, 12479, 12481, 12484, 12486,
+  12488, 12490, 12491, 12492, 12493, 12494, 12495, 12498,
+  12501, 12504, 12507, 12510, 12511, 12512, 12513, 12514,
+  12516, 12518, 12520, 12521, 12522, 12523, 12524, 12525,
+  12527, 12528, 12529, 12530, 12450, 12497, 12540, 12488,
+  12450, 12523, 12501, 12449, 12450, 12531, 12506, 12450,
+  12450, 12540, 12523, 12452, 12491, 12531, 12464, 12452,
+  12531, 12481, 12454, 12457, 12531, 12456, 12473, 12463,
+  12540, 12489, 12456, 12540, 12459, 12540, 12458, 12531,
+  12473, 12458, 12540, 12512, 12459, 12452, 12522, 12459,
+  12521, 12483, 12488, 12459, 12525, 12522, 12540, 12460,
+  12525, 12531, 12460, 12531, 12510, 12462, 12460, 12462,
+  12491, 12540, 12461, 12517, 12522, 12540, 12462, 12523,
+  12480, 12540, 12461, 12525, 12461, 12525, 12464, 12521,
+  12512, 12461, 12525, 12513, 12540, 12488, 12523, 12461,
+  12525, 12527, 12483, 12488, 12464, 12521, 12512, 12464,
+  12521, 12512, 12488, 12531, 12463, 12523, 12476, 12452,
+  12525, 12463, 12525, 12540, 12493, 12465, 12540, 12473,
+  12467, 12523, 12490, 12467, 12540, 12509, 12469, 12452,
+  12463, 12523, 12469, 12531, 12481, 12540, 12512, 12471,
+  12522, 12531, 12464, 12475, 12531, 12481, 12475, 12531,
+  12488, 12480, 12540, 12473, 12487, 12471, 12489, 12523,
+  12488, 12531, 12490, 12494, 12494, 12483, 12488, 12495,
+  12452, 12484, 12497, 12540, 12475, 12531, 12488, 12497,
+  12540, 12484, 12496, 12540, 12524, 12523, 12500, 12450,
+  12473, 12488, 12523, 12500, 12463, 12523, 12500, 12467,
+  12499, 12523, 12501, 12449, 12521, 12483, 12489, 12501,
+  12451, 12540, 12488, 12502, 12483, 12471, 12455, 12523,
+  12501, 12521, 12531, 12504, 12463, 12479, 12540, 12523,
+  12506, 12477, 12506, 12491, 12498, 12504, 12523, 12484,
+  12506, 12531, 12473, 12506, 12540, 12472, 12505, 12540,
+  12479, 12509, 12452, 12531, 12488, 12508, 12523, 12488,
+  12507, 12531, 12509, 12531, 12489, 12507, 12540, 12523,
+  12507, 12540, 12531, 12510, 12452, 12463, 12525, 12510,
+  12452, 12523, 12510, 12483, 12495, 12510, 12523, 12463,
+  12510, 12531, 12471, 12519, 12531, 12511, 12463, 12525,
+  12531, 12511, 12522, 12511, 12522, 12496, 12540, 12523,
+  12513, 12460, 12513, 12460, 12488, 12531, 12513, 12540,
+  12488, 12523, 12516, 12540, 12489, 12516, 12540, 12523,
+  12518, 12450, 12531, 12522, 12483, 12488, 12523, 12522,
+  12521, 12523, 12500, 12540, 12523, 12540, 12502, 12523,
+  12524, 12512, 12524, 12531, 12488, 12466, 12531, 12527,
+  12483, 12488, 48, 28857, 49, 28857, 50, 28857,
+  51, 28857, 52, 28857, 53, 28857, 54, 28857,
+  55, 28857, 56, 28857, 57, 28857, 49, 48,
+  28857, 49, 49, 28857, 49, 50, 28857, 49,
+  51, 28857, 49, 52, 28857, 49, 53, 28857,
+  49, 54, 28857, 49, 55, 28857, 49, 56,
+  28857, 49, 57, 28857, 50, 48, 28857, 50,
+  49, 28857, 50, 50, 28857, 50, 51, 28857,
+  50, 52, 28857, 104, 80, 97, 100, 97,
+  65, 85, 98, 97, 114, 111, 86, 112,
+  99, 100, 109, 100, 109, 178, 100, 109,
+  179, 73, 85, 24179, 25104, 26157, 21644, 22823,
+  27491, 26126, 27835, 26666, 24335, 20250, 31038, 112,
+  65, 110, 65, 956, 65, 109, 65, 107,
+  65, 75, 66, 77, 66, 71, 66, 99,
+  97, 108, 107, 99, 97, 108, 112, 70,
+  110, 70, 956, 70, 956, 103, 109, 103,
+  107, 103, 72, 122, 107, 72, 122, 77,
+  72, 122, 71, 72, 122, 84, 72, 122,
+  956, 8467, 109, 8467, 100, 8467, 107, 8467,
+  102, 109, 110, 109, 956, 109, 109, 109,
+  99, 109, 107, 109, 109, 109, 178, 99,
+  109, 178, 109, 178, 107, 109, 178, 109,
+  109, 179, 99, 109, 179, 109, 179, 107,
+  109, 179, 109, 8725, 115, 109, 8725, 115,
+  178, 80, 97, 107, 80, 97, 77, 80,
+  97, 71, 80, 97, 114, 97, 100, 114,
+  97, 100, 8725, 115, 114, 97, 100, 8725,
+  115, 178, 112, 115, 110, 115, 956, 115,
+  109, 115, 112, 86, 110, 86, 956, 86,
+  109, 86, 107, 86, 77, 86, 112, 87,
+  110, 87, 956, 87, 109, 87, 107, 87,
+  77, 87, 107, 937, 77, 937, 97, 46,
+  109, 46, 66, 113, 99, 99, 99, 100,
+  67, 8725, 107, 103, 67, 111, 46, 100,
+  66, 71, 121, 104, 97, 72, 80, 105,
+  110, 75, 75, 75, 77, 107, 116, 108,
+  109, 108, 110, 108, 111, 103, 108, 120,
+  109, 98, 109, 105, 108, 109, 111, 108,
+  80, 72, 112, 46, 109, 46, 80, 80,
+  77, 80, 82, 115, 114, 83, 118, 87,
+  98, 86, 8725, 109, 65, 8725, 109, 49,
+  26085, 50, 26085, 51, 26085, 52, 26085, 53,
+  26085, 54, 26085, 55, 26085, 56, 26085, 57,
+  26085, 49, 48, 26085, 49, 49, 26085, 49,
+  50, 26085, 49, 51, 26085, 49, 52, 26085,
+  49, 53, 26085, 49, 54, 26085, 49, 55,
+  26085, 49, 56, 26085, 49, 57, 26085, 50,
+  48, 26085, 50, 49, 26085, 50, 50, 26085,
+  50, 51, 26085, 50, 52, 26085, 50, 53,
+  26085, 50, 54, 26085, 50, 55, 26085, 50,
+  56, 26085, 50, 57, 26085, 51, 48, 26085,
+  51, 49, 26085, 103, 97, 108, 42561, 42563,
+  42565, 42567, 42569, 42573, 42575, 42577, 42579, 42581,
+  42583, 42585, 42587, 42589, 42591, 42593, 42595, 42597,
+  42599, 42601, 42603, 42605, 42625, 42627, 42629, 42631,
+  42633, 42635, 42637, 42639, 42641, 42643, 42645, 42647,
+  42649, 42651, 42787, 42789, 42791, 42793, 42795, 42797,
+  42799, 42803, 42805, 42807, 42809, 42811, 42813, 42815,
+  42817, 42819, 42821, 42823, 42825, 42827, 42829, 42831,
+  42833, 42835, 42837, 42839, 42841, 42843, 42845, 42847,
+  42849, 42851, 42853, 42855, 42857, 42859, 42861, 42863,
+  42874, 42876, 7545, 42879, 42881, 42883, 42885, 42887,
+  42892, 42897, 42899, 42903, 42905, 42907, 42909, 42911,
+  42913, 42915, 42917, 42919, 42921, 620, 670, 647,
+  43859, 42933, 42935, 294, 43831, 43858, 5024, 5025,
+  5026, 5027, 5028, 5029, 5030, 5031, 5032, 5033,
+  5034, 5035, 5036, 5037, 5038, 5039, 5040, 5041,
+  5042, 5043, 5044, 5045, 5046, 5047, 5048, 5049,
+  5050, 5051, 5052, 5053, 5054, 5055, 5056, 5057,
+  5058, 5059, 5060, 5061, 5062, 5063, 5064, 5065,
+  5066, 5067, 5068, 5069, 5070, 5071, 5072, 5073,
+  5074, 5075, 5076, 5077, 5078, 5079, 5080, 5081,
+  5082, 5083, 5084, 5085, 5086, 5087, 5088, 5089,
+  5090, 5091, 5092, 5093, 5094, 5095, 5096, 5097,
+  5098, 5099, 5100, 5101, 5102, 5103, 35912, 26356,
+  36040, 28369, 20018, 21477, 22865, 21895, 22856, 25078,
+  30313, 32645, 34367, 34746, 35064, 37007, 27138, 27931,
+  28889, 29662, 33853, 37226, 39409, 20098, 21365, 27396,
+  29211, 34349, 40478, 23888, 28651, 34253, 35172, 25289,
+  33240, 34847, 24266, 26391, 28010, 29436, 37070, 20358,
+  20919, 21214, 25796, 27347, 29200, 30439, 34310, 34396,
+  36335, 38706, 39791, 40442, 30860, 31103, 32160, 33737,
+  37636, 35542, 22751, 24324, 31840, 32894, 29282, 30922,
+  36034, 38647, 22744, 23650, 27155, 28122, 28431, 32047,
+  32311, 38475, 21202, 32907, 20956, 20940, 31260, 32190,
+  33777, 38517, 35712, 25295, 35582, 20025, 23527, 24594,
+  29575, 30064, 21271, 30971, 20415, 24489, 19981, 27852,
+  25976, 32034, 21443, 22622, 30465, 33865, 35498, 27578,
+  27784, 25342, 33509, 25504, 30053, 20142, 20841, 20937,
+  26753, 31975, 33391, 35538, 37327, 21237, 21570, 24300,
+  26053, 28670, 31018, 38317, 39530, 40599, 40654, 26310,
+  27511, 36706, 24180, 24976, 25088, 25754, 28451, 29001,
+  29833, 31178, 32244, 32879, 36646, 34030, 36899, 37706,
+  21015, 21155, 21693, 28872, 35010, 24265, 24565, 25467,
+  27566, 31806, 29557, 20196, 22265, 23994, 24604, 29618,
+  29801, 32666, 32838, 37428, 38646, 38728, 38936, 20363,
+  31150, 37300, 38584, 24801, 20102, 20698, 23534, 23615,
+  26009, 29134, 30274, 34044, 36988, 26248, 38446, 21129,
+  26491, 26611, 27969, 28316, 29705, 30041, 30827, 32016,
+  39006, 25134, 38520, 20523, 23833, 28138, 36650, 24459,
+  24900, 26647, 38534, 21033, 21519, 23653, 26131, 26446,
+  26792, 27877, 29702, 30178, 32633, 35023, 35041, 38626,
+  21311, 28346, 21533, 29136, 29848, 34298, 38563, 40023,
+  40607, 26519, 28107, 33256, 31520, 31890, 29376, 28825,
+  35672, 20160, 33590, 21050, 20999, 24230, 25299, 31958,
+  23429, 27934, 26292, 36667, 38477, 24275, 20800, 21952,
+  22618, 26228, 20958, 29482, 30410, 31036, 31070, 31077,
+  31119, 38742, 31934, 34322, 35576, 36920, 37117, 39151,
+  39164, 39208, 40372, 37086, 38583, 20398, 20711, 20813,
+  21193, 21220, 21329, 21917, 22022, 22120, 22592, 22696,
+  23652, 24724, 24936, 24974, 25074, 25935, 26082, 26257,
+  26757, 28023, 28186, 28450, 29038, 29227, 29730, 30865,
+  31049, 31048, 31056, 31062, 31117, 31118, 31296, 31361,
+  31680, 32265, 32321, 32626, 32773, 33261, 33401, 33879,
+  35088, 35222, 35585, 35641, 36051, 36104, 36790, 38627,
+  38911, 38971, 24693, 55376, 57070, 33304, 20006, 20917,
+  20840, 20352, 20805, 20864, 21191, 21242, 21845, 21913,
+  21986, 22707, 22852, 22868, 23138, 23336, 24274, 24281,
+  24425, 24493, 24792, 24910, 24840, 24928, 25140, 25540,
+  25628, 25682, 25942, 26395, 26454, 28379, 28363, 28702,
+  30631, 29237, 29359, 29809, 29958, 30011, 30237, 30239,
+  30427, 30452, 30538, 30528, 30924, 31409, 31867, 32091,
+  32574, 33618, 33775, 34681, 35137, 35206, 35519, 35531,
+  35565, 35722, 36664, 36978, 37273, 37494, 38524, 38875,
+  38923, 39698, 55370, 56394, 55370, 56388, 55372, 57301,
+  15261, 16408, 16441, 55380, 56905, 55383, 56528, 55391,
+  57043, 40771, 40846, 102, 102, 102, 105, 102,
+  108, 102, 102, 105, 102, 102, 108, 383,
+  116, 115, 116, 1396, 1398, 1396, 1381, 1396,
+  1387, 1406, 1398, 1396, 1389, 1497, 1460, 1522,
+  1463, 1506, 1492, 1499, 1500, 1501, 1512, 1514,
+  1513, 1473, 1513, 1474, 64329, 1473, 64329, 1474,
+  1488, 1463, 1488, 1464, 1488, 1468, 1489, 1468,
+  1490, 1468, 1491, 1468, 1492, 1468, 1493, 1468,
+  1494, 1468, 1496, 1468, 1497, 1468, 1498, 1468,
+  1499, 1468, 1500, 1468, 1502, 1468, 1504, 1468,
+  1505, 1468, 1507, 1468, 1508, 1468, 1510, 1468,
+  1511, 1468, 1512, 1468, 1513, 1468, 1514, 1468,
+  1493, 1465, 1489, 1471, 1499, 1471, 1508, 1471,
+  1488, 1500, 1649, 1659, 1662, 1664, 1658, 1663,
+  1657, 1700, 1702, 1668, 1667, 1670, 1671, 1677,
+  1676, 1678, 1672, 1688, 1681, 1705, 1711, 1715,
+  1713, 1722, 1723, 1728, 1729, 1726, 1746, 1747,
+  1709, 1735, 1734, 1736, 1655, 1739, 1733, 1737,
+  1744, 1609, 1574, 1575, 1574, 1749, 1574, 1608,
+  1574, 1735, 1574, 1734, 1574, 1736, 1574, 1744,
+  1574, 1609, 1740, 1574, 1580, 1574, 1581, 1574,
+  1605, 1574, 1610, 1576, 1580, 1576, 1581, 1576,
+  1582, 1576, 1605, 1576, 1609, 1576, 1610, 1578,
+  1580, 1578, 1581, 1578, 1582, 1578, 1605, 1578,
+  1609, 1578, 1610, 1579, 1580, 1579, 1605, 1579,
+  1609, 1579, 1610, 1580, 1581, 1580, 1605, 1581,
+  1580, 1581, 1605, 1582, 1580, 1582, 1581, 1582,
+  1605, 1587, 1580, 1587, 1581, 1587, 1582, 1587,
+  1605, 1589, 1581, 1589, 1605, 1590, 1580, 1590,
+  1581, 1590, 1582, 1590, 1605, 1591, 1581, 1591,
+  1605, 1592, 1605, 1593, 1580, 1593, 1605, 1594,
+  1580, 1594, 1605, 1601, 1580, 1601, 1581, 1601,
+  1582, 1601, 1605, 1601, 1609, 1601, 1610, 1602,
+  1581, 1602, 1605, 1602, 1609, 1602, 1610, 1603,
+  1575, 1603, 1580, 1603, 1581, 1603, 1582, 1603,
+  1604, 1603, 1605, 1603, 1609, 1603, 1610, 1604,
+  1580, 1604, 1581, 1604, 1582, 1604, 1605, 1604,
+  1609, 1604, 1610, 1605, 1580, 1605, 1581, 1605,
+  1582, 1605, 1605, 1605, 1609, 1605, 1610, 1606,
+  1580, 1606, 1581, 1606, 1582, 1606, 1605, 1606,
+  1609, 1606, 1610, 1607, 1580, 1607, 1605, 1607,
+  1609, 1607, 1610, 1610, 1580, 1610, 1581, 1610,
+  1582, 1610, 1605, 1610, 1609, 1610, 1610, 1584,
+  1648, 1585, 1648, 1609, 1648, 32, 1612, 1617,
+  32, 1613, 1617, 32, 1614, 1617, 32, 1615,
+  1617, 32, 1616, 1617, 32, 1617, 1648, 1574,
+  1585, 1574, 1586, 1574, 1606, 1576, 1585, 1576,
+  1586, 1576, 1606, 1578, 1585, 1578, 1586, 1578,
+  1606, 1579, 1585, 1579, 1586, 1579, 1606, 1605,
+  1575, 1606, 1585, 1606, 1586, 1606, 1606, 1610,
+  1585, 1610, 1586, 1610, 1606, 1574, 1582, 1574,
+  1607, 1576, 1607, 1578, 1607, 1589, 1582, 1604,
+  1607, 1606, 1607, 1607, 1648, 1610, 1607, 1579,
+  1607, 1587, 1607, 1588, 1605, 1588, 1607, 1600,
+  1614, 1617, 1600, 1615, 1617, 1600, 1616, 1617,
+  1591, 1609, 1591, 1610, 1593, 1609, 1593, 1610,
+  1594, 1609, 1594, 1610, 1587, 1609, 1587, 1610,
+  1588, 1609, 1588, 1610, 1581, 1609, 1581, 1610,
+  1580, 1609, 1580, 1610, 1582, 1609, 1582, 1610,
+  1589, 1609, 1589, 1610, 1590, 1609, 1590, 1610,
+  1588, 1580, 1588, 1581, 1588, 1582, 1588, 1585,
+  1587, 1585, 1589, 1585, 1590, 1585, 1575, 1611,
+  1578, 1580, 1605, 1578, 1581, 1580, 1578, 1581,
+  1605, 1578, 1582, 1605, 1578, 1605, 1580, 1578,
+  1605, 1581, 1578, 1605, 1582, 1580, 1605, 1581,
+  1581, 1605, 1610, 1581, 1605, 1609, 1587, 1581,
+  1580, 1587, 1580, 1581, 1587, 1580, 1609, 1587,
+  1605, 1581, 1587, 1605, 1580, 1587, 1605, 1605,
+  1589, 1581, 1581, 1589, 1605, 1605, 1588, 1581,
+  1605, 1588, 1580, 1610, 1588, 1605, 1582, 1588,
+  1605, 1605, 1590, 1581, 1609, 1590, 1582, 1605,
+  1591, 1605, 1581, 1591, 1605, 1605, 1591, 1605,
+  1610, 1593, 1580, 1605, 1593, 1605, 1605, 1593,
+  1605, 1609, 1594, 1605, 1605, 1594, 1605, 1610,
+  1594, 1605, 1609, 1601, 1582, 1605, 1602, 1605,
+  1581, 1602, 1605, 1605, 1604, 1581, 1605, 1604,
+  1581, 1610, 1604, 1581, 1609, 1604, 1580, 1580,
+  1604, 1582, 1605, 1604, 1605, 1581, 1605, 1581,
+  1580, 1605, 1581, 1605, 1605, 1581, 1610, 1605,
+  1580, 1581, 1605, 1580, 1605, 1605, 1582, 1580,
+  1605, 1582, 1605, 1605, 1580, 1582, 1607, 1605,
+  1580, 1607, 1605, 1605, 1606, 1581, 1605, 1606,
+  1581, 1609, 1606, 1580, 1605, 1606, 1580, 1609,
+  1606, 1605, 1610, 1606, 1605, 1609, 1610, 1605,
+  1605, 1576, 1582, 1610, 1578, 1580, 1610, 1578,
+  1580, 1609, 1578, 1582, 1610, 1578, 1582, 1609,
+  1578, 1605, 1610, 1578, 1605, 1609, 1580, 1605,
+  1610, 1580, 1581, 1609, 1580, 1605, 1609, 1587,
+  1582, 1609, 1589, 1581, 1610, 1588, 1581, 1610,
+  1590, 1581, 1610, 1604, 1580, 1610, 1604, 1605,
+  1610, 1610, 1581, 1610, 1610, 1580, 1610, 1610,
+  1605, 1610, 1605, 1605, 1610, 1602, 1605, 1610,
+  1606, 1581, 1610, 1593, 1605, 1610, 1603, 1605,
+  1610, 1606, 1580, 1581, 1605, 1582, 1610, 1604,
+  1580, 1605, 1603, 1605, 1605, 1580, 1581, 1610,
+  1581, 1580, 1610, 1605, 1580, 1610, 1601, 1605,
+  1610, 1576, 1581, 1610, 1587, 1582, 1610, 1606,
+  1580, 1610, 1589, 1604, 1746, 1602, 1604, 1746,
+  1575, 1604, 1604, 1607, 1575, 1603, 1576, 1585,
+  1605, 1581, 1605, 1583, 1589, 1604, 1593, 1605,
+  1585, 1587, 1608, 1604, 1593, 1604, 1610, 1607,
+  1608, 1587, 1604, 1605, 1589, 1604, 1609, 17,
+  1589, 1604, 1609, 32, 1575, 1604, 1604, 1607,
+  32, 1593, 1604, 1610, 1607, 32, 1608, 1587,
+  1604, 1605, 7, 1580, 1604, 32, 1580, 1604,
+  1575, 1604, 1607, 1585, 1740, 1575, 1604, 44,
+  12289, 12290, 58, 33, 63, 12310, 12311, 8230,
+  8229, 8212, 8211, 95, 123, 125, 12308, 12309,
+  12304, 12305, 12298, 12299, 12300, 12301, 12302, 12303,
+  91, 93, 8254, 35, 38, 42, 45, 60,
+  62, 92, 36, 37, 64, 32, 1611, 1600,
+  1611, 32, 1612, 32, 1613, 32, 1614, 1600,
+  1614, 32, 1615, 1600, 1615, 32, 1616, 1600,
+  1616, 32, 1617, 1600, 1617, 32, 1618, 1600,
+  1618, 1569, 1570, 1571, 1572, 1573, 1574, 1575,
+  1576, 1577, 1578, 1579, 1580, 1581, 1582, 1583,
+  1584, 1585, 1586, 1587, 1588, 1589, 1590, 1591,
+  1592, 1593, 1594, 1601, 1602, 1603, 1604, 1605,
+  1606, 1607, 1608, 1610, 1604, 1570, 1604, 1571,
+  1604, 1573, 1604, 1575, 34, 39, 47, 65345,
+  65346, 65347, 65348, 65349, 65350, 65351, 65352, 65353,
+  65354, 65355, 65356, 65357, 65358, 65359, 65360, 65361,
+  65362, 65363, 65364, 65365, 65366, 65367, 65368, 65369,
+  65370, 94, 124, 126, 10629, 10630, 12539, 12449,
+  12451, 12453, 12455, 12457, 12515, 12517, 12519, 12483,
+  12540, 12531, 12441, 12442, 12644, 12593, 12594, 12595,
+  12596, 12597, 12598, 12599, 12600, 12601, 12602, 12603,
+  12604, 12605, 12606, 12607, 12608, 12609, 12610, 12611,
+  12612, 12613, 12614, 12615, 12616, 12617, 12618, 12619,
+  12620, 12621, 12622, 12623, 12624, 12625, 12626, 12627,
+  12628, 12629, 12630, 12631, 12632, 12633, 12634, 12635,
+  12636, 12637, 12638, 12639, 12640, 12641, 12642, 12643,
+  162, 163, 172, 175, 166, 165, 8361, 9474,
+  8592, 8593, 8594, 8595, 9632, 9675, 55297, 56360,
+  55297, 56361, 55297, 56362, 55297, 56363, 55297, 56364,
+  55297, 56365, 55297, 56366, 55297, 56367, 55297, 56368,
+  55297, 56369, 55297, 56370, 55297, 56371, 55297, 56372,
+  55297, 56373, 55297, 56374, 55297, 56375, 55297, 56376,
+  55297, 56377, 55297, 56378, 55297, 56379, 55297, 56380,
+  55297, 56381, 55297, 56382, 55297, 56383, 55297, 56384,
+  55297, 56385, 55297, 56386, 55297, 56387, 55297, 56388,
+  55297, 56389, 55297, 56390, 55297, 56391, 55297, 56392,
+  55297, 56393, 55297, 56394, 55297, 56395, 55297, 56396,
+  55297, 56397, 55297, 56398, 55297, 56399, 55297, 56536,
+  55297, 56537, 55297, 56538, 55297, 56539, 55297, 56540,
+  55297, 56541, 55297, 56542, 55297, 56543, 55297, 56544,
+  55297, 56545, 55297, 56546, 55297, 56547, 55297, 56548,
+  55297, 56549, 55297, 56550, 55297, 56551, 55297, 56552,
+  55297, 56553, 55297, 56554, 55297, 56555, 55297, 56556,
+  55297, 56557, 55297, 56558, 55297, 56559, 55297, 56560,
+  55297, 56561, 55297, 56562, 55297, 56563, 55297, 56564,
+  55297, 56565, 55297, 56566, 55297, 56567, 55297, 56568,
+  55297, 56569, 55297, 56570, 55297, 56571, 55299, 56512,
+  55299, 56513, 55299, 56514, 55299, 56515, 55299, 56516,
+  55299, 56517, 55299, 56518, 55299, 56519, 55299, 56520,
+  55299, 56521, 55299, 56522, 55299, 56523, 55299, 56524,
+  55299, 56525, 55299, 56526, 55299, 56527, 55299, 56528,
+  55299, 56529, 55299, 56530, 55299, 56531, 55299, 56532,
+  55299, 56533, 55299, 56534, 55299, 56535, 55299, 56536,
+  55299, 56537, 55299, 56538, 55299, 56539, 55299, 56540,
+  55299, 56541, 55299, 56542, 55299, 56543, 55299, 56544,
+  55299, 56545, 55299, 56546, 55299, 56547, 55299, 56548,
+  55299, 56549, 55299, 56550, 55299, 56551, 55299, 56552,
+  55299, 56553, 55299, 56554, 55299, 56555, 55299, 56556,
+  55299, 56557, 55299, 56558, 55299, 56559, 55299, 56560,
+  55299, 56561, 55299, 56562, 55300, 56473, 55300, 56506,
+  55300, 56475, 55300, 56506, 55300, 56485, 55300, 56506,
+  55300, 56625, 55300, 56615, 55300, 56626, 55300, 56615,
+  55300, 57159, 55300, 57150, 55300, 57159, 55300, 57175,
+  55301, 56505, 55301, 56506, 55301, 56505, 55301, 56496,
+  55301, 56505, 55301, 56509, 55301, 56760, 55301, 56751,
+  55301, 56761, 55301, 56751, 55302, 56512, 55302, 56513,
+  55302, 56514, 55302, 56515, 55302, 56516, 55302, 56517,
+  55302, 56518, 55302, 56519, 55302, 56520, 55302, 56521,
+  55302, 56522, 55302, 56523, 55302, 56524, 55302, 56525,
+  55302, 56526, 55302, 56527, 55302, 56528, 55302, 56529,
+  55302, 56530, 55302, 56531, 55302, 56532, 55302, 56533,
+  55302, 56534, 55302, 56535, 55302, 56536, 55302, 56537,
+  55302, 56538, 55302, 56539, 55302, 56540, 55302, 56541,
+  55302, 56542, 55302, 56543, 55348, 56663, 55348, 56677,
+  55348, 56664, 55348, 56677, 55348, 56671, 55348, 56686,
+  55348, 56671, 55348, 56687, 55348, 56671, 55348, 56688,
+  55348, 56671, 55348, 56689, 55348, 56671, 55348, 56690,
+  55348, 56761, 55348, 56677, 55348, 56762, 55348, 56677,
+  55348, 56763, 55348, 56686, 55348, 56764, 55348, 56686,
+  55348, 56763, 55348, 56687, 55348, 56764, 55348, 56687,
+  305, 567, 913, 914, 916, 917, 918, 919,
+  921, 922, 923, 924, 925, 926, 927, 929,
+  1012, 932, 934, 935, 936, 8711, 8706, 1013,
+  977, 1008, 981, 1009, 982, 988, 55354, 56610,
+  55354, 56611, 55354, 56612, 55354, 56613, 55354, 56614,
+  55354, 56615, 55354, 56616, 55354, 56617, 55354, 56618,
+  55354, 56619, 55354, 56620, 55354, 56621, 55354, 56622,
+  55354, 56623, 55354, 56624, 55354, 56625, 55354, 56626,
+  55354, 56627, 55354, 56628, 55354, 56629, 55354, 56630,
+  55354, 56631, 55354, 56632, 55354, 56633, 55354, 56634,
+  55354, 56635, 55354, 56636, 55354, 56637, 55354, 56638,
+  55354, 56639, 55354, 56640, 55354, 56641, 55354, 56642,
+  55354, 56643, 1646, 1697, 1647, 48, 46, 48,
+  44, 49, 44, 50, 44, 51, 44, 52,
+  44, 53, 44, 54, 44, 55, 44, 56,
+  44, 57, 44, 40, 65, 41, 40, 66,
+  41, 40, 67, 41, 40, 68, 41, 40,
+  69, 41, 40, 70, 41, 40, 71, 41,
+  40, 72, 41, 40, 73, 41, 40, 74,
+  41, 40, 75, 41, 40, 76, 41, 40,
+  77, 41, 40, 78, 41, 40, 79, 41,
+  40, 80, 41, 40, 81, 41, 40, 82,
+  41, 40, 83, 41, 40, 84, 41, 40,
+  85, 41, 40, 86, 41, 40, 87, 41,
+  40, 88, 41, 40, 89, 41, 40, 90,
+  41, 12308, 83, 12309, 67, 68, 87, 90,
+  72, 86, 83, 68, 83, 83, 80, 80,
+  86, 87, 67, 77, 67, 77, 68, 68,
+  74, 12411, 12363, 12467, 12467, 23383, 21452, 12487,
+  22810, 35299, 20132, 26144, 28961, 21069, 24460, 20877,
+  26032, 21021, 32066, 36009, 22768, 21561, 28436, 25237,
+  25429, 36938, 25351, 25171, 31105, 31354, 21512, 28288,
+  30003, 21106, 21942, 37197, 12308, 26412, 12309, 12308,
+  19977, 12309, 12308, 20108, 12309, 12308, 23433, 12309,
+  12308, 28857, 12309, 12308, 25171, 12309, 12308, 30423,
+  12309, 12308, 21213, 12309, 12308, 25943, 12309, 24471,
+  21487, 20029, 20024, 20033, 55360, 56610, 20320, 20411,
+  20482, 20602, 20633, 20687, 13470, 55361, 56890, 20820,
+  20836, 20855, 55361, 56604, 13497, 20839, 55361, 56651,
+  20887, 20900, 20172, 20908, 55396, 56799, 20995, 13535,
+  21051, 21062, 21111, 13589, 21253, 21254, 21321, 21338,
+  21363, 21373, 21375, 55362, 56876, 28784, 21450, 21471,
+  55362, 57187, 21483, 21489, 21510, 21662, 21560, 21576,
+  21608, 21666, 21750, 21776, 21843, 21859, 21892, 21931,
+  21939, 21954, 22294, 22295, 22097, 22132, 22766, 22478,
+  22516, 22541, 22411, 22578, 22577, 22700, 55365, 56548,
+  22770, 22775, 22790, 22818, 22882, 55365, 57000, 55365,
+  57066, 23020, 23067, 23079, 23000, 23142, 14062, 14076,
+  23304, 23358, 55366, 56776, 23491, 23512, 23539, 55366,
+  57112, 23551, 23558, 24403, 14209, 23648, 23744, 23693,
+  55367, 56804, 23875, 55367, 56806, 23918, 23915, 23932,
+  24033, 24034, 14383, 24061, 24104, 24125, 24169, 14434,
+  55368, 56707, 14460, 24240, 24243, 24246, 55400, 57234,
+  55368, 57137, 33281, 24354, 14535, 55372, 57016, 55384,
+  56794, 24418, 24427, 14563, 24474, 24525, 24535, 24569,
+  24705, 14650, 14620, 55369, 57044, 24775, 24904, 24908,
+  24954, 25010, 24996, 25007, 25054, 25104, 25115, 25181,
+  25265, 25300, 25424, 55370, 57100, 25405, 25340, 25448,
+  25475, 25572, 55370, 57329, 25634, 25541, 25513, 14894,
+  25705, 25726, 25757, 25719, 14956, 25964, 55372, 56330,
+  26083, 26360, 26185, 15129, 15112, 15076, 20882, 20885,
+  26368, 26268, 32941, 17369, 26401, 26462, 26451, 55372,
+  57283, 15177, 26618, 26501, 26706, 55373, 56429, 26766,
+  26655, 26900, 26946, 27043, 27114, 27304, 55373, 56995,
+  27355, 15384, 27425, 55374, 56487, 27476, 15438, 27506,
+  27551, 27579, 55374, 56973, 55367, 56587, 55374, 57082,
+  27726, 55375, 56508, 27839, 27853, 27751, 27926, 27966,
+  28009, 28024, 28037, 55375, 56606, 27956, 28207, 28270,
+  15667, 28359, 55375, 57041, 28153, 28526, 55375, 57182,
+  55375, 57230, 28614, 28729, 28699, 15766, 28746, 28797,
+  28791, 28845, 55361, 56613, 28997, 55376, 56931, 29084,
+  55376, 57259, 29224, 29264, 55377, 56840, 29312, 29333,
+  55377, 57141, 55378, 56340, 29562, 29579, 16044, 29605,
+  16056, 29767, 29788, 29829, 29898, 16155, 29988, 55379,
+  56374, 30014, 55379, 56466, 55368, 56735, 30224, 55379,
+  57249, 55379, 57272, 55380, 56388, 16380, 16392, 55380,
+  56563, 55380, 56562, 55380, 56601, 55380, 56627, 30494,
+  30495, 30603, 16454, 16534, 55381, 56349, 30798, 16611,
+  55381, 56870, 55381, 56986, 55381, 57029, 31211, 16687,
+  31306, 31311, 55382, 56700, 55382, 56999, 31470, 16898,
+  55382, 57259, 31686, 31689, 16935, 55383, 56448, 31954,
+  17056, 31976, 31971, 32000, 55383, 57222, 32099, 17153,
+  32199, 32258, 32325, 17204, 55384, 56872, 55384, 56903,
+  17241, 55384, 57049, 32634, 55384, 57150, 32661, 32762,
+  55385, 56538, 55385, 56611, 32864, 55385, 56744, 32880,
+  55372, 57183, 17365, 32946, 33027, 17419, 33086, 23221,
+  55385, 57255, 55385, 57269, 55372, 57235, 55372, 57244,
+  33284, 36766, 17515, 33425, 33419, 33437, 21171, 33457,
+  33459, 33469, 33510, 55386, 57148, 33565, 33635, 33709,
+  33571, 33725, 33767, 33619, 33738, 33740, 33756, 55387,
+  56374, 55387, 56683, 55387, 56533, 17707, 34033, 34035,
+  34070, 55388, 57290, 34148, 55387, 57132, 17757, 17761,
+  55387, 57265, 55388, 56530, 17771, 34384, 34407, 34409,
+  34473, 34440, 34574, 34530, 34600, 34667, 34694, 17879,
+  34785, 34817, 17913, 34912, 55389, 56935, 35031, 35038,
+  17973, 35066, 13499, 55390, 56494, 55390, 56678, 18110,
+  18119, 35488, 55391, 56488, 36011, 36033, 36123, 36215,
+  55391, 57135, 55362, 56324, 36299, 36284, 36336, 55362,
+  56542, 36564, 55393, 56786, 55393, 56813, 37012, 37105,
+  37137, 55393, 57134, 37147, 37432, 37591, 37592, 37500,
+  37881, 37909, 55394, 57338, 38283, 18837, 38327, 55395,
+  56695, 18918, 38595, 23986, 38691, 55396, 56645, 55396,
+  56858, 19054, 19062, 38880, 55397, 56330, 19122, 55397,
+  56470, 38953, 55397, 56758, 39138, 19251, 39209, 39335,
+  39362, 39422, 19406, 55398, 57136, 40000, 40189, 19662,
+  19693, 40295, 55400, 56526, 19704, 55400, 56581, 55400,
+  56846, 55400, 56977, 19798, 40702, 40709, 40719, 40726,
+  55401, 56832, 192, 193, 194, 195, 196, 199,
+  200, 201, 202, 203, 204, 205, 206, 207,
+  208, 209, 210, 211, 212, 213, 214, 216,
+  217, 218, 219, 220, 221, 222, 376, 256,
+  258, 260, 262, 264, 266, 268, 270, 272,
+  274, 276, 278, 280, 282, 284, 286, 288,
+  290, 292, 296, 298, 300, 302, 306, 308,
+  310, 313, 315, 317, 319, 321, 323, 325,
+  327, 330, 332, 334, 336, 338, 340, 342,
+  344, 346, 348, 350, 352, 354, 356, 358,
+  360, 362, 364, 366, 368, 370, 372, 374,
+  377, 379, 381, 579, 386, 388, 391, 395,
+  401, 502, 408, 573, 544, 416, 418, 420,
+  423, 428, 431, 435, 437, 440, 444, 503,
+  453, 452, 456, 455, 459, 458, 461, 463,
+  465, 467, 469, 471, 473, 475, 478, 480,
+  482, 484, 486, 488, 490, 492, 494, 498,
+  497, 500, 504, 506, 508, 510, 512, 514,
+  516, 518, 520, 522, 524, 526, 528, 530,
+  532, 534, 536, 538, 540, 542, 548, 550,
+  552, 554, 556, 558, 560, 562, 571, 11390,
+  11391, 577, 582, 584, 586, 588, 590, 11375,
+  11373, 11376, 385, 390, 393, 394, 399, 42923,
+  403, 42924, 404, 42893, 42922, 407, 406, 42926,
+  11362, 42925, 412, 11374, 413, 415, 11364, 422,
+  425, 42929, 430, 580, 433, 434, 581, 439,
+  42930, 42928, 880, 882, 886, 1021, 1022, 1023,
+  938, 939, 975, 984, 986, 990, 992, 994,
+  996, 998, 1000, 1002, 1004, 1006, 1017, 895,
+  1015, 1018, 1040, 1041, 1042, 1043, 1044, 1045,
+  1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053,
+  1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061,
+  1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069,
+  1070, 1071, 1024, 1025, 1026, 1027, 1028, 1029,
+  1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037,
+  1038, 1039, 1120, 1122, 1124, 1126, 1128, 1130,
+  1132, 1134, 1136, 1138, 1140, 1142, 1144, 1146,
+  1148, 1150, 1152, 1162, 1164, 1166, 1168, 1170,
+  1172, 1174, 1176, 1178, 1180, 1182, 1184, 1186,
+  1188, 1190, 1192, 1194, 1196, 1198, 1200, 1202,
+  1204, 1206, 1208, 1210, 1212, 1214, 1217, 1219,
+  1221, 1223, 1225, 1227, 1229, 1216, 1232, 1234,
+  1236, 1238, 1240, 1242, 1244, 1246, 1248, 1250,
+  1252, 1254, 1256, 1258, 1260, 1262, 1264, 1266,
+  1268, 1270, 1272, 1274, 1276, 1278, 1280, 1282,
+  1284, 1286, 1288, 1290, 1292, 1294, 1296, 1298,
+  1300, 1302, 1304, 1306, 1308, 1310, 1312, 1314,
+  1316, 1318, 1320, 1322, 1324, 1326, 1329, 1330,
+  1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338,
+  1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346,
+  1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354,
+  1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362,
+  1363, 1364, 1365, 1366, 43888, 43889, 43890, 43891,
+  43892, 43893, 43894, 43895, 43896, 43897, 43898, 43899,
+  43900, 43901, 43902, 43903, 43904, 43905, 43906, 43907,
+  43908, 43909, 43910, 43911, 43912, 43913, 43914, 43915,
+  43916, 43917, 43918, 43919, 43920, 43921, 43922, 43923,
+  43924, 43925, 43926, 43927, 43928, 43929, 43930, 43931,
+  43932, 43933, 43934, 43935, 43936, 43937, 43938, 43939,
+  43940, 43941, 43942, 43943, 43944, 43945, 43946, 43947,
+  43948, 43949, 43950, 43951, 43952, 43953, 43954, 43955,
+  43956, 43957, 43958, 43959, 43960, 43961, 43962, 43963,
+  43964, 43965, 43966, 43967, 5112, 5113, 5114, 5115,
+  5116, 5117, 42570, 42877, 11363, 7680, 7682, 7684,
+  7686, 7688, 7690, 7692, 7694, 7696, 7698, 7700,
+  7702, 7704, 7706, 7708, 7710, 7712, 7714, 7716,
+  7718, 7720, 7722, 7724, 7726, 7728, 7730, 7732,
+  7734, 7736, 7738, 7740, 7742, 7744, 7746, 7748,
+  7750, 7752, 7754, 7756, 7758, 7760, 7762, 7764,
+  7766, 7768, 7770, 7772, 7774, 7776, 7778, 7780,
+  7782, 7784, 7786, 7788, 7790, 7792, 7794, 7796,
+  7798, 7800, 7802, 7804, 7806, 7808, 7810, 7812,
+  7814, 7816, 7818, 7820, 7822, 7824, 7826, 7828,
+  7840, 7842, 7844, 7846, 7848, 7850, 7852, 7854,
+  7856, 7858, 7860, 7862, 7864, 7866, 7868, 7870,
+  7872, 7874, 7876, 7878, 7880, 7882, 7884, 7886,
+  7888, 7890, 7892, 7894, 7896, 7898, 7900, 7902,
+  7904, 7906, 7908, 7910, 7912, 7914, 7916, 7918,
+  7920, 7922, 7924, 7926, 7928, 7930, 7932, 7934,
+  7944, 7945, 7946, 7947, 7948, 7949, 7950, 7951,
+  7960, 7961, 7962, 7963, 7964, 7965, 7976, 7977,
+  7978, 7979, 7980, 7981, 7982, 7983, 7992, 7993,
+  7994, 7995, 7996, 7997, 7998, 7999, 8008, 8009,
+  8010, 8011, 8012, 8013, 8025, 8027, 8029, 8031,
+  8040, 8041, 8042, 8043, 8044, 8045, 8046, 8047,
+  8122, 8123, 8136, 8137, 8138, 8139, 8154, 8155,
+  8184, 8185, 8170, 8171, 8186, 8187, 8072, 8073,
+  8074, 8075, 8076, 8077, 8078, 8079, 8088, 8089,
+  8090, 8091, 8092, 8093, 8094, 8095, 8104, 8105,
+  8106, 8107, 8108, 8109, 8110, 8111, 8120, 8121,
+  8124, 8140, 8152, 8153, 8168, 8169, 8172, 8188,
+  8498, 8544, 8545, 8546, 8547, 8548, 8549, 8550,
+  8551, 8552, 8553, 8554, 8555, 8556, 8557, 8558,
+  8559, 8579, 9398, 9399, 9400, 9401, 9402, 9403,
+  9404, 9405, 9406, 9407, 9408, 9409, 9410, 9411,
+  9412, 9413, 9414, 9415, 9416, 9417, 9418, 9419,
+  9420, 9421, 9422, 9423, 11264, 11265, 11266, 11267,
+  11268, 11269, 11270, 11271, 11272, 11273, 11274, 11275,
+  11276, 11277, 11278, 11279, 11280, 11281, 11282, 11283,
+  11284, 11285, 11286, 11287, 11288, 11289, 11290, 11291,
+  11292, 11293, 11294, 11295, 11296, 11297, 11298, 11299,
+  11300, 11301, 11302, 11303, 11304, 11305, 11306, 11307,
+  11308, 11309, 11310, 11360, 570, 574, 11367, 11369,
+  11371, 11378, 11381, 11392, 11394, 11396, 11398, 11400,
+  11402, 11404, 11406, 11408, 11410, 11412, 11414, 11416,
+  11418, 11420, 11422, 11424, 11426, 11428, 11430, 11432,
+  11434, 11436, 11438, 11440, 11442, 11444, 11446, 11448,
+  11450, 11452, 11454, 11456, 11458, 11460, 11462, 11464,
+  11466, 11468, 11470, 11472, 11474, 11476, 11478, 11480,
+  11482, 11484, 11486, 11488, 11490, 11499, 11501, 11506,
+  4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263,
+  4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271,
+  4272, 4273, 4274, 4275, 4276, 4277, 4278, 4279,
+  4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287,
+  4288, 4289, 4290, 4291, 4292, 4293, 4295, 4301,
+  42560, 42562, 42564, 42566, 42568, 42572, 42574, 42576,
+  42578, 42580, 42582, 42584, 42586, 42588, 42590, 42592,
+  42594, 42596, 42598, 42600, 42602, 42604, 42624, 42626,
+  42628, 42630, 42632, 42634, 42636, 42638, 42640, 42642,
+  42644, 42646, 42648, 42650, 42786, 42788, 42790, 42792,
+  42794, 42796, 42798, 42802, 42804, 42806, 42808, 42810,
+  42812, 42814, 42816, 42818, 42820, 42822, 42824, 42826,
+  42828, 42830, 42832, 42834, 42836, 42838, 42840, 42842,
+  42844, 42846, 42848, 42850, 42852, 42854, 42856, 42858,
+  42860, 42862, 42873, 42875, 42878, 42880, 42882, 42884,
+  42886, 42891, 42896, 42898, 42902, 42904, 42906, 42908,
+  42910, 42912, 42914, 42916, 42918, 42920, 42932, 42934,
+  42931, 65313, 65314, 65315, 65316, 65317, 65318, 65319,
+  65320, 65321, 65322, 65323, 65324, 65325, 65326, 65327,
+  65328, 65329, 65330, 65331, 65332, 65333, 65334, 65335,
+  65336, 65337, 65338, 55297, 56320, 55297, 56321, 55297,
+  56322, 55297, 56323, 55297, 56324, 55297, 56325, 55297,
+  56326, 55297, 56327, 55297, 56328, 55297, 56329, 55297,
+  56330, 55297, 56331, 55297, 56332, 55297, 56333, 55297,
+  56334, 55297, 56335, 55297, 56336, 55297, 56337, 55297,
+  56338, 55297, 56339, 55297, 56340, 55297, 56341, 55297,
+  56342, 55297, 56343, 55297, 56344, 55297, 56345, 55297,
+  56346, 55297, 56347, 55297, 56348, 55297, 56349, 55297,
+  56350, 55297, 56351, 55297, 56352, 55297, 56353, 55297,
+  56354, 55297, 56355, 55297, 56356, 55297, 56357, 55297,
+  56358, 55297, 56359, 55297, 56496, 55297, 56497, 55297,
+  56498, 55297, 56499, 55297, 56500, 55297, 56501, 55297,
+  56502, 55297, 56503, 55297, 56504, 55297, 56505, 55297,
+  56506, 55297, 56507, 55297, 56508, 55297, 56509, 55297,
+  56510, 55297, 56511, 55297, 56512, 55297, 56513, 55297,
+  56514, 55297, 56515, 55297, 56516, 55297, 56517, 55297,
+  56518, 55297, 56519, 55297, 56520, 55297, 56521, 55297,
+  56522, 55297, 56523, 55297, 56524, 55297, 56525, 55297,
+  56526, 55297, 56527, 55297, 56528, 55297, 56529, 55297,
+  56530, 55297, 56531, 55299, 56448, 55299, 56449, 55299,
+  56450, 55299, 56451, 55299, 56452, 55299, 56453, 55299,
+  56454, 55299, 56455, 55299, 56456, 55299, 56457, 55299,
+  56458, 55299, 56459, 55299, 56460, 55299, 56461, 55299,
+  56462, 55299, 56463, 55299, 56464, 55299, 56465, 55299,
+  56466, 55299, 56467, 55299, 56468, 55299, 56469, 55299,
+  56470, 55299, 56471, 55299, 56472, 55299, 56473, 55299,
+  56474, 55299, 56475, 55299, 56476, 55299, 56477, 55299,
+  56478, 55299, 56479, 55299, 56480, 55299, 56481, 55299,
+  56482, 55299, 56483, 55299, 56484, 55299, 56485, 55299,
+  56486, 55299, 56487, 55299, 56488, 55299, 56489, 55299,
+  56490, 55299, 56491, 55299, 56492, 55299, 56493, 55299,
+  56494, 55299, 56495, 55299, 56496, 55299, 56497, 55299,
+  56498, 55302, 56480, 55302, 56481, 55302, 56482, 55302,
+  56483, 55302, 56484, 55302, 56485, 55302, 56486, 55302,
+  56487, 55302, 56488, 55302, 56489, 55302, 56490, 55302,
+  56491, 55302, 56492, 55302, 56493, 55302, 56494, 55302,
+  56495, 55302, 56496, 55302, 56497, 55302, 56498, 55302,
+  56499, 55302, 56500, 55302, 56501, 55302, 56502, 55302,
+  56503, 55302, 56504, 55302, 56505, 55302, 56506, 55302,
+  56507, 55302, 56508, 55302, 56509, 55302, 56510, 55302,
+  56511, 55354, 56576, 55354, 56577, 55354, 56578, 55354,
+  56579, 55354, 56580, 55354, 56581, 55354, 56582, 55354,
+  56583, 55354, 56584, 55354, 56585, 55354, 56586, 55354,
+  56587, 55354, 56588, 55354, 56589, 55354, 56590, 55354,
+  56591, 55354, 56592, 55354, 56593, 55354, 56594, 55354,
+  56595, 55354, 56596, 55354, 56597, 55354, 56598, 55354,
+  56599, 55354, 56600, 55354, 56601, 55354, 56602, 55354,
+  56603, 55354, 56604, 55354, 56605, 55354, 56606, 55354,
   56607, 55354, 56608, 55354, 56609, };
 
 UTF8PROC_DATA
 const utf8proc_uint16_t utf8proc_stage1table[] = {
-  0, 256, 512, 768, 1024, 1280, 1536, 
-  1792, 2048, 2304, 2560, 2816, 3072, 3328, 3584, 
-  3840, 4096, 4352, 4608, 4864, 5120, 5376, 5632, 
-  5888, 6144, 6400, 6656, 6912, 7168, 7424, 7680, 
-  7936, 8192, 8448, 8704, 8960, 9216, 9472, 9728, 
-  9984, 10240, 10496, 10752, 11008, 11264, 11520, 11776, 
-  12032, 12288, 12544, 12800, 13056, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13568, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13824, 14080, 13312, 13312, 13312, 14336, 13312, 14592, 
-  14848, 15104, 15360, 15616, 15872, 16128, 16384, 16640, 
-  16896, 17152, 17408, 17664, 16128, 16384, 16640, 16896, 
-  17152, 17408, 17664, 16128, 16384, 16640, 16896, 17152, 
-  17408, 17664, 16128, 16384, 16640, 16896, 17152, 17408, 
-  17664, 16128, 16384, 16640, 16896, 17152, 17408, 17664, 
-  16128, 16384, 16640, 16896, 17152, 17408, 17664, 16128, 
-  17920, 18176, 18176, 18176, 18176, 18176, 18176, 18176, 
-  18176, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18688, 18944, 19200, 19456, 19712, 19968, 
-  20224, 20480, 20736, 20992, 21248, 21504, 21760, 22016, 
-  22272, 22528, 22784, 23040, 23296, 23552, 23808, 24064, 
-  23808, 24320, 24576, 24832, 25088, 25344, 25600, 25856, 
-  26112, 26368, 23808, 26624, 23808, 26880, 23808, 23808, 
-  23808, 27136, 27136, 27136, 27392, 27648, 27904, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 27136, 27136, 27136, 27136, 28160, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 27136, 27136, 28416, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 27136, 27136, 28672, 28928, 23808, 23808, 23808, 
-  29184, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  29440, 13312, 13312, 29696, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 29952, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 30208, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 30464, 30720, 30976, 31232, 31488, 31744, 32000, 
-  32256, 10240, 10240, 32512, 23808, 23808, 23808, 23808, 
-  23808, 32768, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 33024, 33280, 23808, 23808, 23808, 23808, 33536, 
-  23808, 33792, 34048, 34304, 34560, 34816, 35072, 35328, 
-  35584, 35840, 36096, 23808, 23808, 23808, 23808, 23808, 
-  23808, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 36352, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  36608, 36864, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, 
-  13312, 13312, 13312, 13312, 13312, 13312, 13312, 37120, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 37376, 37632, 37888, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 38144, 38400, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808, 
-  23808, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  38656, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
-  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432, 
+  0, 256, 512, 768, 1024, 1280, 1536,
+  1792, 2048, 2304, 2560, 2816, 3072, 3328, 3584,
+  3840, 4096, 4352, 4608, 4864, 5120, 5376, 5632,
+  5888, 6144, 6400, 6656, 6912, 7168, 7424, 7680,
+  7936, 8192, 8448, 8704, 8960, 9216, 9472, 9728,
+  9984, 10240, 10496, 10752, 11008, 11264, 11520, 11776,
+  12032, 12288, 12544, 12800, 13056, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13568, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13824, 14080, 13312, 13312, 13312, 14336, 13312, 14592,
+  14848, 15104, 15360, 15616, 15872, 16128, 16384, 16640,
+  16896, 17152, 17408, 17664, 16128, 16384, 16640, 16896,
+  17152, 17408, 17664, 16128, 16384, 16640, 16896, 17152,
+  17408, 17664, 16128, 16384, 16640, 16896, 17152, 17408,
+  17664, 16128, 16384, 16640, 16896, 17152, 17408, 17664,
+  16128, 16384, 16640, 16896, 17152, 17408, 17664, 16128,
+  17920, 18176, 18176, 18176, 18176, 18176, 18176, 18176,
+  18176, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18688, 18944, 19200, 19456, 19712, 19968,
+  20224, 20480, 20736, 20992, 21248, 21504, 21760, 22016,
+  22272, 22528, 22784, 23040, 23296, 23552, 23808, 24064,
+  23808, 24320, 24576, 24832, 25088, 25344, 25600, 25856,
+  26112, 26368, 23808, 26624, 23808, 26880, 23808, 23808,
+  23808, 27136, 27136, 27136, 27392, 27648, 27904, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 27136, 27136, 27136, 27136, 28160, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 27136, 27136, 28416,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 27136, 27136, 28672, 28928, 23808, 23808, 23808,
+  29184, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  29440, 13312, 13312, 29696, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 29952, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 30208, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 30464, 30720, 30976, 31232, 31488, 31744, 32000,
+  32256, 10240, 10240, 32512, 23808, 23808, 23808, 23808,
+  23808, 32768, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 33024, 33280, 23808, 23808, 23808, 23808, 33536,
+  23808, 33792, 34048, 34304, 34560, 34816, 35072, 35328,
+  35584, 35840, 36096, 23808, 23808, 23808, 23808, 23808,
+  23808, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 36352,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  36608, 36864, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312,
+  13312, 13312, 13312, 13312, 13312, 13312, 13312, 37120,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 37376, 37632, 37888, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 38144, 38400, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 23808, 23808, 23808, 23808, 23808, 23808, 23808,
+  23808, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  38656, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
+  18432, 18432, 18432, 18432, 18432, 18432, 18432, 18432,
   38656, };
 
 UTF8PROC_DATA
 const utf8proc_uint16_t utf8proc_stage2table[] = {
-  1, 2, 2, 2, 2, 2, 2, 
-  2, 2, 3, 4, 3, 5, 6, 2, 
-  2, 2, 2, 2, 2, 2, 2, 2, 
-  2, 2, 2, 2, 2, 7, 7, 7, 
-  3, 8, 9, 9, 10, 11, 10, 9, 
-  9, 12, 13, 9, 14, 15, 16, 15, 
-  15, 17, 17, 17, 17, 17, 17, 17, 
-  17, 17, 17, 15, 9, 18, 19, 20, 
-  9, 9, 21, 22, 23, 24, 25, 26, 
-  27, 28, 29, 30, 31, 32, 33, 34, 
-  35, 36, 37, 38, 39, 40, 41, 42, 
-  43, 44, 45, 46, 12, 9, 13, 47, 
-  48, 47, 49, 50, 51, 52, 53, 54, 
-  55, 56, 57, 58, 59, 60, 61, 62, 
-  63, 64, 65, 66, 67, 68, 69, 70, 
-  71, 72, 73, 74, 12, 75, 13, 75, 
-  2, 2, 2, 2, 2, 2, 7, 2, 
-  2, 2, 2, 2, 2, 2, 2, 2, 
-  2, 2, 2, 2, 2, 2, 2, 2, 
-  2, 2, 2, 2, 2, 2, 2, 2, 
-  2, 76, 9, 11, 11, 11, 11, 77, 
-  9, 78, 77, 79, 80, 75, 81, 77, 
-  82, 83, 84, 85, 86, 87, 88, 9, 
-  9, 89, 90, 91, 92, 93, 94, 95, 
-  9, 96, 97, 98, 99, 100, 101, 102, 
-  103, 104, 105, 106, 107, 108, 109, 110, 
-  111, 112, 113, 114, 115, 116, 117, 118, 
-  75, 119, 120, 121, 122, 123, 124, 125, 
-  126, 127, 128, 129, 130, 131, 132, 133, 
-  134, 135, 136, 137, 138, 139, 140, 141, 
-  142, 143, 144, 145, 146, 147, 148, 149, 
-  75, 150, 151, 152, 153, 154, 155, 156, 
-  157, 158, 159, 160, 161, 162, 163, 164, 
-  165, 166, 167, 168, 169, 170, 171, 172, 
-  173, 174, 175, 176, 177, 178, 179, 180, 
-  181, 182, 183, 184, 185, 186, 187, 188, 
-  189, 190, 191, 192, 193, 194, 195, 196, 
-  197, 198, 199, 200, 201, 202, 203, 204, 
-  205, 206, 207, 208, 209, 210, 211, 212, 
-  213, 214, 215, 216, 217, 218, 219, 220, 
-  221, 222, 223, 224, 225, 226, 227, 228, 
-  229, 230, 231, 232, 233, 234, 235, 236, 
-  237, 238, 239, 240, 241, 242, 243, 244, 
-  245, 246, 247, 248, 249, 250, 251, 252, 
-  253, 254, 255, 256, 257, 258, 259, 260, 
-  261, 262, 263, 264, 265, 266, 267, 268, 
-  269, 270, 271, 272, 273, 274, 275, 276, 
-  277, 278, 279, 280, 281, 282, 283, 284, 
-  285, 286, 287, 288, 289, 290, 291, 292, 
-  293, 294, 295, 296, 297, 298, 214, 299, 
-  300, 301, 302, 303, 304, 305, 306, 307, 
-  308, 309, 310, 311, 214, 312, 313, 314, 
-  315, 316, 317, 318, 319, 320, 321, 322, 
-  323, 324, 325, 214, 214, 326, 327, 328, 
-  329, 330, 331, 332, 333, 334, 335, 336, 
-  337, 338, 339, 214, 340, 341, 342, 214, 
-  343, 340, 340, 340, 340, 344, 345, 346, 
-  347, 348, 349, 350, 351, 352, 353, 354, 
-  355, 356, 357, 358, 359, 360, 361, 362, 
-  363, 364, 365, 366, 367, 368, 369, 370, 
-  371, 372, 373, 374, 375, 376, 377, 378, 
-  379, 380, 381, 382, 383, 384, 385, 386, 
-  387, 388, 389, 390, 391, 392, 393, 394, 
-  395, 396, 397, 398, 399, 400, 401, 402, 
-  403, 404, 405, 406, 407, 408, 409, 410, 
-  411, 412, 413, 414, 415, 416, 417, 418, 
-  419, 420, 421, 422, 423, 424, 425, 426, 
-  427, 428, 429, 430, 431, 432, 433, 434, 
-  435, 436, 214, 437, 438, 439, 440, 441, 
-  442, 443, 444, 445, 446, 447, 448, 449, 
-  450, 451, 452, 453, 454, 214, 214, 214, 
-  214, 214, 214, 455, 456, 457, 458, 459, 
-  460, 461, 462, 463, 464, 465, 466, 467, 
-  468, 469, 470, 471, 472, 473, 474, 475, 
-  476, 477, 478, 479, 480, 481, 214, 482, 
-  483, 214, 484, 214, 485, 486, 214, 214, 
-  214, 487, 488, 214, 489, 214, 490, 491, 
-  214, 492, 493, 494, 495, 496, 214, 214, 
-  497, 214, 498, 499, 214, 214, 500, 214, 
-  214, 214, 214, 214, 214, 214, 501, 214, 
-  214, 502, 214, 214, 503, 214, 214, 214, 
-  504, 505, 506, 507, 508, 509, 214, 214, 
-  214, 214, 214, 510, 214, 340, 214, 214, 
-  214, 214, 214, 214, 214, 214, 511, 512, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 513, 514, 515, 516, 517, 518, 519, 
-  520, 521, 522, 522, 523, 523, 523, 523, 
-  523, 523, 523, 47, 47, 47, 47, 522, 
-  522, 522, 522, 522, 522, 522, 522, 522, 
-  522, 523, 523, 47, 47, 47, 47, 47, 
-  47, 524, 525, 526, 527, 528, 529, 47, 
-  47, 530, 531, 532, 533, 534, 47, 47, 
-  47, 47, 47, 47, 47, 522, 47, 523, 
-  47, 47, 47, 47, 47, 47, 47, 47, 
-  47, 47, 47, 47, 47, 47, 47, 47, 
-  47, 535, 536, 537, 538, 539, 540, 541, 
-  542, 543, 544, 545, 546, 547, 540, 540, 
-  548, 540, 549, 540, 550, 551, 552, 553, 
-  553, 553, 553, 552, 554, 553, 553, 553, 
-  553, 553, 555, 555, 556, 557, 558, 559, 
-  560, 561, 553, 553, 553, 553, 562, 563, 
-  553, 564, 565, 553, 553, 566, 566, 566, 
-  566, 567, 553, 553, 553, 553, 540, 540, 
-  540, 568, 569, 570, 571, 572, 573, 540, 
-  553, 553, 553, 540, 540, 540, 553, 553, 
-  574, 540, 540, 540, 553, 553, 553, 553, 
-  540, 552, 553, 553, 540, 575, 576, 576, 
-  575, 576, 576, 575, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 577, 578, 579, 580, 581, 47, 582, 
-  583, 0, 0, 584, 585, 586, 587, 588, 
-  589, 0, 0, 0, 0, 87, 590, 591, 
-  592, 593, 594, 595, 0, 596, 0, 597, 
-  598, 599, 600, 601, 602, 603, 604, 605, 
-  606, 607, 608, 609, 610, 611, 612, 613, 
-  614, 615, 616, 0, 617, 618, 619, 620, 
-  621, 622, 623, 624, 625, 626, 627, 628, 
-  629, 630, 631, 632, 633, 634, 635, 636, 
-  637, 638, 639, 640, 641, 642, 643, 644, 
-  645, 646, 647, 648, 649, 650, 651, 652, 
-  653, 654, 655, 656, 657, 658, 659, 660, 
-  661, 662, 663, 664, 665, 666, 667, 668, 
-  669, 670, 671, 672, 673, 674, 675, 676, 
-  677, 678, 679, 680, 681, 682, 683, 684, 
-  685, 686, 687, 688, 689, 690, 691, 692, 
-  693, 694, 695, 696, 697, 698, 699, 75, 
-  700, 701, 702, 703, 704, 214, 705, 706, 
-  707, 708, 709, 710, 711, 712, 713, 714, 
-  715, 716, 717, 718, 719, 720, 721, 722, 
-  723, 724, 725, 726, 727, 728, 729, 730, 
-  731, 732, 733, 734, 735, 736, 737, 738, 
-  739, 740, 741, 742, 743, 744, 745, 746, 
-  747, 748, 749, 750, 751, 752, 753, 754, 
-  755, 756, 757, 758, 759, 760, 761, 762, 
-  763, 764, 765, 766, 767, 768, 769, 770, 
-  771, 772, 773, 774, 775, 776, 777, 778, 
-  779, 780, 781, 782, 783, 784, 785, 786, 
-  787, 788, 789, 790, 791, 792, 793, 794, 
-  795, 796, 797, 798, 799, 800, 801, 802, 
-  803, 804, 805, 806, 807, 808, 809, 810, 
-  811, 812, 813, 814, 815, 816, 817, 818, 
-  819, 820, 821, 822, 823, 824, 825, 826, 
-  827, 828, 829, 830, 831, 832, 833, 834, 
-  835, 836, 837, 838, 540, 540, 540, 540, 
-  540, 839, 839, 840, 841, 842, 843, 844, 
-  845, 846, 847, 848, 849, 850, 851, 852, 
-  853, 854, 855, 856, 857, 858, 859, 860, 
-  861, 862, 863, 864, 865, 866, 867, 868, 
-  869, 870, 871, 872, 873, 874, 875, 876, 
-  877, 878, 879, 880, 881, 882, 883, 884, 
-  885, 886, 887, 888, 889, 890, 891, 892, 
-  893, 894, 895, 896, 897, 898, 899, 900, 
-  901, 902, 903, 904, 905, 906, 907, 908, 
-  909, 910, 911, 912, 913, 914, 915, 916, 
-  917, 918, 919, 920, 921, 922, 923, 924, 
-  925, 926, 927, 928, 929, 930, 931, 932, 
-  933, 934, 935, 936, 937, 938, 939, 940, 
-  941, 942, 943, 944, 945, 946, 947, 948, 
-  949, 950, 951, 952, 953, 954, 955, 956, 
-  957, 958, 959, 960, 961, 962, 963, 964, 
-  965, 966, 967, 968, 969, 970, 971, 972, 
-  973, 974, 975, 976, 977, 978, 979, 980, 
-  981, 982, 983, 984, 985, 986, 987, 988, 
-  989, 990, 991, 992, 993, 994, 995, 996, 
-  997, 998, 999, 1000, 1001, 1002, 1003, 1004, 
-  1005, 0, 1006, 1007, 1008, 1009, 1010, 1011, 
-  1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 
-  1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 
-  1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 
-  1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 
-  0, 0, 523, 1044, 1044, 1044, 1044, 1044, 
-  1044, 0, 1045, 1046, 1047, 1048, 1049, 1050, 
-  1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 
-  1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 
-  1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 
-  1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 
-  1083, 0, 1044, 1084, 0, 0, 1085, 1085, 
-  11, 0, 553, 540, 540, 540, 540, 553, 
-  540, 540, 540, 1086, 553, 540, 540, 540, 
-  540, 540, 540, 553, 553, 553, 553, 553, 
-  553, 540, 540, 553, 540, 540, 1086, 1087, 
-  540, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 
-  1095, 1096, 1097, 1097, 1098, 1099, 1100, 1101, 
-  1102, 1103, 1104, 1105, 1103, 540, 553, 1103, 
-  1096, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 0, 0, 0, 0, 
-  0, 1106, 1106, 1106, 1103, 1103, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1107, 1108, 1108, 1108, 1107, 1107, 1109, 
-  1109, 1110, 10, 10, 1111, 15, 1112, 1085, 
-  1085, 540, 540, 540, 540, 540, 540, 540, 
-  540, 1113, 1114, 1115, 1112, 1116, 0, 1117, 
-  1112, 1118, 1118, 1119, 1120, 1121, 1122, 1123, 
-  1124, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1125, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1126, 1127, 1118, 1128, 1129, 1130, 1131, 1113, 
-  1114, 1115, 1132, 1133, 1134, 1135, 1136, 553, 
-  540, 540, 540, 540, 540, 553, 540, 540, 
-  553, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 
-  1137, 1137, 1137, 10, 1138, 1138, 1112, 1118, 
-  1118, 1139, 1118, 1118, 1118, 1118, 1140, 1141, 
-  1142, 1143, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1126, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1144, 1145, 1146, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1147, 1148, 1112, 1149, 540, 
-  540, 540, 540, 540, 540, 540, 1108, 1085, 
-  540, 540, 540, 540, 553, 540, 1125, 1125, 
-  540, 540, 1085, 553, 540, 540, 553, 1118, 
-  1118, 17, 17, 17, 17, 17, 17, 17, 
-  17, 17, 17, 1118, 1118, 1118, 1150, 1150, 
-  1126, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 
-  1117, 1117, 1117, 1117, 1117, 1117, 1117, 0, 
-  1151, 1126, 1152, 1126, 1126, 1126, 1126, 1126, 
-  1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 
-  1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 
-  1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 
-  1126, 540, 553, 540, 540, 553, 540, 540, 
-  553, 553, 553, 540, 553, 553, 540, 553, 
-  540, 540, 540, 553, 540, 553, 540, 553, 
-  540, 553, 540, 540, 0, 0, 1126, 1126, 
-  1126, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1126, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1126, 1126, 
-  1126, 1118, 1118, 1118, 1118, 1118, 1118, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1118, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 
-  1154, 1154, 1154, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 540, 540, 540, 540, 
-  540, 540, 540, 553, 540, 1155, 1155, 77, 
-  9, 9, 9, 1155, 0, 0, 0, 0, 
-  0, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 540, 
-  540, 540, 540, 1157, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 1157, 540, 540, 
-  540, 1157, 540, 540, 540, 540, 540, 0, 
-  0, 1158, 1158, 1158, 1158, 1158, 1158, 1158, 
-  1158, 1158, 1158, 1158, 1158, 1158, 1158, 1158, 
-  0, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 553, 553, 553, 0, 0, 1158, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 0, 1118, 
-  1118, 1118, 1118, 1118, 1118, 1118, 1118, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 1107, 553, 540, 540, 553, 
-  540, 540, 553, 540, 540, 540, 553, 553, 
-  553, 1129, 1130, 1131, 540, 540, 540, 553, 
-  540, 540, 553, 553, 540, 540, 540, 540, 
-  540, 1153, 1153, 1153, 1159, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1161, 1162, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1163, 1164, 1160, 1165, 1166, 1160, 1160, 
-  1160, 1160, 1160, 1153, 1159, 1167, 1160, 1159, 
-  1159, 1159, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1159, 1159, 1159, 1159, 1168, 1159, 
-  1159, 1160, 540, 553, 540, 540, 1153, 1153, 
-  1153, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 
-  1176, 1160, 1160, 1153, 1153, 1177, 1177, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1177, 1179, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1153, 1159, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 0, 
-  1160, 1160, 0, 0, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 0, 0, 0, 1160, 
-  1160, 1160, 1160, 0, 0, 1180, 1160, 1181, 
-  1159, 1159, 1153, 1153, 1153, 1153, 0, 0, 
-  1182, 1159, 0, 0, 1183, 1184, 1168, 1160, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  1185, 0, 0, 0, 0, 1186, 1187, 0, 
-  1188, 1160, 1160, 1153, 1153, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1160, 1160, 1189, 1189, 1190, 1190, 1190, 
-  1190, 1190, 1190, 1191, 1189, 0, 0, 0, 
-  0, 0, 1153, 1153, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 0, 0, 0, 0, 
-  1160, 1160, 0, 0, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1192, 0, 1160, 1193, 
-  0, 1160, 1160, 0, 0, 1180, 0, 1159, 
-  1159, 1159, 1153, 1153, 0, 0, 0, 0, 
-  1153, 1153, 0, 0, 1153, 1153, 1168, 0, 
-  0, 0, 1153, 0, 0, 0, 0, 0, 
-  0, 0, 1194, 1195, 1196, 1160, 0, 1197, 
-  0, 0, 0, 0, 0, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1153, 1153, 1160, 1160, 1160, 1153, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 1153, 1153, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0, 
-  1160, 1160, 1160, 0, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 0, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 1180, 1160, 1159, 
-  1159, 1159, 1153, 1153, 1153, 1153, 1153, 0, 
-  1153, 1153, 1159, 0, 1159, 1159, 1168, 0, 
-  0, 1160, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1153, 1153, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1177, 1189, 0, 0, 0, 0, 0, 
-  0, 0, 1160, 0, 0, 0, 0, 0, 
-  0, 0, 1153, 1159, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 0, 
-  1160, 1160, 0, 0, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 0, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 1180, 1160, 1198, 
-  1153, 1159, 1153, 1153, 1153, 1153, 0, 0, 
-  1199, 1200, 0, 0, 1201, 1202, 1168, 0, 
-  0, 0, 0, 0, 0, 0, 0, 1203, 
-  1204, 0, 0, 0, 0, 1205, 1206, 0, 
-  1160, 1160, 1160, 1153, 1153, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1191, 1160, 1190, 1190, 1190, 1190, 1190, 
-  1190, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 1153, 1160, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 0, 0, 0, 1160, 
-  1160, 1160, 0, 1207, 1160, 1208, 1160, 0, 
-  0, 0, 1160, 1160, 0, 1160, 0, 1160, 
-  1160, 0, 0, 0, 1160, 1160, 0, 0, 
-  0, 1160, 1160, 1160, 0, 0, 0, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 0, 0, 1209, 
-  1159, 1153, 1159, 1159, 0, 0, 0, 1210, 
-  1211, 1159, 0, 1212, 1213, 1214, 1168, 0, 
-  0, 1160, 0, 0, 0, 0, 0, 0, 
-  1215, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1190, 1190, 1190, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1189, 1085, 0, 0, 0, 0, 
-  0, 1153, 1159, 1159, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 0, 1160, 1153, 
-  1153, 1153, 1159, 1159, 1159, 1159, 0, 1216, 
-  1153, 1217, 0, 1153, 1153, 1153, 1168, 0, 
-  0, 0, 0, 0, 0, 0, 1218, 1219, 
-  0, 1160, 1160, 1160, 0, 0, 0, 0, 
-  0, 1160, 1160, 1153, 1153, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 
-  1191, 1160, 1153, 1159, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 0, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 1180, 1160, 1159, 
-  1221, 1222, 1159, 1223, 1159, 1159, 0, 1224, 
-  1225, 1226, 0, 1227, 1228, 1153, 1168, 0, 
-  0, 0, 0, 0, 0, 0, 1229, 1230, 
-  0, 0, 0, 0, 0, 0, 0, 1160, 
-  0, 1160, 1160, 1153, 1153, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 0, 1160, 1160, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 1153, 1159, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 0, 0, 1160, 1231, 
-  1159, 1159, 1153, 1153, 1153, 1153, 0, 1232, 
-  1233, 1159, 0, 1234, 1235, 1236, 1168, 1237, 
-  1191, 0, 0, 0, 0, 1160, 1160, 1160, 
-  1238, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1160, 1160, 1160, 1153, 1153, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1191, 1160, 1160, 1160, 1160, 1160, 
-  1160, 0, 0, 1159, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 0, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 0, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 0, 1160, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 0, 0, 1239, 0, 0, 0, 0, 
-  1240, 1159, 1159, 1153, 1153, 1153, 0, 1153, 
-  0, 1159, 1241, 1242, 1159, 1243, 1244, 1245, 
-  1246, 0, 0, 0, 0, 0, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 0, 0, 1159, 1159, 1177, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 1153, 340, 1247, 1153, 1153, 1153, 
-  1153, 1248, 1248, 1168, 0, 0, 0, 0, 
-  11, 340, 340, 340, 340, 340, 340, 523, 
-  1153, 1249, 1249, 1249, 1249, 1153, 1153, 1153, 
-  1044, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1250, 1044, 1044, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 340, 340, 0, 340, 0, 0, 
-  340, 340, 0, 340, 0, 0, 340, 0, 
-  0, 0, 0, 0, 0, 340, 340, 340, 
-  340, 0, 340, 340, 340, 340, 340, 340, 
-  340, 0, 340, 340, 340, 0, 340, 0, 
-  340, 0, 0, 340, 340, 0, 340, 340, 
-  340, 340, 1153, 340, 1251, 1153, 1153, 1153, 
-  1153, 1252, 1252, 0, 1153, 1153, 340, 0, 
-  0, 340, 340, 340, 340, 340, 0, 523, 
-  0, 1253, 1253, 1253, 1253, 1153, 1153, 0, 
-  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1250, 0, 0, 1254, 1255, 340, 
-  340, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1191, 1191, 1191, 1177, 1177, 1177, 
-  1177, 1177, 1177, 1177, 1177, 1256, 1177, 1177, 
-  1177, 1177, 1177, 1177, 1191, 1177, 1191, 1191, 
-  1191, 553, 553, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1190, 1190, 1190, 1191, 553, 1191, 
-  553, 1191, 1257, 1258, 1259, 1258, 1259, 1159, 
-  1159, 1160, 1160, 1160, 1260, 1160, 1160, 1160, 
-  1160, 0, 1160, 1160, 1160, 1160, 1261, 1160, 
-  1160, 1160, 1160, 1262, 1160, 1160, 1160, 1160, 
-  1263, 1160, 1160, 1160, 1160, 1264, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1265, 1160, 1160, 1160, 0, 0, 
-  0, 0, 1266, 1267, 1268, 1269, 1270, 1271, 
-  1272, 1273, 1274, 1267, 1267, 1267, 1267, 1153, 
-  1159, 1267, 1275, 540, 540, 1168, 1177, 540, 
-  540, 1160, 1160, 1160, 1160, 1160, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1276, 1153, 1153, 1153, 
-  1153, 0, 1153, 1153, 1153, 1153, 1277, 1153, 
-  1153, 1153, 1153, 1278, 1153, 1153, 1153, 1153, 
-  1279, 1153, 1153, 1153, 1153, 1280, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1281, 1153, 1153, 1153, 0, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 553, 
-  1191, 1191, 1191, 1191, 1191, 1191, 0, 1191, 
-  1191, 1177, 1177, 1177, 1177, 1177, 1191, 1191, 
-  1191, 1191, 1177, 1177, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 340, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 340, 1160, 1160, 1160, 1160, 1282, 1283, 
-  1160, 1160, 1160, 1160, 1284, 1284, 1153, 1285, 
-  1153, 1153, 1159, 1153, 1153, 1153, 1153, 1153, 
-  1180, 1284, 1168, 1168, 1159, 1159, 1153, 1153, 
-  1160, 1178, 1178, 1250, 1250, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1044, 1044, 1044, 1177, 1177, 
-  1177, 1160, 1160, 1160, 1160, 340, 1160, 1159, 
-  1159, 1153, 1153, 1160, 1160, 1160, 1160, 1153, 
-  1153, 1153, 1160, 1284, 1284, 1284, 1160, 1160, 
-  1284, 1284, 1284, 1284, 1284, 1284, 1284, 1160, 
-  1160, 1160, 1153, 1153, 1153, 1153, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1153, 1284, 1159, 1153, 1153, 
-  1284, 1284, 1284, 1284, 1284, 1284, 553, 1160, 
-  1284, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1284, 1284, 1284, 1153, 1191, 
-  1191, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 
-  1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300, 
-  1301, 1302, 1303, 1304, 1305, 1306, 1307, 1308, 
-  1309, 1310, 1311, 1312, 1313, 1314, 1315, 1316, 
-  1317, 1318, 1319, 1320, 1321, 1322, 1323, 0, 
-  1324, 0, 0, 0, 0, 0, 1325, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 1044, 1326, 340, 340, 
-  340, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1328, 1329, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 0, 1160, 1160, 1160, 1160, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 0, 1160, 1160, 1160, 1160, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 340, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 0, 0, 540, 540, 
-  540, 1177, 1044, 1177, 1177, 1177, 1177, 1177, 
-  1177, 1177, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1190, 1190, 1190, 1190, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 77, 77, 77, 77, 77, 1085, 77, 
-  1085, 1085, 77, 0, 0, 0, 0, 0, 
-  0, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 
-  1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 
-  1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354, 
-  1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 
-  1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 
-  1371, 1372, 1373, 1374, 1375, 1376, 1377, 1378, 
-  1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386, 
-  1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 
-  1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 
-  1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, 
-  1411, 1412, 1413, 1414, 1415, 1416, 1417, 0, 
-  0, 1418, 1419, 1420, 1421, 1422, 1423, 0, 
-  0, 1424, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 340, 340, 340, 340, 
-  340, 340, 340, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 340, 340, 340, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 340, 
-  1160, 1160, 1160, 1160, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 340, 340, 340, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 1160, 1160, 1160, 1160, 1160, 
-  1160, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 340, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 340, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 340, 340, 340, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 340, 
-  340, 340, 340, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 340, 340, 340, 1160, 1160, 1160, 1160, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 340, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 340, 340, 340, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 340, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 340, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1177, 1044, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1425, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1258, 1259, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1160, 340, 1160, 340, 340, 340, 340, 
-  340, 340, 340, 340, 1044, 1044, 1044, 1426, 
-  1426, 1426, 340, 340, 340, 340, 340, 340, 
-  340, 340, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160, 
-  1160, 1160, 1160, 1153, 1153, 1168, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1153, 1153, 1168, 1177, 1177, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1153, 1153, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 340, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160, 
-  1160, 1160, 0, 1153, 1153, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 574, 574, 1159, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1153, 
-  1159, 1159, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1168, 1153, 1177, 1177, 1044, 
-  1179, 1177, 1177, 1177, 1189, 340, 540, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 
-  1427, 1427, 1427, 0, 0, 0, 0, 0, 
-  0, 1428, 1428, 1428, 1428, 1428, 1428, 1424, 
-  1428, 1428, 1428, 1428, 574, 574, 574, 81, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1179, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1153, 1153, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1087, 1160, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 340, 340, 340, 
-  1160, 340, 1160, 340, 1160, 1160, 1160, 340, 
-  340, 1160, 1160, 1160, 340, 340, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 340, 1160, 340, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 340, 340, 340, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1153, 1153, 1153, 1159, 1159, 1159, 1159, 
-  1153, 1153, 1159, 1159, 1159, 0, 0, 0, 
-  0, 1159, 1159, 1153, 1159, 1159, 1159, 1159, 
-  1159, 1159, 1086, 540, 553, 0, 0, 0, 
-  0, 1085, 0, 0, 0, 1428, 1428, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 0, 
-  0, 340, 340, 340, 340, 340, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1190, 0, 0, 0, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  540, 553, 1159, 1159, 1153, 0, 0, 1177, 
-  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1159, 1153, 
-  1159, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  0, 1168, 1284, 1153, 1284, 1284, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1153, 1153, 540, 540, 
-  540, 540, 540, 540, 540, 540, 0, 0, 
-  553, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 
-  1179, 1177, 1177, 1177, 1177, 1177, 1177, 0, 
-  0, 540, 540, 540, 540, 540, 553, 553, 
-  553, 553, 553, 553, 540, 540, 553, 839, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1153, 1153, 1153, 1153, 1159, 1429, 1430, 
-  1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 
-  1160, 1160, 1439, 1440, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1180, 1441, 1153, 
-  1153, 1153, 1153, 1442, 1443, 1444, 1445, 1446, 
-  1447, 1448, 1449, 1450, 1451, 1452, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1177, 1177, 1177, 1177, 1177, 
-  1177, 1177, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 540, 553, 540, 540, 
-  540, 540, 540, 540, 540, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 0, 0, 
-  0, 1153, 1153, 1159, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1159, 1153, 1153, 1153, 1153, 1159, 
-  1159, 1153, 1153, 1452, 1168, 1153, 1153, 1160, 
-  1160, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1180, 
-  1159, 1153, 1153, 1159, 1159, 1159, 1153, 1159, 
-  1153, 1153, 1153, 1452, 1452, 0, 0, 0, 
-  0, 0, 0, 0, 0, 1177, 1177, 1177, 
-  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1159, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1159, 1159, 1153, 
-  1180, 0, 0, 0, 1177, 1177, 1177, 1177, 
-  1177, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 1160, 1160, 
-  1160, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1250, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 523, 523, 523, 523, 523, 523, 1044, 
-  1044, 1453, 1454, 1455, 1456, 1457, 1457, 1458, 
-  1459, 1460, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 
-  1177, 0, 0, 0, 0, 0, 0, 0, 
-  0, 540, 540, 540, 1177, 566, 553, 553, 
-  553, 553, 553, 540, 540, 553, 553, 553, 
-  553, 540, 1159, 566, 566, 566, 566, 566, 
-  566, 566, 1160, 1160, 1160, 1160, 553, 1160, 
-  1160, 1160, 1160, 1159, 1159, 540, 1160, 1160, 
-  0, 540, 540, 0, 0, 0, 0, 0, 
-  0, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 1461, 1462, 1463, 
-  523, 1464, 1465, 1466, 1467, 1468, 1469, 1470, 
-  1471, 1472, 1473, 1474, 523, 1475, 1476, 1477, 
-  1478, 1479, 1480, 1481, 1482, 1483, 1484, 1485, 
-  1486, 1487, 1488, 1489, 1490, 1491, 1492, 523, 
-  1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, 
-  1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 
-  1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516, 
-  1517, 1518, 1519, 1520, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 1521, 1522, 1523, 214, 214, 1524, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 1523, 214, 
-  214, 214, 214, 214, 1525, 1526, 1527, 1528, 
-  1491, 1529, 1530, 1531, 1532, 1533, 1534, 1535, 
-  1536, 1537, 1538, 1539, 1540, 1541, 1542, 1543, 
-  1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551, 
-  1552, 1553, 1554, 1555, 1556, 1557, 1558, 1559, 
-  1560, 540, 540, 553, 540, 540, 540, 540, 
-  540, 540, 540, 553, 540, 540, 576, 1561, 
-  553, 555, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 0, 
-  0, 0, 0, 0, 540, 575, 553, 540, 
-  553, 1562, 1563, 1564, 1565, 1566, 1567, 1568, 
-  1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 
-  1577, 1578, 1579, 1580, 1581, 1582, 1583, 1584, 
-  1585, 1586, 1587, 1588, 1589, 1590, 1591, 1592, 
-  1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, 
-  1601, 1602, 1603, 1604, 1605, 1606, 1607, 1608, 
-  1609, 1610, 1611, 1612, 1613, 1614, 1615, 1616, 
-  1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624, 
-  1625, 1626, 1627, 1628, 1629, 1630, 1631, 1632, 
-  1633, 1634, 1635, 1636, 1637, 1638, 1639, 1640, 
-  1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, 
-  1649, 1650, 1651, 1652, 1653, 1654, 1655, 1656, 
-  1657, 1658, 1659, 1660, 1661, 1662, 1663, 1664, 
-  1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 
-  1673, 1674, 1675, 1676, 1677, 1678, 1679, 1680, 
-  1681, 1682, 1683, 1684, 1685, 1686, 1687, 1688, 
-  1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 
-  1697, 1698, 1699, 1700, 1701, 1702, 1703, 1704, 
-  1705, 1706, 1707, 1708, 1709, 1710, 1711, 1712, 
-  1713, 1714, 1715, 1716, 1717, 214, 214, 1718, 
-  214, 1719, 1720, 1721, 1722, 1723, 1724, 1725, 
-  1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, 
-  1734, 1735, 1736, 1737, 1738, 1739, 1740, 1741, 
-  1742, 1743, 1744, 1745, 1746, 1747, 1748, 1749, 
-  1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, 
-  1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765, 
-  1766, 1767, 1768, 1769, 1770, 1771, 1772, 1773, 
-  1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, 
-  1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789, 
-  1790, 1791, 1792, 1793, 1794, 1795, 1796, 1797, 
-  1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, 
-  1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813, 
-  1814, 1815, 1816, 1817, 1818, 1819, 1820, 1821, 
-  1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829, 
-  1830, 1831, 1832, 1833, 1834, 1835, 1836, 0, 
-  0, 1837, 1838, 1839, 1840, 1841, 1842, 0, 
-  0, 1843, 1844, 1845, 1846, 1847, 1848, 1849, 
-  1850, 1851, 1852, 1853, 1854, 1855, 1856, 1857, 
-  1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 
-  1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873, 
-  1874, 1875, 1876, 1877, 1878, 1879, 1880, 0, 
-  0, 1881, 1882, 1883, 1884, 1885, 1886, 0, 
-  0, 1887, 1888, 1889, 1890, 1891, 1892, 1893, 
-  1894, 0, 1895, 0, 1896, 0, 1897, 0, 
-  1898, 1899, 1900, 1901, 1902, 1903, 1904, 1905, 
-  1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, 
-  1914, 1915, 1916, 1917, 1918, 1919, 1920, 1921, 
-  1922, 1923, 1924, 1925, 1926, 1927, 1928, 0, 
-  0, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 
-  1936, 1937, 1938, 1939, 1940, 1941, 1942, 1943, 
-  1944, 1945, 1946, 1947, 1948, 1949, 1950, 1951, 
-  1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 
-  1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 
-  1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 
-  1976, 1977, 1978, 1979, 1980, 1981, 0, 1982, 
-  1983, 1984, 1985, 1986, 1987, 1988, 1989, 1990, 
-  1991, 1992, 1993, 1994, 1995, 1996, 0, 1997, 
-  1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 
-  2006, 2007, 2008, 2009, 2010, 0, 0, 2011, 
-  2012, 2013, 2014, 2015, 2016, 0, 2017, 2018, 
-  2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026, 
-  2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 
-  2035, 0, 0, 2036, 2037, 2038, 0, 2039, 
-  2040, 2041, 2042, 2043, 2044, 2045, 2046, 2047, 
-  0, 2048, 2049, 2050, 2051, 2050, 2050, 2050, 
-  2052, 2050, 2050, 2050, 81, 2053, 2054, 2055, 
-  2056, 1084, 2057, 1084, 1084, 1084, 1084, 9, 
-  2058, 2059, 2060, 2061, 2059, 2059, 2060, 2061, 
-  2059, 9, 9, 9, 9, 2062, 2063, 2064, 
-  9, 2065, 2066, 2067, 2068, 2069, 2070, 2071, 
-  76, 10, 10, 10, 2072, 2073, 9, 2074, 
-  2075, 9, 80, 92, 9, 2076, 9, 2077, 
-  48, 48, 9, 9, 9, 2078, 12, 13, 
-  2079, 2080, 2081, 9, 9, 9, 9, 9, 
-  9, 9, 9, 75, 9, 48, 9, 9, 
-  2082, 9, 9, 9, 9, 9, 9, 9, 
-  2050, 81, 81, 81, 81, 81, 0, 2083, 
-  2084, 2085, 2086, 81, 81, 81, 81, 81, 
-  81, 2087, 2088, 0, 0, 2089, 2090, 2091, 
-  2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 
-  2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 
-  2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 
-  0, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 
-  2123, 2124, 2125, 2126, 2127, 2128, 0, 0, 
-  0, 11, 11, 11, 11, 11, 11, 11, 
-  11, 2129, 11, 11, 11, 11, 11, 11, 
-  11, 11, 11, 11, 11, 11, 11, 11, 
-  11, 11, 1189, 11, 11, 11, 11, 11, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 540, 540, 566, 566, 540, 540, 540, 
-  540, 566, 566, 566, 540, 540, 839, 839, 
-  839, 839, 540, 839, 839, 839, 566, 566, 
-  540, 553, 540, 566, 566, 553, 553, 553, 
-  553, 540, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 2130, 2131, 2132, 2133, 77, 2134, 2135, 
-  2136, 77, 2137, 2138, 2139, 2139, 2139, 2140, 
-  2141, 2142, 2142, 2143, 2144, 77, 2145, 2146, 
-  77, 75, 2147, 2148, 2149, 2149, 2149, 77, 
-  77, 2150, 2151, 2152, 77, 2153, 77, 2154, 
-  77, 2153, 77, 2155, 2156, 2157, 2132, 83, 
-  2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 
-  2166, 2167, 2168, 1085, 2169, 2170, 2171, 2172, 
-  2173, 2174, 75, 75, 75, 75, 2175, 2176, 
-  2158, 2168, 2177, 77, 75, 1085, 77, 2178, 
-  1191, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 
-  2186, 2187, 2188, 2189, 2190, 2191, 2192, 2193, 
-  2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, 
-  2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209, 
-  2210, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 
-  2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 
-  2226, 1426, 1426, 2227, 2228, 2229, 1426, 1426, 
-  1426, 2227, 2230, 77, 77, 0, 0, 0, 
-  0, 2231, 75, 2232, 75, 2233, 77, 77, 
-  77, 77, 77, 2234, 2235, 77, 77, 77, 
-  77, 75, 77, 77, 75, 77, 77, 75, 
-  77, 77, 77, 77, 77, 77, 77, 2236, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 2237, 2238, 
-  2239, 2240, 77, 2241, 77, 2242, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 1109, 75, 75, 
-  75, 75, 1109, 1109, 1109, 1109, 75, 75, 
-  1109, 75, 2243, 2243, 2244, 2245, 75, 75, 
-  75, 2246, 2247, 2243, 2248, 2249, 2243, 75, 
-  75, 75, 2243, 14, 84, 75, 2243, 2243, 
-  75, 75, 75, 2243, 2243, 2243, 2243, 75, 
-  2243, 2243, 2243, 2243, 2250, 2251, 2252, 2253, 
-  75, 75, 75, 75, 2243, 2254, 2255, 2243, 
-  2256, 2257, 2243, 2243, 2243, 75, 75, 75, 
-  75, 75, 2243, 75, 2243, 2258, 2243, 2243, 
-  2243, 2243, 2259, 2243, 2260, 2261, 2262, 2243, 
-  2263, 2264, 2265, 2243, 2243, 2243, 2266, 75, 
-  75, 75, 75, 2243, 2243, 2243, 2243, 75, 
-  75, 75, 75, 75, 75, 75, 75, 75, 
-  2243, 2267, 2268, 2269, 75, 2270, 2271, 2243, 
-  2243, 2243, 2243, 2243, 2243, 75, 2272, 2273, 
-  2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 
-  2282, 2283, 2284, 2285, 2286, 2287, 2288, 2243, 
-  2243, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 
-  2296, 2297, 2298, 2243, 2243, 2243, 75, 75, 
-  2243, 2243, 2299, 2300, 75, 75, 75, 75, 
-  75, 2243, 75, 75, 75, 75, 75, 75, 
-  75, 75, 75, 2301, 2243, 75, 75, 2243, 
-  2243, 2302, 2303, 2243, 2304, 2305, 2306, 2307, 
-  2308, 2243, 2243, 2309, 2310, 2311, 2312, 2243, 
-  2243, 2243, 75, 75, 75, 75, 75, 2243, 
-  2243, 75, 75, 75, 75, 75, 75, 75, 
-  75, 75, 2243, 2243, 2243, 2243, 2243, 75, 
-  75, 2243, 2243, 75, 75, 75, 75, 2243, 
-  2243, 2243, 2243, 2243, 2243, 2243, 2243, 2243, 
-  2243, 2313, 2314, 2315, 2316, 2243, 2243, 2243, 
-  2243, 2243, 2243, 2317, 2318, 2319, 2320, 75, 
-  75, 2243, 2243, 2321, 2321, 2243, 2321, 2321, 
-  2243, 2243, 2321, 2321, 2321, 2243, 2321, 2243, 
-  2321, 77, 77, 77, 77, 77, 77, 77, 
-  77, 12, 13, 12, 13, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 1085, 1085, 77, 77, 77, 
-  77, 2243, 2243, 77, 77, 77, 77, 77, 
-  77, 77, 2322, 2323, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 1085, 1109, 1085, 1085, 
-  77, 77, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 838, 77, 
-  1085, 1085, 1085, 1085, 75, 75, 75, 75, 
-  75, 75, 75, 75, 75, 75, 75, 75, 
-  75, 75, 75, 75, 75, 75, 75, 75, 
-  75, 75, 75, 1109, 1109, 1085, 1085, 1085, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 77, 77, 1085, 1085, 
-  77, 77, 77, 77, 77, 1085, 1085, 1085, 
-  1085, 1085, 1085, 77, 1085, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1085, 1085, 1085, 1085, 1085, 
-  1085, 77, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 77, 77, 77, 77, 77, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 
-  2331, 2332, 2333, 2334, 2335, 2336, 2337, 2338, 
-  2339, 2340, 2341, 2342, 2343, 2344, 2345, 2346, 
-  2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 
-  2355, 2356, 2357, 2358, 2359, 2360, 2361, 2362, 
-  2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370, 
-  2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 
-  2379, 2380, 2381, 2382, 2383, 2384, 2385, 2386, 
-  2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394, 
-  2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 
-  2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 
-  2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418, 
-  2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426, 
-  2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434, 
-  2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442, 
-  2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, 
-  2451, 2452, 2453, 2454, 2455, 2456, 2457, 2458, 
-  2459, 2460, 2461, 2462, 1220, 1220, 1220, 1220, 
-  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 
-  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 
-  1220, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  75, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 75, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 75, 75, 75, 75, 75, 1109, 1109, 
-  75, 77, 77, 77, 1085, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 1085, 1085, 1085, 
-  1085, 1085, 1085, 77, 77, 77, 2463, 77, 
-  77, 77, 77, 1085, 1085, 1085, 77, 77, 
-  77, 77, 77, 77, 1085, 1085, 77, 77, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  75, 77, 77, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 77, 77, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 77, 1085, 1085, 1085, 838, 1085, 1085, 
-  1085, 1085, 1085, 77, 77, 77, 77, 1085, 
-  77, 77, 77, 77, 77, 77, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 77, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 2464, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 2464, 2464, 2464, 2464, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 2465, 1085, 1085, 
-  1085, 12, 13, 12, 13, 12, 13, 12, 
-  13, 12, 13, 12, 13, 12, 13, 1220, 
-  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 
-  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 
-  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 
-  1220, 1220, 1220, 1220, 1220, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 2243, 1109, 75, 2321, 2321, 12, 13, 
-  75, 2321, 2321, 75, 2321, 2321, 2321, 1109, 
-  1109, 1109, 75, 1109, 2243, 2243, 2321, 2321, 
-  1109, 1109, 1109, 1109, 1109, 2321, 2321, 2321, 
-  1109, 75, 1109, 2321, 2321, 2321, 2321, 12, 
-  13, 12, 13, 12, 13, 12, 13, 12, 
-  13, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 75, 75, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 75, 75, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 75, 75, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 75, 1109, 1109, 75, 75, 1109, 
-  75, 1109, 75, 1109, 1109, 75, 75, 1109, 
-  1109, 75, 75, 1109, 1109, 75, 75, 1109, 
-  1109, 75, 75, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 75, 75, 1109, 
-  1109, 75, 1109, 75, 12, 13, 12, 13, 
-  12, 13, 12, 13, 12, 13, 12, 13, 
-  12, 13, 12, 13, 1258, 1259, 1258, 1259, 
-  12, 13, 75, 1109, 2321, 2321, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2243, 
-  2243, 2321, 2321, 2321, 2321, 2321, 2321, 2321, 
-  2321, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 2321, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 2321, 2321, 2321, 2321, 2321, 2321, 1109, 
-  1109, 1109, 2321, 1109, 1109, 1109, 1109, 2321, 
-  2321, 2321, 2243, 2243, 75, 2243, 2243, 75, 
-  75, 12, 13, 1258, 1259, 2321, 1109, 1109, 
-  1109, 1109, 2321, 1109, 2321, 2321, 2321, 1109, 
-  1109, 2321, 2321, 1109, 75, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 2321, 2243, 2243, 
-  2243, 2243, 2243, 75, 75, 12, 13, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 2321, 2321, 2466, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2321, 2321, 1109, 2243, 
-  2243, 2321, 2243, 75, 75, 2243, 75, 2243, 
-  1109, 75, 2243, 75, 2243, 2243, 2321, 2321, 
-  75, 75, 75, 75, 1109, 2321, 2321, 1109, 
-  1109, 1109, 1109, 1109, 1109, 2243, 2243, 2243, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 75, 
-  75, 75, 75, 75, 75, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  2321, 2321, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 2321, 2321, 75, 
-  75, 1109, 1109, 2243, 2243, 2243, 2243, 1109, 
-  2243, 2243, 75, 75, 2243, 2467, 2468, 2469, 
-  75, 1109, 2321, 2321, 2321, 2321, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2243, 2243, 2321, 2321, 
-  2243, 2243, 2243, 2243, 2243, 2243, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2321, 1109, 1109, 2321, 
-  2321, 2321, 2321, 2321, 2321, 2321, 2321, 1109, 
-  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321, 
-  2243, 2243, 2243, 2243, 2243, 2243, 2243, 2243, 
-  2321, 2321, 2243, 2243, 2243, 2243, 2321, 2321, 
-  2321, 2321, 2321, 2321, 2243, 2243, 2243, 2243, 
-  1109, 1109, 1109, 1109, 1109, 2470, 2471, 2243, 
-  1109, 1109, 1109, 2321, 2321, 2321, 2321, 2321, 
-  1109, 1109, 1109, 1109, 1109, 2321, 2321, 2243, 
-  75, 75, 75, 75, 2321, 1109, 1109, 75, 
-  2321, 2321, 2321, 2321, 2321, 1109, 2321, 75, 
-  75, 1085, 1085, 1085, 1085, 1085, 1085, 77, 
-  77, 1085, 1085, 1085, 1085, 1085, 77, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 77, 77, 
-  1085, 1085, 1085, 1085, 1085, 1085, 77, 77, 
-  77, 77, 77, 77, 77, 1085, 1085, 77, 
-  77, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1085, 1085, 
-  1109, 1109, 1109, 1109, 1109, 1109, 1085, 77, 
-  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 0, 0, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 0, 0, 0, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 0, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 1085, 1085, 1085, 
-  1085, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 2472, 2473, 2474, 2475, 2476, 2477, 2478, 
-  2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 
-  2487, 2488, 2489, 2490, 2491, 2492, 2493, 2494, 
-  2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, 
-  2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510, 
-  2511, 2512, 2513, 2514, 2515, 2516, 2517, 2518, 
-  0, 2519, 2520, 2521, 2522, 2523, 2524, 2525, 
-  2526, 2527, 2528, 2529, 2530, 2531, 2532, 2533, 
-  2534, 2535, 2536, 2537, 2538, 2539, 2540, 2541, 
-  2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 
-  2550, 2551, 2552, 2553, 2554, 2555, 2556, 2557, 
-  2558, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 
-  0, 2566, 2567, 2568, 2569, 2570, 2571, 2572, 
-  2573, 2574, 2575, 2576, 2577, 2578, 2579, 2580, 
-  2581, 2582, 214, 2583, 2584, 214, 2585, 2586, 
-  214, 214, 214, 214, 214, 2587, 2588, 2589, 
-  2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 
-  2598, 2599, 2600, 2601, 2602, 2603, 2604, 2605, 
-  2606, 2607, 2608, 2609, 2610, 2611, 2612, 2613, 
-  2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 
-  2622, 2623, 2624, 2625, 2626, 2627, 2628, 2629, 
-  2630, 2631, 2632, 2633, 2634, 2635, 2636, 2637, 
-  2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645, 
-  2646, 2647, 2648, 2649, 2650, 2651, 2652, 2653, 
-  2654, 2655, 2656, 2657, 2658, 2659, 2660, 2661, 
-  2662, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 
-  2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677, 
-  2678, 2679, 2680, 2681, 2682, 2683, 2684, 2685, 
-  2686, 2687, 2688, 2689, 2690, 214, 77, 77, 
-  1085, 77, 77, 1085, 2691, 2692, 2693, 2694, 
-  540, 540, 540, 2695, 2696, 0, 0, 0, 
-  0, 0, 9, 9, 9, 9, 1427, 9, 
-  9, 2697, 2698, 2699, 2700, 2701, 2702, 2703, 
-  2704, 2705, 2706, 2707, 2708, 2709, 2710, 2711, 
-  2712, 2713, 2714, 2715, 2716, 2717, 2718, 2719, 
-  2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727, 
-  2728, 2729, 2730, 2731, 2732, 2733, 2734, 0, 
-  2735, 0, 0, 0, 0, 0, 2736, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1160, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 0, 0, 0, 0, 0, 0, 0, 
-  2737, 1044, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  1168, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 9, 9, 80, 92, 80, 92, 9, 
-  9, 9, 80, 92, 9, 80, 92, 1428, 
-  1428, 1428, 1428, 9, 1428, 1428, 1428, 9, 
-  1084, 9, 9, 1084, 9, 80, 92, 9, 
-  9, 80, 92, 12, 13, 12, 13, 12, 
-  13, 12, 13, 9, 9, 9, 9, 9, 
-  522, 9, 9, 9, 9, 9, 9, 9, 
-  9, 9, 9, 1084, 1084, 9, 9, 9, 
-  9, 1084, 9, 2061, 1428, 9, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 0, 1085, 1085, 1085, 1085, 
-  2738, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 2739, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 2740, 2741, 2742, 2743, 2744, 2745, 2746, 
-  2747, 2748, 2749, 2750, 2751, 2752, 2753, 2754, 
-  2755, 2756, 2757, 2758, 2759, 2760, 2761, 2762, 
-  2763, 2764, 2765, 2766, 2767, 2768, 2769, 2770, 
-  2771, 2772, 2773, 2774, 2775, 2776, 2777, 2778, 
-  2779, 2780, 2781, 2782, 2783, 2784, 2785, 2786, 
-  2787, 2788, 2789, 2790, 2791, 2792, 2793, 2794, 
-  2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, 
-  2803, 2804, 2805, 2806, 2807, 2808, 2809, 2810, 
-  2811, 2812, 2813, 2814, 2815, 2816, 2817, 2818, 
-  2819, 2820, 2821, 2822, 2823, 2824, 2825, 2826, 
-  2827, 2828, 2829, 2830, 2831, 2832, 2833, 2834, 
-  2835, 2836, 2837, 2838, 2839, 2840, 2841, 2842, 
-  2843, 2844, 2845, 2846, 2847, 2848, 2849, 2850, 
-  2851, 2852, 2853, 2854, 2855, 2856, 2857, 2858, 
-  2859, 2860, 2861, 2862, 2863, 2864, 2865, 2866, 
-  2867, 2868, 2869, 2870, 2871, 2872, 2873, 2874, 
-  2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882, 
-  2883, 2884, 2885, 2886, 2887, 2888, 2889, 2890, 
-  2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898, 
-  2899, 2900, 2901, 2902, 2903, 2904, 2905, 2906, 
-  2907, 2908, 2909, 2910, 2911, 2912, 2913, 2914, 
-  2915, 2916, 2917, 2918, 2919, 2920, 2921, 2922, 
-  2923, 2924, 2925, 2926, 2927, 2928, 2929, 2930, 
-  2931, 2932, 2933, 2934, 2935, 2936, 2937, 2938, 
-  2939, 2940, 2941, 2942, 2943, 2944, 2945, 2946, 
-  2947, 2948, 2949, 2950, 2951, 2952, 2953, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 0, 0, 0, 
-  0, 2954, 1428, 1428, 1428, 1085, 1179, 1160, 
-  2227, 1258, 1259, 1258, 1259, 1258, 1259, 1258, 
-  1259, 1258, 1259, 1085, 1085, 1258, 1259, 1258, 
-  1259, 1258, 1259, 1258, 1259, 1424, 2955, 2956, 
-  2956, 1085, 2227, 2227, 2227, 2227, 2227, 2227, 
-  2227, 2227, 2227, 2957, 1087, 552, 1086, 2958, 
-  2958, 1424, 1179, 1179, 1179, 1179, 1179, 2959, 
-  1085, 2960, 2961, 2962, 1179, 1160, 1428, 1085, 
-  77, 0, 1160, 1160, 1160, 1160, 1160, 2963, 
-  1160, 1160, 1160, 1160, 2964, 2965, 2966, 2967, 
-  2968, 2969, 2970, 2971, 2972, 2973, 2974, 2975, 
-  2976, 2977, 2978, 2979, 2980, 2981, 2982, 2983, 
-  2984, 2985, 2986, 2987, 1160, 2988, 2989, 2990, 
-  2991, 2992, 2993, 1160, 1160, 1160, 1160, 1160, 
-  2994, 2995, 2996, 2997, 2998, 2999, 3000, 3001, 
-  3002, 3003, 3004, 3005, 3006, 3007, 3008, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 3009, 1160, 1160, 
-  0, 0, 3010, 3011, 3012, 3013, 3014, 3015, 
-  3016, 1424, 1160, 1160, 1160, 1160, 1160, 3017, 
-  1160, 1160, 1160, 1160, 3018, 3019, 3020, 3021, 
-  3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, 
-  3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 
-  3038, 3039, 3040, 3041, 1160, 3042, 3043, 3044, 
-  3045, 3046, 3047, 1160, 1160, 1160, 1160, 1160, 
-  3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 
-  3056, 3057, 3058, 3059, 3060, 3061, 3062, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  3063, 3064, 3065, 3066, 1160, 3067, 1160, 1160, 
-  3068, 3069, 3070, 3071, 1428, 1179, 3072, 3073, 
-  3074, 0, 0, 0, 0, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0, 
-  0, 0, 3075, 3076, 3077, 3078, 3079, 3080, 
-  3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 
-  3089, 3090, 3091, 3092, 3093, 3094, 3095, 3096, 
-  3097, 3098, 3099, 3100, 3101, 3102, 3103, 3104, 
-  3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 
-  3113, 3114, 3115, 3116, 3117, 3118, 3119, 3120, 
-  3121, 3122, 3123, 3124, 3125, 3126, 3127, 3128, 
-  3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 
-  3137, 3138, 3139, 3140, 3141, 3142, 3143, 3144, 
-  3145, 3146, 3147, 3148, 3149, 3150, 3151, 3152, 
-  3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 
-  3161, 3162, 3163, 3164, 3165, 3166, 3167, 3168, 
-  0, 1191, 1191, 3169, 3170, 3171, 3172, 3173, 
-  3174, 3175, 3176, 3177, 3178, 3179, 3180, 3181, 
-  3182, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 3183, 3184, 3185, 3186, 3187, 3188, 3189, 
-  3190, 3191, 3192, 3193, 3194, 3195, 3196, 3197, 
-  3198, 3199, 3200, 3201, 3202, 3203, 3204, 3205, 
-  3206, 3207, 3208, 3209, 3210, 3211, 3212, 3213, 
-  0, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 
-  3221, 3222, 3223, 3224, 3225, 3226, 3227, 3228, 
-  3229, 3230, 3231, 3232, 3233, 3234, 3235, 3236, 
-  3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 
-  3245, 3246, 3247, 3248, 3249, 3250, 3251, 3252, 
-  3253, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1190, 3254, 3255, 3256, 3257, 3258, 3259, 3260, 
-  3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 
-  3269, 3270, 3271, 3272, 3273, 3274, 3275, 3276, 
-  3277, 3278, 3279, 3280, 3281, 3282, 3283, 3284, 
-  3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 
-  3293, 3294, 3295, 3296, 3297, 3298, 3299, 3300, 
-  1191, 3301, 3302, 3303, 3304, 3305, 3306, 3307, 
-  3308, 3309, 3310, 3311, 3312, 3313, 3314, 3315, 
-  3316, 3317, 3318, 3319, 3320, 3321, 3322, 3323, 
-  3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, 
-  3332, 3333, 3334, 3335, 3336, 3337, 3338, 3339, 
-  3340, 3341, 3342, 3343, 3344, 3345, 3346, 3347, 
-  3348, 3349, 3350, 3351, 3352, 3353, 3354, 3355, 
-  3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363, 
-  3364, 3365, 3366, 3367, 3368, 3369, 3370, 3371, 
-  3372, 3373, 3374, 3375, 3376, 3377, 3378, 3379, 
-  3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 
-  3388, 3389, 3390, 3391, 3392, 3393, 3394, 3395, 
-  3396, 3397, 3398, 3399, 3400, 3401, 3402, 3403, 
-  3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 
-  3412, 3413, 3414, 3415, 3416, 3417, 3418, 3419, 
-  3420, 3421, 3422, 3423, 3424, 3425, 3426, 3427, 
-  0, 3428, 3429, 3430, 3431, 3432, 3433, 3434, 
-  3435, 3436, 3437, 3438, 3439, 3440, 3441, 3442, 
-  3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450, 
-  3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458, 
-  3459, 3460, 3461, 3462, 3463, 3464, 3465, 3466, 
-  3467, 3468, 3469, 3470, 3471, 3472, 3473, 3474, 
-  3475, 3476, 3477, 3478, 3479, 3480, 3481, 3482, 
-  3483, 3484, 3485, 3486, 3487, 3488, 3489, 3490, 
-  3491, 3492, 3493, 3494, 3495, 3496, 3497, 3498, 
-  3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506, 
-  3507, 3508, 3509, 3510, 3511, 3512, 3513, 3514, 
-  3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, 
-  3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 
-  3531, 3532, 3533, 3534, 3535, 3536, 3537, 3538, 
-  3539, 3540, 3541, 3542, 3543, 3544, 3545, 3546, 
-  3547, 3548, 3549, 3550, 3551, 3552, 3553, 3554, 
-  3555, 3556, 3557, 3558, 3559, 3560, 3561, 3562, 
-  3563, 3564, 3565, 3566, 3567, 3568, 3569, 3570, 
-  3571, 3572, 3573, 3574, 3575, 3576, 3577, 3578, 
-  3579, 3580, 3581, 3582, 3583, 3584, 3585, 3586, 
-  3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, 
-  3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602, 
-  3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610, 
-  3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618, 
-  3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 
-  3627, 3628, 3629, 3630, 3631, 3632, 3633, 3634, 
-  3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, 
-  3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650, 
-  3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658, 
-  3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666, 
-  3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 
-  3675, 3676, 3677, 3678, 3679, 3680, 3681, 3682, 
-  3683, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1179, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 523, 523, 523, 523, 523, 523, 1044, 
-  1044, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1179, 1428, 1428, 
-  1428, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1160, 1160, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 3684, 3685, 3686, 3687, 3688, 3689, 3690, 
-  3691, 3692, 3693, 3694, 3695, 3696, 3697, 3698, 
-  3699, 3700, 3701, 3702, 3703, 3704, 3705, 3706, 
-  3707, 3708, 3709, 3710, 3711, 3712, 3713, 3714, 
-  3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722, 
-  3723, 3724, 3725, 3726, 3727, 3728, 3729, 1160, 
-  540, 839, 839, 839, 9, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 9, 
-  522, 3730, 3731, 3732, 3733, 3734, 3735, 3736, 
-  3737, 3738, 3739, 3740, 3741, 3742, 3743, 3744, 
-  3745, 3746, 3747, 3748, 3749, 3750, 3751, 3752, 
-  3753, 3754, 3755, 3756, 3757, 3758, 3759, 540, 
-  540, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 540, 540, 1044, 1044, 1044, 1044, 1044, 
-  1044, 0, 0, 0, 0, 0, 0, 0, 
-  0, 47, 47, 47, 47, 47, 47, 47, 
-  47, 47, 47, 47, 47, 47, 47, 47, 
-  47, 47, 47, 47, 47, 47, 47, 47, 
-  522, 522, 522, 522, 522, 522, 522, 522, 
-  522, 47, 47, 3760, 3761, 3762, 3763, 3764, 
-  3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772, 
-  3773, 214, 214, 3774, 3775, 3776, 3777, 3778, 
-  3779, 3780, 3781, 3782, 3783, 3784, 3785, 3786, 
-  3787, 3788, 3789, 3790, 3791, 3792, 3793, 3794, 
-  3795, 3796, 3797, 3798, 3799, 3800, 3801, 3802, 
-  3803, 3804, 3805, 3806, 3807, 3808, 3809, 3810, 
-  3811, 3812, 3813, 3814, 3815, 3816, 3817, 3818, 
-  3819, 3820, 3821, 3822, 3823, 3824, 3825, 3826, 
-  3827, 3828, 3829, 3830, 3831, 3832, 3833, 3834, 
-  3835, 3836, 1523, 1523, 1523, 1523, 1523, 1523, 
-  1523, 214, 3837, 3838, 3839, 3840, 3841, 3842, 
-  3843, 3844, 3845, 3846, 3847, 3848, 3849, 3850, 
-  3851, 522, 3852, 3852, 3853, 3854, 3855, 214, 
-  340, 3856, 3857, 3858, 3859, 214, 214, 3860, 
-  3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868, 
-  3869, 3870, 3871, 3872, 3873, 3874, 3875, 3876, 
-  3877, 3878, 3879, 3880, 3881, 3882, 3883, 3884, 
-  0, 3885, 3886, 3887, 3888, 3889, 3890, 3891, 
-  3892, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  340, 3893, 3894, 214, 340, 340, 340, 340, 
-  1160, 1160, 1160, 1153, 1160, 1160, 1160, 1168, 
-  1160, 1160, 1160, 1160, 1153, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1159, 1159, 1153, 1153, 
-  1159, 77, 77, 1085, 1085, 0, 0, 0, 
-  0, 1190, 1190, 1190, 1190, 1190, 1190, 1191, 
-  1191, 1189, 3895, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1428, 1428, 1428, 
-  1428, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1159, 1159, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1159, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1168, 1153, 0, 
-  0, 0, 0, 0, 0, 0, 0, 1177, 
-  1177, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1177, 1177, 1177, 1160, 1177, 1160, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1153, 
-  1153, 1153, 1153, 1153, 553, 553, 553, 1177, 
-  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1159, 1452, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  1177, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327, 
-  1327, 1327, 1327, 1327, 1327, 1327, 0, 0, 
-  0, 1153, 1153, 1153, 1159, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1180, 1159, 1159, 1153, 
-  1153, 1153, 1153, 1159, 1159, 1153, 1159, 1159, 
-  1159, 1452, 1177, 1177, 1177, 1177, 1177, 1177, 
-  1177, 1177, 1177, 1177, 1177, 1177, 1177, 0, 
-  1179, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 1177, 
-  1177, 340, 1160, 1160, 1160, 1160, 1153, 523, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1178, 1160, 1160, 1160, 340, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1159, 1159, 1153, 1153, 1159, 1159, 1153, 1153, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1153, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1153, 1159, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 1177, 1177, 1177, 
-  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1179, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1191, 1191, 1191, 1160, 1284, 1153, 1284, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 540, 1160, 540, 540, 553, 1160, 1160, 
-  540, 540, 1160, 1160, 1160, 1160, 1160, 540, 
-  540, 1160, 540, 1160, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 1160, 1160, 1179, 1177, 
-  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1159, 1153, 1153, 1159, 
-  1159, 1177, 1177, 1160, 1179, 1179, 1159, 1168, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 0, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 0, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 214, 214, 214, 214, 
-  214, 214, 214, 214, 3896, 214, 214, 214, 
-  214, 214, 214, 214, 3852, 3897, 3898, 3899, 
-  3900, 214, 214, 214, 214, 214, 214, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 3901, 3902, 3903, 3904, 3905, 3906, 3907, 
-  3908, 3909, 3910, 3911, 3912, 3913, 3914, 3915, 
-  3916, 3917, 3918, 3919, 3920, 3921, 3922, 3923, 
-  3924, 3925, 3926, 3927, 3928, 3929, 3930, 3931, 
-  3932, 3933, 3934, 3935, 3936, 3937, 3938, 3939, 
-  3940, 3941, 3942, 3943, 3944, 3945, 3946, 3947, 
-  3948, 3949, 3950, 3951, 3952, 3953, 3954, 3955, 
-  3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963, 
-  3964, 3965, 3966, 3967, 3968, 3969, 3970, 3971, 
-  3972, 3973, 3974, 3975, 3976, 3977, 3978, 3979, 
-  3980, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1159, 1159, 1153, 1159, 
-  1159, 1153, 1159, 1159, 1177, 1159, 1168, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 
-  3982, 3982, 3982, 3982, 3982, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 
-  0, 0, 0, 0, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 
-  1331, 1331, 1331, 1331, 1331, 0, 0, 0, 
-  0, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 
-  3983, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3985, 3986, 3987, 3988, 3989, 3990, 3991, 
-  3992, 3992, 3993, 3994, 3995, 3996, 3997, 3998, 
-  3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 
-  4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014, 
-  4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 
-  4023, 4024, 4025, 4026, 4027, 4028, 4029, 4030, 
-  4031, 4032, 4033, 4034, 4035, 4036, 4037, 4038, 
-  4039, 4040, 4041, 4042, 4043, 4044, 4045, 4046, 
-  4047, 4048, 4049, 4050, 4051, 4052, 4053, 4054, 
-  4055, 4056, 4057, 4058, 4059, 4060, 4061, 4062, 
-  4063, 4064, 4065, 4066, 4067, 4068, 4069, 4070, 
-  4071, 4072, 4073, 4074, 4075, 4004, 4076, 4077, 
-  4078, 4079, 4080, 4081, 4082, 4083, 4084, 4085, 
-  4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093, 
-  4094, 4095, 4096, 4097, 4098, 4099, 4100, 4101, 
-  4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, 
-  4110, 4111, 4112, 4113, 4114, 4115, 4116, 4117, 
-  4118, 4119, 4120, 4121, 4122, 4123, 4124, 4125, 
-  4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, 
-  4134, 4135, 4136, 4137, 4138, 4139, 4140, 4141, 
-  4142, 4143, 4094, 4144, 4145, 4146, 4147, 4148, 
-  4149, 4150, 4151, 4078, 4152, 4153, 4154, 4155, 
-  4156, 4157, 4158, 4159, 4160, 4161, 4162, 4163, 
-  4164, 4165, 4166, 4167, 4168, 4169, 4170, 4171, 
-  4004, 4172, 4173, 4174, 4175, 4176, 4177, 4178, 
-  4179, 4180, 4181, 4182, 4183, 4184, 4185, 4186, 
-  4187, 4188, 4189, 4190, 4191, 4192, 4193, 4194, 
-  4195, 4196, 4197, 4198, 4080, 4199, 4200, 4201, 
-  4202, 4203, 4204, 4205, 4206, 4207, 4208, 4209, 
-  4210, 4211, 4212, 4213, 4214, 4215, 4216, 4217, 
-  4218, 4219, 4220, 4221, 4222, 4223, 4224, 4225, 
-  4226, 4227, 4228, 4229, 4230, 4231, 4232, 4233, 
-  4234, 4235, 4236, 4237, 4238, 4239, 4240, 4241, 
-  4242, 4243, 4244, 4245, 4246, 4247, 4248, 1160, 
-  1160, 4249, 1160, 4250, 1160, 1160, 4251, 4252, 
-  4253, 4254, 4255, 4256, 4257, 4258, 4259, 4260, 
-  1160, 4261, 1160, 4262, 1160, 1160, 4263, 4264, 
-  1160, 1160, 1160, 4265, 4266, 4267, 4268, 4269, 
-  4270, 4271, 4272, 4273, 4274, 4275, 4276, 4277, 
-  4278, 4279, 4280, 4281, 4282, 4283, 4284, 4285, 
-  4286, 4287, 4288, 4289, 4290, 4291, 4292, 4293, 
-  4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, 
-  4302, 4303, 4304, 4305, 4306, 4307, 4308, 4309, 
-  4133, 4310, 4311, 4312, 4313, 4314, 4315, 4315, 
-  4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323, 
-  4263, 4324, 4325, 4326, 4327, 4328, 4329, 0, 
-  0, 4330, 4331, 4332, 4333, 4334, 4335, 4336, 
-  4337, 4277, 4338, 4339, 4340, 4249, 4341, 4342, 
-  4343, 4344, 4345, 4346, 4347, 4348, 4349, 4350, 
-  4351, 4352, 4286, 4353, 4287, 4354, 4355, 4356, 
-  4357, 4358, 4250, 4025, 4359, 4360, 4361, 4095, 
-  4182, 4362, 4363, 4294, 4364, 4295, 4365, 4366, 
-  4367, 4252, 4368, 4369, 4370, 4371, 4372, 4253, 
-  4373, 4374, 4375, 4376, 4377, 4378, 4309, 4379, 
-  4380, 4133, 4381, 4313, 4382, 4383, 4384, 4385, 
-  4386, 4318, 4387, 4262, 4388, 4319, 4076, 4389, 
-  4320, 4390, 4322, 4391, 4392, 4393, 4394, 4395, 
-  4324, 4258, 4396, 4325, 4397, 4326, 4398, 3992, 
-  4399, 4400, 4401, 4402, 4403, 4404, 4405, 4406, 
-  4407, 4408, 4409, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 4410, 4411, 4412, 4413, 4414, 4415, 4416, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 4417, 4418, 4419, 4420, 
-  4421, 0, 0, 0, 0, 0, 4422, 4423, 
-  4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 
-  4432, 4433, 4434, 4435, 4436, 4437, 4438, 4439, 
-  4440, 4441, 4442, 4443, 4444, 4445, 4446, 4447, 
-  0, 4448, 4449, 4450, 4451, 4452, 0, 4453, 
-  0, 4454, 4455, 0, 4456, 4457, 0, 4458, 
-  4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 
-  4467, 4468, 4469, 4470, 4471, 4472, 4473, 4474, 
-  4475, 4476, 4477, 4478, 4479, 4480, 4481, 4482, 
-  4483, 4484, 4485, 4486, 4487, 4488, 4489, 4490, 
-  4491, 4492, 4493, 4494, 4495, 4496, 4497, 4498, 
-  4499, 4500, 4501, 4502, 4503, 4504, 4505, 4506, 
-  4507, 4508, 4509, 4510, 4511, 4512, 4513, 4514, 
-  4515, 4516, 4517, 4518, 4519, 4520, 4521, 4522, 
-  4523, 4524, 4525, 4526, 4527, 4528, 4529, 4530, 
-  4531, 4532, 4533, 4534, 4535, 4536, 4537, 4538, 
-  4539, 4540, 4541, 4542, 4543, 4544, 4545, 4546, 
-  4547, 4548, 4549, 4550, 4551, 4552, 4553, 4554, 
-  4555, 4556, 4557, 4558, 4559, 4560, 4561, 4562, 
-  4563, 4564, 4565, 4566, 4566, 4566, 4566, 4566, 
-  4566, 4566, 4566, 4566, 4566, 4566, 4566, 4566, 
-  4566, 4566, 4566, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 4567, 4568, 4569, 4570, 
-  4571, 4572, 4573, 4574, 4575, 4576, 4577, 4578, 
-  4579, 4580, 4581, 4582, 4583, 4584, 4585, 4586, 
-  4587, 4588, 4589, 4590, 4591, 4592, 4593, 4594, 
-  4595, 4596, 4597, 4598, 4599, 4600, 4601, 4602, 
-  4603, 4604, 4605, 4606, 4607, 4608, 4609, 4610, 
-  4611, 4612, 4613, 4614, 4605, 4615, 4616, 4617, 
-  4618, 4619, 4620, 4621, 4622, 4623, 4624, 4625, 
-  4626, 4627, 4628, 4629, 4630, 4631, 4632, 4633, 
-  4634, 4635, 4636, 4637, 4638, 4639, 4640, 4641, 
-  4642, 4643, 4644, 4645, 4646, 4647, 4648, 4649, 
-  4650, 4651, 4652, 4653, 4654, 4655, 4656, 4657, 
-  4658, 4659, 4660, 4661, 4662, 4663, 4664, 4665, 
-  4666, 4667, 4668, 4669, 4670, 4671, 4672, 4673, 
-  4674, 4675, 4676, 4677, 4678, 4679, 4680, 4681, 
-  4682, 4683, 4684, 4685, 4686, 4687, 4688, 4689, 
-  4690, 4691, 4692, 4693, 4694, 4695, 4696, 4697, 
-  4698, 4699, 4700, 4701, 4702, 4703, 4704, 4705, 
-  4706, 4707, 4708, 4709, 4710, 4711, 4712, 4713, 
-  4714, 4606, 4715, 4716, 4717, 4718, 4719, 4720, 
-  4721, 4722, 4723, 4724, 4725, 4726, 4727, 4728, 
-  4729, 4730, 4731, 4732, 4733, 4734, 4735, 4736, 
-  4737, 4738, 4739, 4740, 4741, 4742, 4743, 4744, 
-  4745, 4746, 4747, 4748, 4749, 4750, 4751, 4752, 
-  4753, 4754, 4755, 4756, 4757, 4758, 4759, 4760, 
-  4761, 4762, 4763, 4764, 4765, 4766, 4767, 4768, 
-  4769, 4770, 4771, 4772, 4773, 4774, 4775, 4776, 
-  4777, 4778, 4779, 4780, 4781, 4782, 4783, 4784, 
-  4785, 4786, 4787, 4788, 4789, 4790, 4791, 4792, 
-  4793, 4794, 4795, 4796, 4797, 4798, 4799, 4800, 
-  4801, 4802, 4803, 4804, 4805, 4806, 4807, 4808, 
-  4809, 4810, 4811, 4812, 4813, 4814, 4815, 4816, 
-  4817, 4818, 4819, 4820, 4821, 4822, 4823, 4824, 
-  4825, 4826, 4827, 4828, 4829, 4830, 4831, 4832, 
-  4833, 4834, 4835, 4836, 4837, 4838, 4839, 4840, 
-  4841, 4842, 4843, 4844, 4845, 4846, 4847, 4848, 
-  4849, 4850, 4851, 4852, 4853, 4854, 4855, 4856, 
-  4857, 4858, 4859, 4860, 4861, 4862, 4863, 4864, 
-  4865, 4866, 4867, 4868, 4869, 4870, 4871, 4872, 
-  4873, 4874, 4875, 4876, 4877, 4878, 4879, 4880, 
-  4881, 4882, 4883, 4884, 4885, 4886, 4887, 4888, 
-  4889, 4890, 4891, 4892, 4893, 4894, 4895, 4896, 
-  4897, 4898, 4899, 4900, 4901, 4902, 4903, 4904, 
-  4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 
-  4913, 4914, 4915, 4916, 4917, 4918, 4919, 4920, 
-  4921, 4922, 4923, 4924, 4925, 4926, 4927, 2956, 
-  2955, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 4928, 4929, 4930, 4931, 4932, 4933, 4934, 
-  4935, 4936, 4937, 4938, 4939, 4940, 4941, 4942, 
-  4943, 4944, 4945, 4946, 4947, 4948, 4949, 4950, 
-  4951, 4952, 4953, 4954, 4955, 4956, 4957, 4958, 
-  4959, 4960, 4961, 4962, 4963, 4964, 4965, 4966, 
-  4967, 4968, 4969, 4970, 4971, 4972, 4973, 4974, 
-  4975, 4976, 4977, 4978, 4979, 4980, 4981, 4982, 
-  4983, 4984, 4985, 4986, 4987, 4988, 4989, 4990, 
-  4991, 0, 0, 4992, 4993, 4994, 4995, 4996, 
-  4997, 4998, 4999, 5000, 5001, 5002, 5003, 5004, 
-  5005, 5006, 5007, 5008, 5009, 5010, 5011, 5012, 
-  5013, 5014, 5015, 5016, 5017, 5018, 5019, 5020, 
-  5021, 5022, 5023, 5024, 5025, 5026, 5027, 5028, 
-  5029, 5030, 5031, 5032, 5033, 5034, 5035, 5036, 
-  5037, 5038, 5039, 5040, 5041, 5042, 5043, 5044, 
-  5045, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 5046, 5047, 5048, 5049, 5050, 5051, 5052, 
-  5053, 5054, 5055, 5056, 5057, 5058, 1085, 0, 
-  0, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 5059, 5060, 5061, 5062, 5063, 5064, 5065, 
-  5066, 5067, 5068, 0, 0, 0, 0, 0, 
-  0, 540, 540, 540, 540, 540, 540, 540, 
-  553, 553, 553, 553, 553, 553, 553, 540, 
-  540, 5069, 5070, 5071, 5072, 5072, 5073, 5074, 
-  5075, 5076, 5077, 5078, 5079, 5080, 5081, 5082, 
-  5083, 5084, 5085, 5086, 5087, 5088, 1428, 1428, 
-  5089, 5090, 5091, 5091, 5091, 5091, 5092, 5092, 
-  5092, 5093, 5094, 5095, 0, 5096, 5097, 5098, 
-  5099, 5100, 5101, 5102, 5103, 5104, 5105, 5106, 
-  5107, 5108, 5109, 5110, 5111, 5112, 5113, 5114, 
-  0, 5115, 5116, 5117, 5118, 0, 0, 0, 
-  0, 5119, 5120, 5121, 1118, 5122, 0, 5123, 
-  5124, 5125, 5126, 5127, 5128, 5129, 5130, 5131, 
-  5132, 5133, 5134, 5135, 5136, 5137, 5138, 5139, 
-  5140, 5141, 5142, 5143, 5144, 5145, 5146, 5147, 
-  5148, 5149, 5150, 5151, 5152, 5153, 5154, 5155, 
-  5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 
-  5164, 5165, 5166, 5167, 5168, 5169, 5170, 5171, 
-  5172, 5173, 5174, 5175, 5176, 5177, 5178, 5179, 
-  5180, 5181, 5182, 5183, 5184, 5185, 5186, 5187, 
-  5188, 5189, 5190, 5191, 5192, 5193, 5194, 5195, 
-  5196, 5197, 5198, 5199, 5200, 5201, 5202, 5203, 
-  5204, 5205, 5206, 5207, 5208, 5209, 5210, 5211, 
-  5212, 5213, 5214, 5215, 5216, 5217, 5218, 5219, 
-  5220, 5221, 5222, 5223, 5224, 5225, 5226, 5227, 
-  5228, 5229, 5230, 5231, 5232, 5233, 5234, 5235, 
-  5236, 5237, 5238, 5239, 5240, 5241, 5242, 5243, 
-  5244, 5245, 5246, 5247, 5248, 5249, 5250, 5251, 
-  5252, 5253, 5254, 5255, 5256, 5257, 0, 0, 
-  81, 0, 5258, 5259, 5260, 5261, 5262, 5263, 
-  5264, 5265, 5266, 5267, 5268, 5269, 5270, 5271, 
-  5272, 5273, 5274, 5275, 5276, 5277, 5278, 5279, 
-  5280, 5281, 5282, 5283, 5284, 5285, 5286, 5287, 
-  5288, 5289, 5290, 5291, 5292, 5293, 5294, 5295, 
-  5296, 5297, 5298, 5299, 5300, 5301, 5302, 5303, 
-  5304, 5305, 5306, 5307, 5308, 5309, 5310, 5311, 
-  5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319, 
-  5320, 5321, 5322, 5323, 5324, 5325, 5326, 5327, 
-  5328, 5329, 5330, 5331, 5332, 5333, 5334, 5335, 
-  5336, 5337, 5338, 5339, 5340, 5341, 5342, 5343, 
-  5344, 5345, 5346, 5347, 5348, 5349, 5350, 5351, 
-  5352, 5353, 5354, 5355, 5356, 5357, 5358, 5359, 
-  5360, 5361, 5362, 5363, 5364, 5365, 5366, 5367, 
-  5368, 5369, 5370, 5371, 5372, 5373, 5374, 5375, 
-  5376, 5377, 5378, 5379, 5380, 5381, 5382, 5383, 
-  5384, 5385, 5386, 5387, 5388, 5389, 5390, 5391, 
-  5392, 5393, 5394, 5395, 5396, 5397, 5398, 5399, 
-  5400, 5401, 5402, 5403, 5404, 5405, 5406, 5407, 
-  5408, 5409, 5410, 5411, 5412, 5413, 5414, 5415, 
-  5416, 5417, 5418, 5419, 5420, 5421, 5422, 5423, 
-  5424, 5425, 5426, 5427, 5428, 5429, 5430, 5431, 
-  5432, 5433, 5434, 5435, 5436, 5437, 5438, 5439, 
-  5440, 5441, 5442, 5443, 5444, 5445, 5446, 5447, 
-  0, 0, 0, 5448, 5449, 5450, 5451, 5452, 
-  5453, 0, 0, 5454, 5455, 5456, 5457, 5458, 
-  5459, 0, 0, 5460, 5461, 5462, 5463, 5464, 
-  5465, 0, 0, 5466, 5467, 5468, 0, 0, 
-  0, 5469, 5470, 5471, 5472, 5473, 5474, 5475, 
-  0, 5476, 5477, 5478, 5479, 5480, 5481, 5482, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 5483, 5483, 5483, 1085, 77, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 0, 340, 1160, 
-  1160, 340, 340, 340, 1160, 340, 340, 340, 
-  340, 340, 340, 340, 340, 1160, 340, 340, 
-  340, 340, 340, 1160, 1160, 1160, 340, 340, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 1160, 
-  340, 340, 340, 340, 0, 340, 340, 0, 
-  340, 340, 1160, 340, 340, 1160, 1160, 1160, 
-  340, 340, 340, 1160, 1160, 340, 1160, 0, 
-  0, 340, 340, 1160, 340, 340, 1160, 340, 
-  1160, 1160, 1160, 340, 1160, 1160, 1160, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 1160, 1160, 1160, 1160, 340, 
-  340, 340, 340, 1160, 1160, 1160, 1160, 1160, 
-  340, 1160, 340, 340, 340, 340, 1160, 1160, 
-  1160, 1160, 1160, 340, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 340, 1160, 340, 1160, 
-  1160, 1160, 1160, 1160, 340, 340, 1160, 1160, 
-  1160, 1160, 1160, 1160, 340, 1160, 1160, 1160, 
-  1160, 1160, 340, 340, 340, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 0, 0, 0, 0, 
-  0, 1044, 9, 1044, 0, 0, 0, 0, 
-  5484, 5484, 5484, 5484, 5484, 5484, 5484, 5484, 
-  5484, 5484, 5484, 5484, 5484, 5484, 5484, 5484, 
-  5484, 5484, 5484, 5484, 5484, 5484, 5484, 5484, 
-  5484, 5484, 1190, 5484, 1190, 5484, 1190, 1190, 
-  1190, 1190, 1190, 1190, 5484, 1190, 5484, 1190, 
-  1190, 1190, 1190, 1190, 1190, 0, 0, 0, 
-  1191, 838, 1191, 838, 838, 838, 838, 838, 
-  1191, 5485, 5485, 5485, 5485, 5485, 5485, 5485, 
-  5485, 5485, 5485, 5485, 5485, 5485, 5485, 5485, 
-  5485, 5485, 5485, 5485, 5485, 5485, 5485, 5485, 
-  5485, 5485, 5485, 5485, 5485, 5485, 5485, 5485, 
-  5485, 5485, 5485, 5485, 5485, 5485, 5485, 5485, 
-  5485, 5485, 5486, 5486, 5486, 5486, 5486, 5486, 
-  5485, 5486, 5485, 5485, 5485, 5485, 1427, 1427, 
-  1220, 1427, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 1085, 77, 1427, 1427, 77, 838, 838, 
-  0, 77, 77, 77, 77, 77, 77, 77, 
-  1085, 1085, 1085, 77, 77, 0, 0, 0, 
-  0, 77, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 553, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 1160, 
-  1160, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1160, 340, 1160, 340, 340, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1160, 340, 340, 340, 340, 340, 340, 
-  1160, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 553, 5487, 5487, 5487, 5487, 5487, 5487, 
-  5487, 5487, 5487, 5487, 5487, 5487, 5487, 5487, 
-  5487, 5487, 5487, 5487, 5487, 5487, 5487, 5487, 
-  5487, 5487, 5487, 5487, 5487, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 5484, 5484, 5484, 5484, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 1426, 340, 340, 340, 340, 340, 
-  340, 340, 340, 1426, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 540, 
-  540, 540, 540, 540, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0, 
-  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1177, 2227, 2227, 2227, 2227, 2227, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 5488, 5489, 5490, 5491, 5492, 5493, 5494, 
-  5495, 5496, 5497, 5498, 5499, 5500, 5501, 5502, 
-  5503, 5504, 5505, 5506, 5507, 5508, 5509, 5510, 
-  5511, 5512, 5513, 5514, 5515, 5516, 5517, 5518, 
-  5519, 5520, 5521, 5522, 5523, 5524, 5525, 5526, 
-  5527, 5528, 5529, 5530, 5531, 5532, 5533, 5534, 
-  5535, 5536, 5537, 5538, 5539, 5540, 5541, 5542, 
-  5543, 5544, 5545, 5546, 5547, 5548, 5549, 5550, 
-  5551, 5552, 5553, 5554, 5555, 5556, 5557, 5558, 
-  5559, 5560, 5561, 5562, 5563, 5564, 5565, 5566, 
-  5567, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 1160, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 1160, 
-  340, 1160, 340, 340, 1160, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 1160, 0, 
-  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1250, 0, 0, 0, 0, 0, 
-  0, 5568, 5569, 5570, 5571, 5572, 5573, 5574, 
-  5575, 5576, 5577, 5578, 5579, 5580, 5581, 5582, 
-  5583, 5584, 5585, 5586, 5587, 5588, 5589, 5590, 
-  5591, 5592, 5593, 5594, 5595, 5596, 5597, 5598, 
-  5599, 5600, 5601, 5602, 5603, 0, 0, 0, 
-  0, 5604, 5605, 5606, 5607, 5608, 5609, 5610, 
-  5611, 5612, 5613, 5614, 5615, 5616, 5617, 5618, 
-  5619, 5620, 5621, 5622, 5623, 5624, 5625, 5626, 
-  5627, 5628, 5629, 5630, 5631, 5632, 5633, 5634, 
-  5635, 5636, 5637, 5638, 5639, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  1044, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 1160, 340, 340, 340, 
-  340, 1160, 340, 1160, 1160, 1160, 340, 340, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 340, 340, 1160, 340, 340, 1160, 1160, 
-  340, 340, 1160, 1160, 1160, 1160, 340, 1160, 
-  340, 340, 340, 340, 340, 1160, 1160, 1160, 
-  340, 1160, 340, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 340, 1160, 1160, 1160, 340, 
-  1160, 1160, 340, 340, 1160, 1160, 1160, 1160, 
-  1160, 1160, 340, 340, 1160, 1160, 1160, 340, 
-  340, 340, 340, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 340, 1160, 1160, 1160, 1160, 
-  340, 1160, 1160, 340, 340, 340, 1160, 1160, 
-  1160, 1160, 340, 340, 340, 1160, 1160, 1160, 
-  1160, 340, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 1160, 1160, 1160, 1160, 1160, 340, 340, 
-  1160, 1160, 340, 1160, 1160, 340, 1160, 1160, 
-  1160, 1160, 1160, 340, 1160, 1160, 1160, 340, 
-  1160, 1160, 340, 1160, 1160, 340, 1160, 340, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 340, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 340, 340, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 340, 1160, 
-  340, 340, 340, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 340, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 340, 1160, 1160, 340, 1160, 340, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1156, 1156, 1156, 1106, 1156, 1106, 0, 
-  0, 1156, 0, 1106, 1156, 1156, 1156, 1156, 
-  1156, 1106, 1156, 1106, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1106, 1156, 1156, 1156, 1156, 1106, 
-  1156, 1106, 1156, 1156, 1106, 1106, 1156, 1106, 
-  1156, 1106, 1106, 1106, 1106, 1156, 1106, 1106, 
-  1106, 1106, 1106, 1156, 1106, 1156, 1106, 0, 
-  1156, 1106, 0, 0, 0, 1156, 0, 0, 
-  1156, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 0, 
-  1103, 5640, 5640, 5640, 5640, 5640, 5640, 5640, 
-  5640, 1156, 1156, 1156, 1106, 1106, 1106, 1106, 
-  1156, 1106, 1106, 1156, 1106, 1156, 1106, 1106, 
-  1156, 1156, 1106, 1156, 1156, 1106, 1156, 1156, 
-  5641, 5641, 5640, 5640, 5642, 5642, 5642, 5642, 
-  5640, 1156, 1106, 1156, 1156, 1156, 1106, 1106, 
-  1106, 1106, 1106, 1156, 1156, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1156, 
-  1156, 1106, 1156, 1156, 1106, 1106, 1106, 1106, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  5640, 5640, 5640, 5640, 5640, 5640, 5640, 5640, 
-  5640, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 0, 1106, 1106, 0, 
-  0, 0, 0, 0, 5640, 5640, 5640, 5640, 
-  5640, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 5640, 
-  5640, 5640, 5640, 5640, 5640, 0, 0, 0, 
-  9, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 0, 0, 0, 0, 0, 
-  1103, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1156, 1106, 1156, 1156, 1156, 1156, 1156, 
-  1106, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1106, 1156, 1156, 1156, 1156, 1156, 1156, 1106, 
-  1156, 1156, 1106, 1156, 1106, 1156, 1106, 1106, 
-  1106, 1106, 1156, 1106, 1156, 1106, 1156, 1106, 
-  1106, 1106, 1156, 1106, 1156, 1106, 1156, 1156, 
-  1106, 0, 0, 0, 0, 5642, 5640, 1106, 
-  1156, 5640, 5640, 5640, 5640, 5642, 5642, 5642, 
-  5640, 5640, 5642, 5642, 5642, 5642, 5642, 5642, 
-  5642, 0, 0, 5642, 5642, 5642, 5642, 5642, 
-  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5642, 
-  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5642, 
-  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5642, 
-  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5640, 
-  5640, 5640, 5640, 5642, 5640, 5642, 5642, 5642, 
-  5642, 1156, 1153, 1153, 1153, 0, 1153, 1153, 
-  0, 0, 0, 0, 0, 1153, 553, 1153, 
-  540, 1156, 1156, 1156, 1156, 0, 1156, 1156, 
-  1156, 0, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 0, 0, 0, 
-  0, 540, 566, 553, 0, 0, 0, 0, 
-  1168, 5642, 5642, 5642, 5642, 5642, 5642, 5642, 
-  5642, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1158, 1158, 1158, 1158, 1158, 1158, 1158, 
-  1158, 1158, 0, 0, 0, 0, 0, 0, 
-  0, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 5640, 5640, 
-  1103, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 5640, 5640, 
-  5640, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1106, 1156, 1156, 1106, 1106, 1106, 1156, 
-  1106, 5643, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1156, 1156, 1156, 1106, 1156, 1156, 1156, 
-  1106, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1106, 1156, 1156, 1106, 540, 553, 
-  0, 0, 0, 0, 5640, 5642, 5642, 5642, 
-  5642, 1158, 1158, 1158, 1158, 1103, 1103, 1103, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1106, 1156, 1156, 1156, 1156, 1106, 1106, 
-  1106, 1156, 1156, 1156, 1156, 1106, 1106, 1106, 
-  1106, 1106, 1156, 1156, 1156, 1156, 1106, 1156, 
-  1106, 1106, 1106, 1106, 1156, 1106, 1106, 1106, 
-  1106, 1156, 1156, 1106, 1106, 1106, 1106, 1106, 
-  1156, 1106, 1106, 1156, 1156, 1106, 1106, 1106, 
-  1106, 1106, 1156, 1156, 1156, 1156, 1156, 0, 
-  0, 0, 9, 9, 9, 9, 9, 9, 
-  9, 1156, 1156, 1106, 1106, 1156, 1106, 1106, 
-  1106, 1156, 1106, 1156, 1106, 1156, 1156, 1106, 
-  1106, 1156, 1156, 1106, 1106, 1106, 1106, 0, 
-  0, 5640, 5640, 5640, 5640, 5640, 5640, 5642, 
-  5640, 1106, 1106, 1106, 1106, 1156, 1106, 1106, 
-  1156, 1106, 1106, 1106, 1106, 1156, 1106, 1156, 
-  1106, 1106, 1156, 1106, 0, 0, 0, 0, 
-  0, 5640, 5640, 5640, 5640, 5640, 5640, 5640, 
-  5640, 1106, 1156, 1106, 1156, 1106, 1106, 1106, 
-  1156, 1106, 1156, 1106, 1106, 1106, 1156, 1106, 
-  1106, 1156, 1106, 0, 0, 0, 0, 0, 
-  0, 0, 1158, 1158, 1158, 1158, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 5640, 5640, 5640, 5642, 5640, 5640, 
-  5642, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 
-  1106, 1106, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 5644, 5645, 5646, 5647, 5648, 5649, 5650, 
-  5651, 5652, 5653, 5654, 5655, 5656, 5657, 5658, 
-  5659, 5660, 5661, 5662, 5663, 5664, 5665, 5666, 
-  5667, 5668, 5669, 5670, 5671, 5672, 5673, 5674, 
-  5675, 5676, 5677, 5678, 5679, 5680, 5681, 5682, 
-  5683, 5684, 5685, 5686, 5687, 5688, 5689, 5690, 
-  5691, 5692, 5693, 5694, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 5695, 5696, 5697, 5698, 5699, 5700, 5701, 
-  5702, 5703, 5704, 5705, 5706, 5707, 5708, 5709, 
-  5710, 5711, 5712, 5713, 5714, 5715, 5716, 5717, 
-  5718, 5719, 5720, 5721, 5722, 5723, 5724, 5725, 
-  5726, 5727, 5728, 5729, 5730, 5731, 5732, 5733, 
-  5734, 5735, 5736, 5737, 5738, 5739, 5740, 5741, 
-  5742, 5743, 5744, 5745, 0, 0, 0, 0, 
-  0, 0, 0, 5640, 5640, 5640, 5640, 5640, 
-  5640, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 5746, 5746, 5747, 5746, 5746, 5746, 5746, 
-  5746, 5747, 5746, 5746, 5747, 5747, 5747, 5746, 
-  5746, 5747, 5746, 5746, 5746, 5747, 5747, 5746, 
-  5747, 5747, 5746, 5746, 5747, 5747, 5747, 5747, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1159, 1153, 1159, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1168, 
-  1177, 1177, 1177, 1177, 1177, 1177, 1177, 0, 
-  0, 0, 0, 1220, 1220, 1220, 1220, 1220, 
-  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 
-  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  1168, 1153, 1153, 1159, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 5748, 5749, 5750, 5751, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 5752, 1160, 
-  1160, 1160, 1160, 1160, 5753, 1160, 1160, 1160, 
-  1160, 1159, 1159, 1159, 1153, 1153, 1153, 1153, 
-  1159, 1159, 1168, 5754, 1177, 1177, 5755, 1177, 
-  1177, 1177, 1177, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 0, 0, 0, 0, 0, 0, 
-  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1250, 0, 0, 0, 0, 0, 
-  0, 540, 540, 540, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  5756, 1153, 1153, 1153, 1153, 1159, 1153, 5757, 
-  5758, 1153, 5759, 5760, 1168, 1168, 0, 1178, 
-  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1177, 1177, 1177, 1177, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 340, 340, 340, 1160, 340, 340, 
-  340, 340, 1160, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 1160, 340, 1160, 
-  1160, 1160, 1160, 1160, 340, 1160, 340, 1160, 
-  340, 340, 340, 340, 1180, 1044, 1044, 1160, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1153, 1153, 1159, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1159, 1159, 1159, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1159, 1452, 1160, 1237, 1237, 1160, 1177, 1177, 
-  1177, 1177, 1177, 1180, 1153, 1153, 1177, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1160, 1177, 1160, 1177, 1177, 
-  1177, 0, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1190, 1190, 1190, 1190, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 0, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1159, 1159, 1159, 
-  1153, 1153, 1153, 1159, 1159, 1153, 1452, 1180, 
-  1153, 1177, 1177, 1177, 1177, 1177, 1177, 1153, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 1160, 0, 1160, 1160, 1160, 1160, 0, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1177, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1153, 1159, 1159, 1159, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1180, 1168, 0, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 1153, 1153, 1159, 1159, 0, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 0, 
-  1160, 1160, 0, 0, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 0, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 1180, 1160, 5761, 
-  1159, 1153, 1159, 1159, 1159, 1159, 0, 0, 
-  5762, 1159, 0, 0, 5763, 5764, 1452, 0, 
-  0, 1160, 0, 0, 0, 0, 0, 0, 
-  5765, 0, 0, 0, 0, 0, 1160, 1160, 
-  1160, 1160, 1160, 1159, 1159, 0, 0, 540, 
-  540, 540, 540, 540, 540, 540, 0, 0, 
-  0, 540, 540, 540, 540, 540, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1159, 1159, 
-  1159, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1159, 1159, 1168, 1153, 1153, 1159, 1180, 
-  1160, 1160, 1160, 1160, 1177, 1177, 1177, 1177, 
-  1177, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 1177, 0, 1177, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 5766, 1159, 1159, 1153, 1153, 1153, 1153, 
-  1153, 1153, 5767, 5768, 5769, 5770, 5771, 5772, 
-  1153, 1153, 1159, 1168, 1180, 1160, 1160, 1177, 
-  1160, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  5773, 1159, 1159, 1153, 1153, 1153, 1153, 0, 
-  0, 5774, 5775, 5776, 5777, 1153, 1153, 1159, 
-  1168, 1180, 1177, 1177, 1177, 1177, 1177, 1177, 
-  1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 
-  1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 
-  1177, 1160, 1160, 1160, 1160, 1153, 1153, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1159, 1159, 1159, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1159, 1159, 1153, 1159, 
-  1168, 1153, 1177, 1177, 1177, 1160, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 1428, 1428, 1428, 1428, 1428, 1428, 1428, 
-  1428, 1428, 1428, 1428, 1428, 1428, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1153, 1159, 1153, 1159, 
-  1159, 1153, 1153, 1153, 1153, 1153, 1153, 1452, 
-  1180, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 0, 1153, 1153, 
-  1153, 1159, 1159, 1153, 1153, 1153, 1153, 1159, 
-  1153, 1153, 1153, 1153, 1168, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1190, 1190, 1177, 1177, 1177, 
-  1191, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 5778, 5779, 5780, 5781, 5782, 5783, 5784, 
-  5785, 5786, 5787, 5788, 5789, 5790, 5791, 5792, 
-  5793, 5794, 5795, 5796, 5797, 5798, 5799, 5800, 
-  5801, 5802, 5803, 5804, 5805, 5806, 5807, 5808, 
-  5809, 5810, 5811, 5812, 5813, 5814, 5815, 5816, 
-  5817, 5818, 5819, 5820, 5821, 5822, 5823, 5824, 
-  5825, 5826, 5827, 5828, 5829, 5830, 5831, 5832, 
-  5833, 5834, 5835, 5836, 5837, 5838, 5839, 5840, 
-  5841, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1250, 5484, 5484, 5484, 5484, 5484, 
-  5484, 5484, 5484, 5484, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  340, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  5842, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  0, 1153, 1153, 1153, 1153, 1153, 1153, 1159, 
-  5843, 1160, 1177, 1177, 1177, 1177, 1177, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 
-  1178, 1178, 1178, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1190, 1190, 1190, 1190, 0, 0, 
-  0, 1044, 1044, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 0, 0, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 0, 1159, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1159, 1153, 1153, 1159, 1153, 1153, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 
-  0, 1044, 1044, 1044, 1044, 1044, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1250, 0, 0, 0, 0, 1044, 
-  1044, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 0, 
-  0, 566, 566, 566, 566, 566, 1044, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 540, 540, 540, 540, 540, 540, 540, 
-  1044, 1044, 1044, 1044, 1044, 838, 838, 838, 
-  838, 523, 523, 523, 523, 1044, 838, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 
-  1250, 1250, 1250, 0, 5484, 5484, 5484, 5484, 
-  5484, 5484, 5484, 0, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 0, 0, 0, 0, 0, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1159, 1159, 1159, 1159, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 
-  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  1153, 1153, 1153, 1153, 1179, 1179, 1179, 1179, 
-  1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 
-  1179, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1179, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 1160, 1160, 
-  1160, 1160, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 1160, 1160, 340, 340, 
-  1160, 1160, 340, 340, 1160, 1160, 1160, 1160, 
-  340, 340, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 1160, 1160, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 1160, 340, 340, 340, 1160, 340, 340, 
-  1160, 1160, 1160, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 340, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  340, 1160, 340, 340, 340, 340, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 0, 0, 0, 0, 0, 0, 
-  0, 340, 340, 340, 340, 340, 340, 340, 
-  340, 340, 340, 0, 0, 1191, 1153, 566, 
-  1177, 81, 81, 81, 81, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 838, 838, 838, 838, 838, 838, 838, 
-  838, 1191, 1191, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 1191, 838, 1191, 838, 
-  838, 838, 1191, 838, 838, 838, 1191, 1191, 
-  1191, 838, 1191, 838, 1191, 838, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 838, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 838, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  838, 838, 1191, 1191, 1191, 1191, 1191, 838, 
-  838, 838, 838, 1191, 838, 1191, 1191, 1191, 
-  838, 838, 838, 1191, 1191, 1191, 1191, 1191, 
-  838, 1191, 1191, 1191, 838, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 838, 1191, 1191, 1191, 838, 
-  838, 838, 1191, 1191, 838, 838, 838, 838, 
-  1191, 1191, 838, 838, 838, 1191, 1191, 838, 
-  838, 838, 838, 1191, 1191, 1191, 1191, 1191, 
-  838, 838, 838, 838, 838, 838, 1191, 838, 
-  838, 1191, 1191, 1191, 838, 1191, 1191, 1191, 
-  1191, 838, 838, 1191, 838, 1191, 838, 1191, 
-  1191, 1191, 1191, 1191, 1191, 838, 838, 838, 
-  1191, 1191, 838, 838, 838, 1191, 838, 1191, 
-  838, 1191, 838, 838, 1191, 1191, 1191, 1191, 
-  838, 1191, 1191, 1191, 838, 1191, 1191, 1191, 
-  1191, 838, 1191, 1191, 1191, 838, 1191, 1191, 
-  1191, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 1191, 
-  838, 1191, 838, 838, 838, 838, 838, 838, 
-  838, 1191, 838, 1191, 838, 838, 838, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 838, 1191, 838, 838, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 838, 
-  838, 838, 1191, 1191, 1191, 1191, 838, 838, 
-  0, 0, 1191, 838, 1191, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 1191, 
-  1191, 1191, 1191, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  5844, 5845, 1191, 838, 838, 1191, 838, 5846, 
-  5847, 5848, 5849, 5850, 5851, 5852, 5853, 5854, 
-  566, 566, 566, 1191, 1191, 1191, 5855, 5856, 
-  5857, 5858, 5859, 5860, 81, 81, 81, 81, 
-  81, 81, 81, 81, 553, 553, 553, 553, 
-  553, 553, 553, 553, 838, 838, 540, 540, 
-  540, 540, 540, 553, 553, 838, 838, 838, 
-  838, 838, 838, 1191, 1191, 838, 838, 1191, 
-  1191, 1191, 1191, 838, 838, 1191, 1191, 838, 
-  838, 838, 838, 838, 1191, 1191, 838, 1191, 
-  1191, 838, 838, 540, 540, 540, 540, 1191, 
-  1191, 1191, 1191, 1191, 1191, 838, 1191, 1191, 
-  1191, 1191, 5861, 5862, 5863, 5864, 5865, 5866, 
-  5867, 5868, 838, 838, 838, 838, 838, 838, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 838, 838, 838, 838, 838, 838, 838, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 540, 540, 540, 1085, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 5484, 1190, 1190, 1190, 1190, 1190, 
-  1190, 1190, 1190, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 5869, 2157, 2132, 5870, 2159, 2160, 5871, 
-  2139, 2142, 5872, 5873, 2143, 2162, 2145, 5874, 
-  2147, 2148, 2149, 5875, 5876, 5877, 5878, 5879, 
-  5880, 5881, 2153, 5882, 5883, 5884, 5885, 2158, 
-  5886, 2138, 2140, 2168, 2177, 5887, 2144, 5888, 
-  5889, 2163, 5890, 5891, 5892, 5893, 5894, 5895, 
-  5896, 5897, 5898, 5899, 5900, 5901, 5902, 5903, 
-  2175, 5904, 5905, 5906, 5907, 5908, 5909, 5910, 
-  5911, 5912, 5913, 5914, 5915, 5916, 5917, 5918, 
-  5919, 5920, 5921, 5922, 5923, 5924, 5925, 5926, 
-  5927, 5928, 2176, 5929, 5930, 5931, 0, 5932, 
-  5933, 5934, 5935, 5936, 5937, 5938, 5939, 5940, 
-  5941, 5942, 5943, 5944, 5945, 5946, 5947, 5948, 
-  5949, 5901, 5902, 5903, 2175, 5904, 5905, 5906, 
-  5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914, 
-  5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922, 
-  5923, 5924, 5925, 5926, 5927, 5928, 2176, 5929, 
-  5930, 5931, 5950, 5932, 5933, 5934, 5935, 5936, 
-  5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 
-  5945, 5946, 5947, 5948, 5949, 5901, 0, 5903, 
-  2175, 0, 0, 5906, 0, 0, 5909, 5910, 
-  0, 0, 5913, 5914, 5915, 5916, 0, 5918, 
-  5919, 5920, 5921, 5922, 5923, 5924, 5925, 5926, 
-  5927, 5928, 2176, 0, 5930, 0, 5950, 5932, 
-  5933, 5934, 5935, 5936, 5937, 0, 5939, 5940, 
-  5941, 5942, 5943, 5944, 5945, 5946, 5947, 5948, 
-  5949, 5901, 5902, 5903, 2175, 5904, 5905, 5906, 
-  5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914, 
-  5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922, 
-  5923, 5924, 5925, 5926, 5927, 5928, 2176, 5929, 
-  5930, 5931, 5950, 5932, 5933, 5934, 5935, 5936, 
-  5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 
-  5945, 5946, 5947, 5948, 5949, 5869, 2157, 0, 
-  5870, 2159, 2160, 5871, 0, 0, 5872, 5873, 
-  2143, 2162, 2145, 5874, 2147, 2148, 0, 5875, 
-  5876, 5877, 5878, 5879, 5880, 5881, 0, 5882, 
-  5883, 5884, 5885, 2158, 5886, 2138, 2140, 2168, 
-  2177, 5887, 2144, 5888, 5889, 2163, 5890, 5891, 
-  5892, 5893, 5894, 5895, 5896, 5897, 5898, 5899, 
-  5900, 5869, 2157, 0, 5870, 2159, 2160, 5871, 
-  0, 2142, 5872, 5873, 2143, 2162, 0, 5874, 
-  0, 0, 0, 5875, 5876, 5877, 5878, 5879, 
-  5880, 5881, 0, 5882, 5883, 5884, 5885, 2158, 
-  5886, 2138, 2140, 2168, 2177, 5887, 2144, 5888, 
-  5889, 2163, 5890, 5891, 5892, 5893, 5894, 5895, 
-  5896, 5897, 5898, 5899, 5900, 5869, 2157, 2132, 
-  5870, 2159, 2160, 5871, 2139, 2142, 5872, 5873, 
-  2143, 2162, 2145, 5874, 2147, 2148, 2149, 5875, 
-  5876, 5877, 5878, 5879, 5880, 5881, 2153, 5882, 
-  5883, 5884, 5885, 2158, 5886, 2138, 2140, 2168, 
-  2177, 5887, 2144, 5888, 5889, 2163, 5890, 5891, 
-  5892, 5893, 5894, 5895, 5896, 5897, 5898, 5899, 
-  5900, 5869, 2157, 2132, 5870, 2159, 2160, 5871, 
-  2139, 2142, 5872, 5873, 2143, 2162, 2145, 5874, 
-  2147, 2148, 2149, 5875, 5876, 5877, 5878, 5879, 
-  5880, 5881, 2153, 5882, 5883, 5884, 5885, 2158, 
-  5886, 2138, 2140, 2168, 2177, 5887, 2144, 5888, 
-  5889, 2163, 5890, 5891, 5892, 5893, 5894, 5895, 
-  5896, 5897, 5898, 5899, 5900, 5869, 2157, 2132, 
-  5870, 2159, 2160, 5871, 2139, 2142, 5872, 5873, 
-  2143, 2162, 2145, 5874, 2147, 2148, 2149, 5875, 
-  5876, 5877, 5878, 5879, 5880, 5881, 2153, 5882, 
-  5883, 5884, 5885, 2158, 5886, 2138, 2140, 2168, 
-  2177, 5887, 2144, 5888, 5889, 2163, 5890, 5891, 
-  5892, 5893, 5894, 5895, 5896, 5897, 5898, 5899, 
-  5900, 5901, 5902, 5903, 2175, 5904, 5905, 5906, 
-  5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914, 
-  5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922, 
-  5923, 5924, 5925, 5926, 5927, 5928, 2176, 5929, 
-  5930, 5931, 5950, 5932, 5933, 5934, 5935, 5936, 
-  5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 
-  5945, 5946, 5947, 5948, 5949, 5901, 5902, 5903, 
-  2175, 5904, 5905, 5906, 5907, 5908, 5909, 5910, 
-  5911, 5912, 5913, 5914, 5915, 5916, 5917, 5918, 
-  5919, 5920, 5921, 5922, 5923, 5924, 5925, 5926, 
-  5927, 5928, 2176, 5929, 5930, 5931, 5950, 5932, 
-  5933, 5934, 5935, 5936, 5937, 5938, 5939, 5940, 
-  5941, 5942, 5943, 5944, 5945, 5946, 5947, 5948, 
-  5949, 5901, 5902, 5903, 2175, 5904, 5905, 5906, 
-  5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914, 
-  5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922, 
-  5923, 5924, 5925, 5926, 5927, 5928, 2176, 5929, 
-  5930, 5931, 5950, 5932, 5933, 5934, 5935, 5936, 
-  5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 
-  5945, 5946, 5947, 5948, 5949, 5951, 5952, 0, 
-  0, 5953, 5954, 2172, 5955, 5956, 5957, 5958, 
-  5959, 5960, 5961, 5962, 5963, 5964, 5965, 5966, 
-  5967, 5968, 5969, 5970, 5971, 5972, 5973, 5974, 
-  5975, 5976, 5977, 5978, 5979, 5980, 5981, 5982, 
-  5983, 5984, 5985, 5986, 5987, 5988, 5989, 5990, 
-  5991, 5992, 5993, 5994, 5995, 5996, 5997, 5998, 
-  5999, 6000, 6001, 6002, 6003, 6004, 6005, 6006, 
-  6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 
-  6015, 6016, 6017, 6018, 6019, 6020, 6021, 6022, 
-  6023, 6024, 2173, 6025, 6026, 6027, 6028, 6029, 
-  6030, 6031, 6032, 6033, 6034, 6035, 6036, 2171, 
-  6037, 6038, 6039, 6040, 6041, 6042, 6043, 6044, 
-  6045, 6046, 6047, 6048, 2170, 6049, 6050, 6051, 
-  6052, 6053, 6054, 6055, 6056, 6057, 6058, 6059, 
-  6005, 6060, 6061, 6062, 6063, 6010, 6011, 6012, 
-  6013, 6014, 6015, 6016, 6017, 6018, 6019, 6020, 
-  6021, 6022, 6023, 6024, 2173, 6025, 6026, 6027, 
-  6028, 6029, 6030, 6031, 6032, 6033, 6034, 6035, 
-  6036, 2171, 6037, 6038, 6039, 6040, 6041, 6042, 
-  6043, 6044, 6045, 6046, 6047, 6048, 2170, 6049, 
-  6050, 6051, 6052, 6053, 6054, 6055, 6056, 6057, 
-  6058, 6059, 6064, 6060, 6061, 6062, 6063, 5953, 
-  5954, 2172, 5955, 5956, 5957, 5958, 5959, 5960, 
-  5961, 5962, 5963, 5964, 5965, 5966, 5967, 5968, 
-  5969, 5970, 5971, 5972, 5973, 5974, 5975, 5976, 
-  5977, 5978, 5979, 5980, 5981, 5982, 5983, 5984, 
-  5985, 5986, 5987, 5988, 5989, 5990, 5991, 5992, 
-  5993, 5994, 5995, 5996, 5997, 5998, 5999, 6000, 
-  6001, 6002, 6003, 6004, 6005, 6006, 6007, 6008, 
-  6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 
-  6017, 6018, 6019, 6020, 6021, 6022, 6023, 6024, 
-  2173, 6025, 6026, 6027, 6028, 6029, 6030, 6031, 
-  6032, 6033, 6034, 6035, 6036, 2171, 6037, 6038, 
-  6039, 6040, 6041, 6042, 6043, 6044, 6045, 6046, 
-  6047, 6048, 2170, 6049, 6050, 6051, 6052, 6053, 
-  6054, 6055, 6056, 6057, 6058, 6059, 6064, 6060, 
-  6061, 6062, 6063, 6065, 6066, 0, 0, 6067, 
-  6068, 6069, 6070, 6071, 6072, 6073, 6074, 6075, 
-  6076, 6067, 6068, 6069, 6070, 6071, 6072, 6073, 
-  6074, 6075, 6076, 6067, 6068, 6069, 6070, 6071, 
-  6072, 6073, 6074, 6075, 6076, 6067, 6068, 6069, 
-  6070, 6071, 6072, 6073, 6074, 6075, 6076, 6077, 
-  6078, 6079, 6080, 6081, 6082, 6083, 6084, 6085, 
-  6086, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  838, 838, 838, 838, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 838, 838, 
-  838, 838, 838, 838, 838, 838, 1153, 838, 
-  838, 838, 838, 838, 838, 838, 838, 838, 
-  838, 838, 838, 838, 838, 1153, 838, 838, 
-  1044, 1044, 1044, 1044, 1044, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 1153, 1153, 1153, 1153, 
-  1153, 0, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 
-  1153, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 540, 540, 540, 540, 540, 540, 540, 
-  0, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 540, 540, 540, 540, 540, 540, 
-  540, 540, 0, 0, 540, 540, 540, 540, 
-  540, 540, 540, 0, 540, 540, 0, 540, 
-  540, 540, 540, 540, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1106, 1106, 1106, 1106, 
-  1106, 1156, 1156, 1106, 1106, 1106, 1106, 1106, 
-  1156, 1106, 1156, 1106, 1106, 1106, 1156, 1106, 
-  1156, 1156, 1106, 1106, 1106, 1106, 1156, 1106, 
-  1106, 1106, 1156, 1156, 1106, 1156, 1156, 1156, 
-  1156, 1156, 1156, 1156, 1106, 1106, 1156, 1156, 
-  1156, 1156, 1156, 1106, 1156, 1106, 1106, 1106, 
-  1106, 1106, 1156, 1156, 1106, 1106, 1106, 1106, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
-  1106, 1156, 1156, 1106, 1106, 1106, 1106, 1156, 
-  1156, 1156, 1156, 1106, 1156, 1156, 1156, 1156, 
-  1106, 1156, 1156, 1106, 1156, 1106, 1156, 1106, 
-  1156, 1156, 1106, 1106, 1106, 1106, 1106, 1156, 
-  1156, 1156, 1106, 1156, 1106, 1156, 1106, 1156, 
-  1156, 1156, 1156, 1106, 1156, 1156, 1156, 1156, 
-  1156, 1156, 1106, 1156, 1156, 1156, 1156, 1156, 
-  1156, 1106, 1106, 1156, 1156, 1156, 1106, 1106, 
-  1156, 1156, 1156, 1156, 1106, 1156, 1156, 1106, 
-  1156, 1156, 1156, 1156, 1106, 1156, 1156, 1106, 
-  1156, 1156, 1106, 1156, 1156, 1156, 1106, 1156, 
-  1156, 1156, 1156, 1106, 1106, 1156, 1156, 1106, 
-  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1106, 
-  1156, 1156, 1156, 1156, 1156, 1156, 0, 0, 
-  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5642, 
-  5642, 553, 553, 553, 553, 553, 553, 553, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 6087, 6088, 6089, 6090, 6091, 6092, 6093, 
-  6094, 6095, 6096, 6097, 6098, 6099, 6100, 6101, 
-  6102, 6103, 6104, 6105, 6106, 6107, 6108, 6109, 
-  6110, 6111, 6112, 6113, 6114, 6115, 6116, 6117, 
-  6118, 6119, 6120, 6121, 6122, 6123, 6124, 6125, 
-  6126, 6127, 6128, 6129, 6130, 6131, 6132, 6133, 
-  6134, 6135, 6136, 6137, 6138, 6139, 6140, 6141, 
-  6142, 6143, 6144, 6145, 6146, 6147, 6148, 6149, 
-  6150, 6151, 6152, 6153, 6154, 540, 540, 540, 
-  540, 540, 540, 1180, 0, 0, 0, 0, 
-  0, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 
-  1154, 1154, 1154, 0, 0, 0, 0, 1103, 
-  1103, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 6155, 6156, 6157, 6158, 0, 6159, 6160, 
-  6161, 6162, 6163, 6164, 6165, 6166, 6167, 6168, 
-  6169, 6170, 6171, 6172, 6173, 6174, 6175, 6176, 
-  6177, 6178, 6179, 6180, 6181, 6182, 6183, 6184, 
-  6185, 0, 6156, 6157, 0, 6186, 0, 0, 
-  6161, 0, 6163, 6164, 6165, 6166, 6167, 6168, 
-  6169, 6170, 6171, 6172, 0, 6174, 6175, 6176, 
-  6177, 0, 6179, 0, 6181, 0, 0, 0, 
-  0, 0, 0, 6157, 0, 0, 0, 0, 
-  6161, 0, 6163, 0, 6165, 0, 6167, 6168, 
-  6169, 0, 6171, 6172, 0, 6174, 0, 0, 
-  6177, 0, 6179, 0, 6181, 0, 6183, 0, 
-  6185, 0, 6156, 6157, 0, 6187, 0, 0, 
-  6161, 6162, 6163, 6164, 0, 6166, 6167, 6168, 
-  6169, 6170, 6171, 6172, 0, 6174, 6175, 6176, 
-  6177, 0, 6179, 6180, 6181, 6182, 0, 6184, 
-  0, 6155, 6156, 6157, 6158, 6187, 6159, 6160, 
-  6161, 6162, 6163, 0, 6165, 6166, 6167, 6168, 
-  6169, 6170, 6171, 6172, 6173, 6174, 6175, 6176, 
-  6177, 6178, 6179, 6180, 6181, 0, 0, 0, 
-  0, 0, 6188, 6189, 6190, 0, 6191, 6192, 
-  6193, 6194, 6195, 0, 6196, 6197, 6198, 6199, 
-  6200, 6201, 6202, 6203, 6204, 6205, 6206, 6207, 
-  6208, 6209, 6210, 6211, 6212, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1109, 1109, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 77, 77, 77, 
-  77, 77, 77, 77, 77, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  0, 0, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 0, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 0, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 6213, 6214, 6215, 6216, 6217, 6218, 6219, 
-  6220, 6221, 6222, 6223, 1220, 1220, 0, 0, 
-  0, 6224, 6225, 6226, 6227, 6228, 6229, 6230, 
-  6231, 6232, 6233, 6234, 6235, 6236, 6237, 6238, 
-  6239, 6240, 6241, 6242, 6243, 6244, 6245, 6246, 
-  6247, 6248, 6249, 6250, 6251, 6252, 6253, 6254, 
-  0, 6255, 6256, 6257, 6258, 6259, 6260, 6261, 
-  6262, 6263, 6264, 6265, 6266, 6267, 6268, 6269, 
-  6270, 6271, 6272, 6273, 6274, 6275, 6276, 6277, 
-  6278, 6279, 6280, 6281, 3613, 6282, 6283, 6284, 
-  6285, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 6286, 6287, 0, 0, 0, 
-  0, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 6288, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 
-  1191, 1191, 1191, 1191, 1191, 1191, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 6289, 
-  6289, 6289, 6289, 6289, 6289, 6289, 6289, 6289, 
-  6289, 6289, 6289, 6289, 6289, 6289, 6289, 6289, 
-  6289, 6289, 6289, 6289, 6289, 6289, 6289, 6289, 
-  6289, 6290, 6291, 6292, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 6293, 6294, 6295, 6296, 6297, 6298, 6299, 
-  6300, 6301, 6302, 6303, 6304, 6305, 6306, 6307, 
-  6308, 6309, 6310, 6311, 6312, 6313, 6314, 6315, 
-  6316, 6317, 6318, 6319, 6320, 6321, 6322, 6323, 
-  6324, 6325, 6326, 6327, 6328, 6329, 6330, 6331, 
-  6332, 6333, 6334, 6335, 6336, 0, 0, 0, 
-  0, 6337, 6338, 6339, 6340, 6341, 6342, 6343, 
-  6344, 6345, 0, 0, 0, 0, 0, 0, 
-  0, 6346, 6347, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 2464, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 2464, 2464, 1085, 1085, 
-  1085, 1085, 1085, 2464, 2464, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 6348, 6348, 6348, 6348, 
-  6348, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 2464, 2464, 1085, 1085, 2464, 
-  2464, 2464, 2464, 2464, 2464, 2464, 2464, 2464, 
-  2464, 2464, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 6349, 
-  6349, 6349, 6349, 1085, 1085, 1085, 1085, 2464, 
-  1085, 2464, 2464, 2464, 2464, 2464, 2464, 2464, 
-  2464, 2464, 1085, 1085, 1085, 2464, 1085, 1085, 
-  1085, 1085, 2464, 2464, 2464, 1085, 2464, 2464, 
-  2464, 1085, 1085, 1085, 2465, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 2464, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 2464, 1085, 
-  1085, 1085, 1085, 2464, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 2464, 1085, 1085, 1085, 1085, 2464, 2464, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  77, 2465, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 2464, 2464, 
-  2464, 1085, 1085, 1085, 2464, 2464, 2464, 2464, 
-  2464, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 77, 
-  77, 77, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 2464, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 2464, 2464, 2464, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 2464, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 77, 77, 1085, 77, 77, 
-  77, 1085, 1085, 1085, 1085, 77, 77, 77, 
-  1085, 1085, 77, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 77, 1085, 77, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 77, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 77, 77, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  77, 77, 77, 1085, 1085, 1085, 77, 77, 
-  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 77, 77, 77, 77, 77, 77, 77, 
-  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 0, 0, 0, 0, 0, 0, 0, 
-  0, 77, 77, 77, 77, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 77, 77, 77, 
-  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 77, 77, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 2464, 2464, 2464, 2464, 2464, 2464, 2464, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 2464, 
-  1085, 0, 0, 0, 0, 0, 0, 0, 
-  0, 2464, 0, 0, 2464, 2464, 2464, 2464, 
-  2464, 2464, 2464, 1085, 1085, 2464, 2464, 2464, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085, 
-  1085, 1085, 1085, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1085, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0, 
-  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 
-  1160, 1160, 1160, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 6350, 6351, 6352, 6353, 6354, 4271, 6355, 
-  6356, 6357, 6358, 4272, 6359, 6360, 6361, 4273, 
-  6362, 6363, 6364, 6365, 6366, 6367, 6368, 6369, 
-  6370, 6371, 6372, 6373, 4331, 6374, 6375, 6376, 
-  6377, 6378, 6379, 6380, 6381, 6382, 4336, 4274, 
-  4275, 4337, 6383, 6384, 4082, 6385, 4276, 6386, 
-  6387, 6388, 6389, 6389, 6389, 6390, 6391, 6392, 
-  6393, 6394, 6395, 6396, 6397, 6398, 6399, 6400, 
-  6401, 6402, 6403, 6404, 6405, 6406, 6407, 6407, 
-  4339, 6408, 6409, 6410, 6411, 4278, 6412, 6413, 
-  6414, 4235, 6415, 6416, 6417, 6418, 6419, 6420, 
-  6421, 6422, 6423, 6424, 6425, 6426, 6427, 6428, 
-  6429, 6430, 6431, 6432, 6433, 6434, 6435, 6436, 
-  6437, 6438, 6439, 6440, 6440, 6441, 6442, 6443, 
-  4078, 6444, 6445, 6446, 6447, 6448, 6449, 6450, 
-  6451, 4283, 6452, 6453, 6454, 6455, 6456, 6457, 
-  6458, 6459, 6460, 6461, 6462, 6463, 6464, 6465, 
-  6466, 6467, 6468, 6469, 6470, 6471, 6472, 4024, 
-  6473, 6474, 6475, 6475, 6476, 6477, 6477, 6478, 
-  6479, 6480, 6481, 6482, 6483, 6484, 6485, 6486, 
-  6487, 6488, 6489, 6490, 4284, 6491, 6492, 6493, 
-  6494, 4351, 6494, 6495, 4286, 6496, 6497, 6498, 
-  6499, 4287, 3997, 6500, 6501, 6502, 6503, 6504, 
-  6505, 6506, 6507, 6508, 6509, 6510, 6511, 6512, 
-  6513, 6514, 6515, 6516, 6517, 6518, 6519, 6520, 
-  6521, 4288, 6522, 6523, 6524, 6525, 6526, 6527, 
-  4290, 6528, 6529, 6530, 6531, 6532, 6533, 6534, 
-  6535, 4025, 4359, 6536, 6537, 6538, 6539, 6540, 
-  6541, 6542, 6543, 4291, 6544, 6545, 6546, 6547, 
-  4402, 6548, 6549, 6550, 6551, 6552, 6553, 6554, 
-  6555, 6556, 6557, 6558, 6559, 6560, 4095, 6561, 
-  6562, 6563, 6564, 6565, 6566, 6567, 6568, 6569, 
-  6570, 6571, 4292, 4182, 6572, 6573, 6574, 6575, 
-  6576, 6577, 6578, 6579, 4363, 6580, 6581, 6582, 
-  6583, 6584, 6585, 6586, 6587, 4364, 6588, 6589, 
-  6590, 6591, 6592, 6593, 6594, 6595, 6596, 6597, 
-  6598, 6599, 4366, 6600, 6601, 6602, 6603, 6604, 
-  6605, 6606, 6607, 6608, 6609, 6610, 6610, 6611, 
-  6612, 4368, 6613, 6614, 6615, 6616, 6617, 6618, 
-  6619, 4081, 6620, 6621, 6622, 6623, 6624, 6625, 
-  6626, 4374, 6627, 6628, 6629, 6630, 6631, 6632, 
-  6632, 4375, 4404, 6633, 6634, 6635, 6636, 6637, 
-  4043, 4377, 6638, 6639, 4303, 6640, 6641, 4257, 
-  6642, 6643, 4307, 6644, 6645, 6646, 6647, 6647, 
-  6648, 6649, 6650, 6651, 6652, 6653, 6654, 6655, 
-  6656, 6657, 6658, 6659, 6660, 6661, 6662, 6663, 
-  6664, 6665, 6666, 6667, 6668, 6669, 6670, 6671, 
-  6672, 6673, 6674, 4313, 6675, 6676, 6677, 6678, 
-  6679, 6680, 6681, 6682, 6683, 6684, 6685, 6686, 
-  6687, 6688, 6689, 6690, 6476, 6691, 6692, 6693, 
-  6694, 6695, 6696, 6697, 6698, 6699, 6700, 6701, 
-  6702, 4099, 6703, 6704, 6705, 6706, 6707, 6708, 
-  4316, 6709, 6710, 6711, 6712, 6713, 6714, 6715, 
-  6716, 6717, 6718, 6719, 6720, 6721, 6722, 6723, 
-  6724, 6725, 6726, 6727, 6728, 4038, 6729, 6730, 
-  6731, 6732, 6733, 6734, 4384, 6735, 6736, 6737, 
-  6738, 6739, 6740, 6741, 6742, 6743, 6744, 6745, 
-  6746, 6747, 6748, 6749, 6750, 6751, 6752, 6753, 
-  6754, 4389, 4390, 6755, 6756, 6757, 6758, 6759, 
-  6760, 6761, 6762, 6763, 6764, 6765, 6766, 6767, 
-  4391, 6768, 6769, 6770, 6771, 6772, 6773, 6774, 
-  6775, 6776, 6777, 6778, 6779, 6780, 6781, 6782, 
-  6783, 6784, 6785, 6786, 6787, 6788, 6789, 6790, 
-  6791, 6792, 6793, 6794, 6795, 6796, 6797, 4397, 
-  4397, 6798, 6799, 6800, 6801, 6802, 6803, 6804, 
-  6805, 6806, 6807, 4398, 6808, 6809, 6810, 6811, 
-  6812, 6813, 6814, 6815, 6816, 6817, 6818, 6819, 
-  6820, 6821, 6822, 6823, 6824, 6825, 6826, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 81, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 
-  2053, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 574, 574, 574, 574, 574, 574, 574, 
-  574, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 
-  3984, 3984, 3984, 3984, 3984, 3984, 3984, 0, 
+  1, 2, 2, 2, 2, 2, 2,
+  2, 2, 3, 4, 3, 5, 6, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 7, 7, 7,
+  3, 8, 9, 9, 10, 11, 10, 9,
+  9, 12, 13, 9, 14, 15, 16, 15,
+  15, 17, 17, 17, 17, 17, 17, 17,
+  17, 17, 17, 15, 9, 18, 19, 20,
+  9, 9, 21, 22, 23, 24, 25, 26,
+  27, 28, 29, 30, 31, 32, 33, 34,
+  35, 36, 37, 38, 39, 40, 41, 42,
+  43, 44, 45, 46, 12, 9, 13, 47,
+  48, 47, 49, 50, 51, 52, 53, 54,
+  55, 56, 57, 58, 59, 60, 61, 62,
+  63, 64, 65, 66, 67, 68, 69, 70,
+  71, 72, 73, 74, 12, 75, 13, 75,
+  2, 2, 2, 2, 2, 2, 7, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 76, 9, 11, 11, 11, 11, 77,
+  9, 78, 77, 79, 80, 75, 81, 77,
+  82, 83, 84, 85, 86, 87, 88, 9,
+  9, 89, 90, 91, 92, 93, 94, 95,
+  9, 96, 97, 98, 99, 100, 101, 102,
+  103, 104, 105, 106, 107, 108, 109, 110,
+  111, 112, 113, 114, 115, 116, 117, 118,
+  75, 119, 120, 121, 122, 123, 124, 125,
+  126, 127, 128, 129, 130, 131, 132, 133,
+  134, 135, 136, 137, 138, 139, 140, 141,
+  142, 143, 144, 145, 146, 147, 148, 149,
+  75, 150, 151, 152, 153, 154, 155, 156,
+  157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172,
+  173, 174, 175, 176, 177, 178, 179, 180,
+  181, 182, 183, 184, 185, 186, 187, 188,
+  189, 190, 191, 192, 193, 194, 195, 196,
+  197, 198, 199, 200, 201, 202, 203, 204,
+  205, 206, 207, 208, 209, 210, 211, 212,
+  213, 214, 215, 216, 217, 218, 219, 220,
+  221, 222, 223, 224, 225, 226, 227, 228,
+  229, 230, 231, 232, 233, 234, 235, 236,
+  237, 238, 239, 240, 241, 242, 243, 244,
+  245, 246, 247, 248, 249, 250, 251, 252,
+  253, 254, 255, 256, 257, 258, 259, 260,
+  261, 262, 263, 264, 265, 266, 267, 268,
+  269, 270, 271, 272, 273, 274, 275, 276,
+  277, 278, 279, 280, 281, 282, 283, 284,
+  285, 286, 287, 288, 289, 290, 291, 292,
+  293, 294, 295, 296, 297, 298, 214, 299,
+  300, 301, 302, 303, 304, 305, 306, 307,
+  308, 309, 310, 311, 214, 312, 313, 314,
+  315, 316, 317, 318, 319, 320, 321, 322,
+  323, 324, 325, 214, 214, 326, 327, 328,
+  329, 330, 331, 332, 333, 334, 335, 336,
+  337, 338, 339, 214, 340, 341, 342, 214,
+  343, 340, 340, 340, 340, 344, 345, 346,
+  347, 348, 349, 350, 351, 352, 353, 354,
+  355, 356, 357, 358, 359, 360, 361, 362,
+  363, 364, 365, 366, 367, 368, 369, 370,
+  371, 372, 373, 374, 375, 376, 377, 378,
+  379, 380, 381, 382, 383, 384, 385, 386,
+  387, 388, 389, 390, 391, 392, 393, 394,
+  395, 396, 397, 398, 399, 400, 401, 402,
+  403, 404, 405, 406, 407, 408, 409, 410,
+  411, 412, 413, 414, 415, 416, 417, 418,
+  419, 420, 421, 422, 423, 424, 425, 426,
+  427, 428, 429, 430, 431, 432, 433, 434,
+  435, 436, 214, 437, 438, 439, 440, 441,
+  442, 443, 444, 445, 446, 447, 448, 449,
+  450, 451, 452, 453, 454, 214, 214, 214,
+  214, 214, 214, 455, 456, 457, 458, 459,
+  460, 461, 462, 463, 464, 465, 466, 467,
+  468, 469, 470, 471, 472, 473, 474, 475,
+  476, 477, 478, 479, 480, 481, 214, 482,
+  483, 214, 484, 214, 485, 486, 214, 214,
+  214, 487, 488, 214, 489, 214, 490, 491,
+  214, 492, 493, 494, 495, 496, 214, 214,
+  497, 214, 498, 499, 214, 214, 500, 214,
+  214, 214, 214, 214, 214, 214, 501, 214,
+  214, 502, 214, 214, 503, 214, 214, 214,
+  504, 505, 506, 507, 508, 509, 214, 214,
+  214, 214, 214, 510, 214, 340, 214, 214,
+  214, 214, 214, 214, 214, 214, 511, 512,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 513, 514, 515, 516, 517, 518, 519,
+  520, 521, 522, 522, 523, 523, 523, 523,
+  523, 523, 523, 47, 47, 47, 47, 522,
+  522, 522, 522, 522, 522, 522, 522, 522,
+  522, 523, 523, 47, 47, 47, 47, 47,
+  47, 524, 525, 526, 527, 528, 529, 47,
+  47, 530, 531, 532, 533, 534, 47, 47,
+  47, 47, 47, 47, 47, 522, 47, 523,
+  47, 47, 47, 47, 47, 47, 47, 47,
+  47, 47, 47, 47, 47, 47, 47, 47,
+  47, 535, 536, 537, 538, 539, 540, 541,
+  542, 543, 544, 545, 546, 547, 540, 540,
+  548, 540, 549, 540, 550, 551, 552, 553,
+  553, 553, 553, 552, 554, 553, 553, 553,
+  553, 553, 555, 555, 556, 557, 558, 559,
+  560, 561, 553, 553, 553, 553, 562, 563,
+  553, 564, 565, 553, 553, 566, 566, 566,
+  566, 567, 553, 553, 553, 553, 540, 540,
+  540, 568, 569, 570, 571, 572, 573, 540,
+  553, 553, 553, 540, 540, 540, 553, 553,
+  574, 540, 540, 540, 553, 553, 553, 553,
+  540, 552, 553, 553, 540, 575, 576, 576,
+  575, 576, 576, 575, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 577, 578, 579, 580, 581, 47, 582,
+  583, 0, 0, 584, 585, 586, 587, 588,
+  589, 0, 0, 0, 0, 87, 590, 591,
+  592, 593, 594, 595, 0, 596, 0, 597,
+  598, 599, 600, 601, 602, 603, 604, 605,
+  606, 607, 608, 609, 610, 611, 612, 613,
+  614, 615, 616, 0, 617, 618, 619, 620,
+  621, 622, 623, 624, 625, 626, 627, 628,
+  629, 630, 631, 632, 633, 634, 635, 636,
+  637, 638, 639, 640, 641, 642, 643, 644,
+  645, 646, 647, 648, 649, 650, 651, 652,
+  653, 654, 655, 656, 657, 658, 659, 660,
+  661, 662, 663, 664, 665, 666, 667, 668,
+  669, 670, 671, 672, 673, 674, 675, 676,
+  677, 678, 679, 680, 681, 682, 683, 684,
+  685, 686, 687, 688, 689, 690, 691, 692,
+  693, 694, 695, 696, 697, 698, 699, 75,
+  700, 701, 702, 703, 704, 214, 705, 706,
+  707, 708, 709, 710, 711, 712, 713, 714,
+  715, 716, 717, 718, 719, 720, 721, 722,
+  723, 724, 725, 726, 727, 728, 729, 730,
+  731, 732, 733, 734, 735, 736, 737, 738,
+  739, 740, 741, 742, 743, 744, 745, 746,
+  747, 748, 749, 750, 751, 752, 753, 754,
+  755, 756, 757, 758, 759, 760, 761, 762,
+  763, 764, 765, 766, 767, 768, 769, 770,
+  771, 772, 773, 774, 775, 776, 777, 778,
+  779, 780, 781, 782, 783, 784, 785, 786,
+  787, 788, 789, 790, 791, 792, 793, 794,
+  795, 796, 797, 798, 799, 800, 801, 802,
+  803, 804, 805, 806, 807, 808, 809, 810,
+  811, 812, 813, 814, 815, 816, 817, 818,
+  819, 820, 821, 822, 823, 824, 825, 826,
+  827, 828, 829, 830, 831, 832, 833, 834,
+  835, 836, 837, 838, 540, 540, 540, 540,
+  540, 839, 839, 840, 841, 842, 843, 844,
+  845, 846, 847, 848, 849, 850, 851, 852,
+  853, 854, 855, 856, 857, 858, 859, 860,
+  861, 862, 863, 864, 865, 866, 867, 868,
+  869, 870, 871, 872, 873, 874, 875, 876,
+  877, 878, 879, 880, 881, 882, 883, 884,
+  885, 886, 887, 888, 889, 890, 891, 892,
+  893, 894, 895, 896, 897, 898, 899, 900,
+  901, 902, 903, 904, 905, 906, 907, 908,
+  909, 910, 911, 912, 913, 914, 915, 916,
+  917, 918, 919, 920, 921, 922, 923, 924,
+  925, 926, 927, 928, 929, 930, 931, 932,
+  933, 934, 935, 936, 937, 938, 939, 940,
+  941, 942, 943, 944, 945, 946, 947, 948,
+  949, 950, 951, 952, 953, 954, 955, 956,
+  957, 958, 959, 960, 961, 962, 963, 964,
+  965, 966, 967, 968, 969, 970, 971, 972,
+  973, 974, 975, 976, 977, 978, 979, 980,
+  981, 982, 983, 984, 985, 986, 987, 988,
+  989, 990, 991, 992, 993, 994, 995, 996,
+  997, 998, 999, 1000, 1001, 1002, 1003, 1004,
+  1005, 0, 1006, 1007, 1008, 1009, 1010, 1011,
+  1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019,
+  1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
+  1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035,
+  1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043,
+  0, 0, 523, 1044, 1044, 1044, 1044, 1044,
+  1044, 0, 1045, 1046, 1047, 1048, 1049, 1050,
+  1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058,
+  1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066,
+  1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074,
+  1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082,
+  1083, 0, 1044, 1084, 0, 0, 1085, 1085,
+  11, 0, 553, 540, 540, 540, 540, 553,
+  540, 540, 540, 1086, 553, 540, 540, 540,
+  540, 540, 540, 553, 553, 553, 553, 553,
+  553, 540, 540, 553, 540, 540, 1086, 1087,
+  540, 1088, 1089, 1090, 1091, 1092, 1093, 1094,
+  1095, 1096, 1097, 1097, 1098, 1099, 1100, 1101,
+  1102, 1103, 1104, 1105, 1103, 540, 553, 1103,
+  1096, 0, 0, 0, 0, 0, 0, 0,
+  0, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 0, 0, 0, 0,
+  0, 1106, 1106, 1106, 1103, 1103, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1107, 1108, 1108, 1108, 1107, 1107, 1109,
+  1109, 1110, 10, 10, 1111, 15, 1112, 1085,
+  1085, 540, 540, 540, 540, 540, 540, 540,
+  540, 1113, 1114, 1115, 1112, 1116, 0, 1117,
+  1112, 1118, 1118, 1119, 1120, 1121, 1122, 1123,
+  1124, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1125, 1118, 1118, 1118, 1118, 1118, 1118,
+  1126, 1127, 1118, 1128, 1129, 1130, 1131, 1113,
+  1114, 1115, 1132, 1133, 1134, 1135, 1136, 553,
+  540, 540, 540, 540, 540, 553, 540, 540,
+  553, 1137, 1137, 1137, 1137, 1137, 1137, 1137,
+  1137, 1137, 1137, 10, 1138, 1138, 1112, 1118,
+  1118, 1139, 1118, 1118, 1118, 1118, 1140, 1141,
+  1142, 1143, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1126, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1144, 1145, 1146, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1147, 1148, 1112, 1149, 540,
+  540, 540, 540, 540, 540, 540, 1108, 1085,
+  540, 540, 540, 540, 553, 540, 1125, 1125,
+  540, 540, 1085, 553, 540, 540, 553, 1118,
+  1118, 17, 17, 17, 17, 17, 17, 17,
+  17, 17, 17, 1118, 1118, 1118, 1150, 1150,
+  1126, 1117, 1117, 1117, 1117, 1117, 1117, 1117,
+  1117, 1117, 1117, 1117, 1117, 1117, 1117, 0,
+  1151, 1126, 1152, 1126, 1126, 1126, 1126, 1126,
+  1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
+  1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
+  1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
+  1126, 540, 553, 540, 540, 553, 540, 540,
+  553, 553, 553, 540, 553, 553, 540, 553,
+  540, 540, 540, 553, 540, 553, 540, 553,
+  540, 553, 540, 540, 0, 0, 1126, 1126,
+  1126, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1126, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1126, 1126,
+  1126, 1118, 1118, 1118, 1118, 1118, 1118, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1118, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1154, 1154, 1154, 1154, 1154, 1154, 1154,
+  1154, 1154, 1154, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 540, 540, 540, 540,
+  540, 540, 540, 553, 540, 1155, 1155, 77,
+  9, 9, 9, 1155, 0, 0, 0, 0,
+  0, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 540,
+  540, 540, 540, 1157, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 1157, 540, 540,
+  540, 1157, 540, 540, 540, 540, 540, 0,
+  0, 1158, 1158, 1158, 1158, 1158, 1158, 1158,
+  1158, 1158, 1158, 1158, 1158, 1158, 1158, 1158,
+  0, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 553, 553, 553, 0, 0, 1158,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 0, 1118,
+  1118, 1118, 1118, 1118, 1118, 1118, 1118, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 1107, 553, 540, 540, 553,
+  540, 540, 553, 540, 540, 540, 553, 553,
+  553, 1129, 1130, 1131, 540, 540, 540, 553,
+  540, 540, 553, 553, 540, 540, 540, 540,
+  540, 1153, 1153, 1153, 1159, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1161, 1162, 1160, 1160, 1160, 1160, 1160,
+  1160, 1163, 1164, 1160, 1165, 1166, 1160, 1160,
+  1160, 1160, 1160, 1153, 1159, 1167, 1160, 1159,
+  1159, 1159, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1159, 1159, 1159, 1159, 1168, 1159,
+  1159, 1160, 540, 553, 540, 540, 1153, 1153,
+  1153, 1169, 1170, 1171, 1172, 1173, 1174, 1175,
+  1176, 1160, 1160, 1153, 1153, 1177, 1177, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1177, 1179, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1153, 1159, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 0,
+  1160, 1160, 0, 0, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 0, 0, 0, 1160,
+  1160, 1160, 1160, 0, 0, 1180, 1160, 1181,
+  1159, 1159, 1153, 1153, 1153, 1153, 0, 0,
+  1182, 1159, 0, 0, 1183, 1184, 1168, 1160,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  1185, 0, 0, 0, 0, 1186, 1187, 0,
+  1188, 1160, 1160, 1153, 1153, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1160, 1160, 1189, 1189, 1190, 1190, 1190,
+  1190, 1190, 1190, 1191, 1189, 0, 0, 0,
+  0, 0, 1153, 1153, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 0, 0, 0, 0,
+  1160, 1160, 0, 0, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1192, 0, 1160, 1193,
+  0, 1160, 1160, 0, 0, 1180, 0, 1159,
+  1159, 1159, 1153, 1153, 0, 0, 0, 0,
+  1153, 1153, 0, 0, 1153, 1153, 1168, 0,
+  0, 0, 1153, 0, 0, 0, 0, 0,
+  0, 0, 1194, 1195, 1196, 1160, 0, 1197,
+  0, 0, 0, 0, 0, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1153, 1153, 1160, 1160, 1160, 1153, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 1153, 1153, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0,
+  1160, 1160, 1160, 0, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 0, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 1180, 1160, 1159,
+  1159, 1159, 1153, 1153, 1153, 1153, 1153, 0,
+  1153, 1153, 1159, 0, 1159, 1159, 1168, 0,
+  0, 1160, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1153, 1153, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1177, 1189, 0, 0, 0, 0, 0,
+  0, 0, 1160, 0, 0, 0, 0, 0,
+  0, 0, 1153, 1159, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 0,
+  1160, 1160, 0, 0, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 0, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 1180, 1160, 1198,
+  1153, 1159, 1153, 1153, 1153, 1153, 0, 0,
+  1199, 1200, 0, 0, 1201, 1202, 1168, 0,
+  0, 0, 0, 0, 0, 0, 0, 1203,
+  1204, 0, 0, 0, 0, 1205, 1206, 0,
+  1160, 1160, 1160, 1153, 1153, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1191, 1160, 1190, 1190, 1190, 1190, 1190,
+  1190, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 1153, 1160, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 0, 0, 0, 1160,
+  1160, 1160, 0, 1207, 1160, 1208, 1160, 0,
+  0, 0, 1160, 1160, 0, 1160, 0, 1160,
+  1160, 0, 0, 0, 1160, 1160, 0, 0,
+  0, 1160, 1160, 1160, 0, 0, 0, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 0, 0, 1209,
+  1159, 1153, 1159, 1159, 0, 0, 0, 1210,
+  1211, 1159, 0, 1212, 1213, 1214, 1168, 0,
+  0, 1160, 0, 0, 0, 0, 0, 0,
+  1215, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1190, 1190, 1190, 1085, 1085, 1085, 1085,
+  1085, 1085, 1189, 1085, 0, 0, 0, 0,
+  0, 1153, 1159, 1159, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 0, 1160, 1153,
+  1153, 1153, 1159, 1159, 1159, 1159, 0, 1216,
+  1153, 1217, 0, 1153, 1153, 1153, 1168, 0,
+  0, 0, 0, 0, 0, 0, 1218, 1219,
+  0, 1160, 1160, 1160, 0, 0, 0, 0,
+  0, 1160, 1160, 1153, 1153, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 0, 0, 0, 0, 0, 0, 0,
+  0, 1220, 1220, 1220, 1220, 1220, 1220, 1220,
+  1191, 1160, 1153, 1159, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 0, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 1180, 1160, 1159,
+  1221, 1222, 1159, 1223, 1159, 1159, 0, 1224,
+  1225, 1226, 0, 1227, 1228, 1153, 1168, 0,
+  0, 0, 0, 0, 0, 0, 1229, 1230,
+  0, 0, 0, 0, 0, 0, 0, 1160,
+  0, 1160, 1160, 1153, 1153, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 0, 1160, 1160, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 1153, 1159, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 0, 0, 1160, 1231,
+  1159, 1159, 1153, 1153, 1153, 1153, 0, 1232,
+  1233, 1159, 0, 1234, 1235, 1236, 1168, 1237,
+  1191, 0, 0, 0, 0, 1160, 1160, 1160,
+  1238, 1190, 1190, 1190, 1190, 1190, 1190, 1190,
+  1160, 1160, 1160, 1153, 1153, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1190, 1190, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1191, 1160, 1160, 1160, 1160, 1160,
+  1160, 0, 0, 1159, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 0, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 0, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 0, 1160, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 0, 0, 1239, 0, 0, 0, 0,
+  1240, 1159, 1159, 1153, 1153, 1153, 0, 1153,
+  0, 1159, 1241, 1242, 1159, 1243, 1244, 1245,
+  1246, 0, 0, 0, 0, 0, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 0, 0, 1159, 1159, 1177, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 1153, 340, 1247, 1153, 1153, 1153,
+  1153, 1248, 1248, 1168, 0, 0, 0, 0,
+  11, 340, 340, 340, 340, 340, 340, 523,
+  1153, 1249, 1249, 1249, 1249, 1153, 1153, 1153,
+  1044, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1250, 1044, 1044, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 340, 340, 0, 340, 0, 0,
+  340, 340, 0, 340, 0, 0, 340, 0,
+  0, 0, 0, 0, 0, 340, 340, 340,
+  340, 0, 340, 340, 340, 340, 340, 340,
+  340, 0, 340, 340, 340, 0, 340, 0,
+  340, 0, 0, 340, 340, 0, 340, 340,
+  340, 340, 1153, 340, 1251, 1153, 1153, 1153,
+  1153, 1252, 1252, 0, 1153, 1153, 340, 0,
+  0, 340, 340, 340, 340, 340, 0, 523,
+  0, 1253, 1253, 1253, 1253, 1153, 1153, 0,
+  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1250, 0, 0, 1254, 1255, 340,
+  340, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1191, 1191, 1191, 1177, 1177, 1177,
+  1177, 1177, 1177, 1177, 1177, 1256, 1177, 1177,
+  1177, 1177, 1177, 1177, 1191, 1177, 1191, 1191,
+  1191, 553, 553, 1191, 1191, 1191, 1191, 1191,
+  1191, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1190, 1190, 1190, 1191, 553, 1191,
+  553, 1191, 1257, 1258, 1259, 1258, 1259, 1159,
+  1159, 1160, 1160, 1160, 1260, 1160, 1160, 1160,
+  1160, 0, 1160, 1160, 1160, 1160, 1261, 1160,
+  1160, 1160, 1160, 1262, 1160, 1160, 1160, 1160,
+  1263, 1160, 1160, 1160, 1160, 1264, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1265, 1160, 1160, 1160, 0, 0,
+  0, 0, 1266, 1267, 1268, 1269, 1270, 1271,
+  1272, 1273, 1274, 1267, 1267, 1267, 1267, 1153,
+  1159, 1267, 1275, 540, 540, 1168, 1177, 540,
+  540, 1160, 1160, 1160, 1160, 1160, 1153, 1153,
+  1153, 1153, 1153, 1153, 1276, 1153, 1153, 1153,
+  1153, 0, 1153, 1153, 1153, 1153, 1277, 1153,
+  1153, 1153, 1153, 1278, 1153, 1153, 1153, 1153,
+  1279, 1153, 1153, 1153, 1153, 1280, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1281, 1153, 1153, 1153, 0, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 553,
+  1191, 1191, 1191, 1191, 1191, 1191, 0, 1191,
+  1191, 1177, 1177, 1177, 1177, 1177, 1191, 1191,
+  1191, 1191, 1177, 1177, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 340, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 340, 1160, 1160, 1160, 1160, 1282, 1283,
+  1160, 1160, 1160, 1160, 1284, 1284, 1153, 1285,
+  1153, 1153, 1159, 1153, 1153, 1153, 1153, 1153,
+  1180, 1284, 1168, 1168, 1159, 1159, 1153, 1153,
+  1160, 1178, 1178, 1250, 1250, 1178, 1178, 1178,
+  1178, 1178, 1178, 1044, 1044, 1044, 1177, 1177,
+  1177, 1160, 1160, 1160, 1160, 340, 1160, 1159,
+  1159, 1153, 1153, 1160, 1160, 1160, 1160, 1153,
+  1153, 1153, 1160, 1284, 1284, 1284, 1160, 1160,
+  1284, 1284, 1284, 1284, 1284, 1284, 1284, 1160,
+  1160, 1160, 1153, 1153, 1153, 1153, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1153, 1284, 1159, 1153, 1153,
+  1284, 1284, 1284, 1284, 1284, 1284, 553, 1160,
+  1284, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1284, 1284, 1284, 1153, 1191,
+  1191, 1286, 1287, 1288, 1289, 1290, 1291, 1292,
+  1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300,
+  1301, 1302, 1303, 1304, 1305, 1306, 1307, 1308,
+  1309, 1310, 1311, 1312, 1313, 1314, 1315, 1316,
+  1317, 1318, 1319, 1320, 1321, 1322, 1323, 0,
+  1324, 0, 0, 0, 0, 0, 1325, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 1044, 1326, 340, 340,
+  340, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1328, 1329, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 0, 1160, 1160, 1160, 1160, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 0, 1160, 1160, 1160, 1160, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 340, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 0, 0, 540, 540,
+  540, 1177, 1044, 1177, 1177, 1177, 1177, 1177,
+  1177, 1177, 1190, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1190, 1190, 1190, 1190, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 77, 77, 77, 77, 77, 1085, 77,
+  1085, 1085, 77, 0, 0, 0, 0, 0,
+  0, 1332, 1333, 1334, 1335, 1336, 1337, 1338,
+  1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346,
+  1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354,
+  1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362,
+  1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370,
+  1371, 1372, 1373, 1374, 1375, 1376, 1377, 1378,
+  1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386,
+  1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394,
+  1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402,
+  1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410,
+  1411, 1412, 1413, 1414, 1415, 1416, 1417, 0,
+  0, 1418, 1419, 1420, 1421, 1422, 1423, 0,
+  0, 1424, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 340, 340, 340, 340,
+  340, 340, 340, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 340, 340, 340, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 340,
+  1160, 1160, 1160, 1160, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 340, 340, 340, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 1160, 1160, 1160, 1160, 1160,
+  1160, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 340, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 340, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 340, 340, 340, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 340,
+  340, 340, 340, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 340, 340, 340, 1160, 1160, 1160, 1160,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 340,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 340, 340, 340, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 340,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 340, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1177, 1044,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 1425, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1258, 1259, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 1160, 340, 1160, 340, 340, 340, 340,
+  340, 340, 340, 340, 1044, 1044, 1044, 1426,
+  1426, 1426, 340, 340, 340, 340, 340, 340,
+  340, 340, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160,
+  1160, 1160, 1160, 1153, 1153, 1168, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1153, 1153, 1168, 1177, 1177,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1153, 1153, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 340, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 1160,
+  1160, 1160, 0, 1153, 1153, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 574, 574, 1159,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1159,
+  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1153,
+  1159, 1159, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1168, 1153, 1177, 1177, 1044,
+  1179, 1177, 1177, 1177, 1189, 340, 540, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
+  1427, 1427, 1427, 0, 0, 0, 0, 0,
+  0, 1428, 1428, 1428, 1428, 1428, 1428, 1424,
+  1428, 1428, 1428, 1428, 574, 574, 574, 81,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1179, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1153, 1153,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1087, 1160, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 340, 340, 340,
+  1160, 340, 1160, 340, 1160, 1160, 1160, 340,
+  340, 1160, 1160, 1160, 340, 340, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 340, 1160, 340, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 340, 340, 340, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1153, 1153, 1153, 1159, 1159, 1159, 1159,
+  1153, 1153, 1159, 1159, 1159, 0, 0, 0,
+  0, 1159, 1159, 1153, 1159, 1159, 1159, 1159,
+  1159, 1159, 1086, 540, 553, 0, 0, 0,
+  0, 1085, 0, 0, 0, 1428, 1428, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 0,
+  0, 340, 340, 340, 340, 340, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1190, 0, 0, 0, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  540, 553, 1159, 1159, 1153, 0, 0, 1177,
+  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1159, 1153,
+  1159, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  0, 1168, 1284, 1153, 1284, 1284, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1159, 1159,
+  1159, 1159, 1159, 1159, 1153, 1153, 540, 540,
+  540, 540, 540, 540, 540, 540, 0, 0,
+  553, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 1177, 1177, 1177, 1177, 1177, 1177, 1177,
+  1179, 1177, 1177, 1177, 1177, 1177, 1177, 0,
+  0, 540, 540, 540, 540, 540, 553, 553,
+  553, 553, 553, 553, 540, 540, 553, 839,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1153, 1153, 1153, 1153, 1159, 1429, 1430,
+  1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438,
+  1160, 1160, 1439, 1440, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1180, 1441, 1153,
+  1153, 1153, 1153, 1442, 1443, 1444, 1445, 1446,
+  1447, 1448, 1449, 1450, 1451, 1452, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1177, 1177, 1177, 1177, 1177,
+  1177, 1177, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 540, 553, 540, 540,
+  540, 540, 540, 540, 540, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 0, 0,
+  0, 1153, 1153, 1159, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1159, 1153, 1153, 1153, 1153, 1159,
+  1159, 1153, 1153, 1452, 1168, 1153, 1153, 1160,
+  1160, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1180,
+  1159, 1153, 1153, 1159, 1159, 1159, 1153, 1159,
+  1153, 1153, 1153, 1452, 1452, 0, 0, 0,
+  0, 0, 0, 0, 0, 1177, 1177, 1177,
+  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1159, 1159, 1159,
+  1159, 1159, 1159, 1159, 1159, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1159, 1159, 1153,
+  1180, 0, 0, 0, 1177, 1177, 1177, 1177,
+  1177, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 1160, 1160,
+  1160, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1250, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 523, 523, 523, 523, 523, 523, 1044,
+  1044, 1453, 1454, 1455, 1456, 1457, 1457, 1458,
+  1459, 1460, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1177, 1177, 1177, 1177, 1177, 1177, 1177,
+  1177, 0, 0, 0, 0, 0, 0, 0,
+  0, 540, 540, 540, 1177, 566, 553, 553,
+  553, 553, 553, 540, 540, 553, 553, 553,
+  553, 540, 1159, 566, 566, 566, 566, 566,
+  566, 566, 1160, 1160, 1160, 1160, 553, 1160,
+  1160, 1160, 1160, 1159, 1159, 540, 1160, 1160,
+  0, 540, 540, 0, 0, 0, 0, 0,
+  0, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 1461, 1462, 1463,
+  523, 1464, 1465, 1466, 1467, 1468, 1469, 1470,
+  1471, 1472, 1473, 1474, 523, 1475, 1476, 1477,
+  1478, 1479, 1480, 1481, 1482, 1483, 1484, 1485,
+  1486, 1487, 1488, 1489, 1490, 1491, 1492, 523,
+  1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500,
+  1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508,
+  1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516,
+  1517, 1518, 1519, 1520, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 1521, 1522, 1523, 214, 214, 1524, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 1523, 214,
+  214, 214, 214, 214, 1525, 1526, 1527, 1528,
+  1491, 1529, 1530, 1531, 1532, 1533, 1534, 1535,
+  1536, 1537, 1538, 1539, 1540, 1541, 1542, 1543,
+  1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551,
+  1552, 1553, 1554, 1555, 1556, 1557, 1558, 1559,
+  1560, 540, 540, 553, 540, 540, 540, 540,
+  540, 540, 540, 553, 540, 540, 576, 1561,
+  553, 555, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 0,
+  0, 0, 0, 0, 540, 575, 553, 540,
+  553, 1562, 1563, 1564, 1565, 1566, 1567, 1568,
+  1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576,
+  1577, 1578, 1579, 1580, 1581, 1582, 1583, 1584,
+  1585, 1586, 1587, 1588, 1589, 1590, 1591, 1592,
+  1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600,
+  1601, 1602, 1603, 1604, 1605, 1606, 1607, 1608,
+  1609, 1610, 1611, 1612, 1613, 1614, 1615, 1616,
+  1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624,
+  1625, 1626, 1627, 1628, 1629, 1630, 1631, 1632,
+  1633, 1634, 1635, 1636, 1637, 1638, 1639, 1640,
+  1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648,
+  1649, 1650, 1651, 1652, 1653, 1654, 1655, 1656,
+  1657, 1658, 1659, 1660, 1661, 1662, 1663, 1664,
+  1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672,
+  1673, 1674, 1675, 1676, 1677, 1678, 1679, 1680,
+  1681, 1682, 1683, 1684, 1685, 1686, 1687, 1688,
+  1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696,
+  1697, 1698, 1699, 1700, 1701, 1702, 1703, 1704,
+  1705, 1706, 1707, 1708, 1709, 1710, 1711, 1712,
+  1713, 1714, 1715, 1716, 1717, 214, 214, 1718,
+  214, 1719, 1720, 1721, 1722, 1723, 1724, 1725,
+  1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733,
+  1734, 1735, 1736, 1737, 1738, 1739, 1740, 1741,
+  1742, 1743, 1744, 1745, 1746, 1747, 1748, 1749,
+  1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757,
+  1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765,
+  1766, 1767, 1768, 1769, 1770, 1771, 1772, 1773,
+  1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781,
+  1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789,
+  1790, 1791, 1792, 1793, 1794, 1795, 1796, 1797,
+  1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805,
+  1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813,
+  1814, 1815, 1816, 1817, 1818, 1819, 1820, 1821,
+  1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829,
+  1830, 1831, 1832, 1833, 1834, 1835, 1836, 0,
+  0, 1837, 1838, 1839, 1840, 1841, 1842, 0,
+  0, 1843, 1844, 1845, 1846, 1847, 1848, 1849,
+  1850, 1851, 1852, 1853, 1854, 1855, 1856, 1857,
+  1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865,
+  1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873,
+  1874, 1875, 1876, 1877, 1878, 1879, 1880, 0,
+  0, 1881, 1882, 1883, 1884, 1885, 1886, 0,
+  0, 1887, 1888, 1889, 1890, 1891, 1892, 1893,
+  1894, 0, 1895, 0, 1896, 0, 1897, 0,
+  1898, 1899, 1900, 1901, 1902, 1903, 1904, 1905,
+  1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913,
+  1914, 1915, 1916, 1917, 1918, 1919, 1920, 1921,
+  1922, 1923, 1924, 1925, 1926, 1927, 1928, 0,
+  0, 1929, 1930, 1931, 1932, 1933, 1934, 1935,
+  1936, 1937, 1938, 1939, 1940, 1941, 1942, 1943,
+  1944, 1945, 1946, 1947, 1948, 1949, 1950, 1951,
+  1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959,
+  1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967,
+  1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975,
+  1976, 1977, 1978, 1979, 1980, 1981, 0, 1982,
+  1983, 1984, 1985, 1986, 1987, 1988, 1989, 1990,
+  1991, 1992, 1993, 1994, 1995, 1996, 0, 1997,
+  1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010, 0, 0, 2011,
+  2012, 2013, 2014, 2015, 2016, 0, 2017, 2018,
+  2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026,
+  2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034,
+  2035, 0, 0, 2036, 2037, 2038, 0, 2039,
+  2040, 2041, 2042, 2043, 2044, 2045, 2046, 2047,
+  0, 2048, 2049, 2050, 2051, 2050, 2050, 2050,
+  2052, 2050, 2050, 2050, 81, 2053, 2054, 2055,
+  2056, 1084, 2057, 1084, 1084, 1084, 1084, 9,
+  2058, 2059, 2060, 2061, 2059, 2059, 2060, 2061,
+  2059, 9, 9, 9, 9, 2062, 2063, 2064,
+  9, 2065, 2066, 2067, 2068, 2069, 2070, 2071,
+  76, 10, 10, 10, 2072, 2073, 9, 2074,
+  2075, 9, 80, 92, 9, 2076, 9, 2077,
+  48, 48, 9, 9, 9, 2078, 12, 13,
+  2079, 2080, 2081, 9, 9, 9, 9, 9,
+  9, 9, 9, 75, 9, 48, 9, 9,
+  2082, 9, 9, 9, 9, 9, 9, 9,
+  2050, 81, 81, 81, 81, 81, 0, 2083,
+  2084, 2085, 2086, 81, 81, 81, 81, 81,
+  81, 2087, 2088, 0, 0, 2089, 2090, 2091,
+  2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099,
+  2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107,
+  2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115,
+  0, 2116, 2117, 2118, 2119, 2120, 2121, 2122,
+  2123, 2124, 2125, 2126, 2127, 2128, 0, 0,
+  0, 11, 11, 11, 11, 11, 11, 11,
+  11, 2129, 11, 11, 11, 11, 11, 11,
+  11, 11, 11, 11, 11, 11, 11, 11,
+  11, 11, 1189, 11, 11, 11, 11, 11,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 540, 540, 566, 566, 540, 540, 540,
+  540, 566, 566, 566, 540, 540, 839, 839,
+  839, 839, 540, 839, 839, 839, 566, 566,
+  540, 553, 540, 566, 566, 553, 553, 553,
+  553, 540, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 2130, 2131, 2132, 2133, 77, 2134, 2135,
+  2136, 77, 2137, 2138, 2139, 2139, 2139, 2140,
+  2141, 2142, 2142, 2143, 2144, 77, 2145, 2146,
+  77, 75, 2147, 2148, 2149, 2149, 2149, 77,
+  77, 2150, 2151, 2152, 77, 2153, 77, 2154,
+  77, 2153, 77, 2155, 2156, 2157, 2132, 83,
+  2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165,
+  2166, 2167, 2168, 1085, 2169, 2170, 2171, 2172,
+  2173, 2174, 75, 75, 75, 75, 2175, 2176,
+  2158, 2168, 2177, 77, 75, 1085, 77, 2178,
+  1191, 2179, 2180, 2181, 2182, 2183, 2184, 2185,
+  2186, 2187, 2188, 2189, 2190, 2191, 2192, 2193,
+  2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201,
+  2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209,
+  2210, 2211, 2212, 2213, 2214, 2215, 2216, 2217,
+  2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225,
+  2226, 1426, 1426, 2227, 2228, 2229, 1426, 1426,
+  1426, 2227, 2230, 77, 77, 0, 0, 0,
+  0, 2231, 75, 2232, 75, 2233, 77, 77,
+  77, 77, 77, 2234, 2235, 77, 77, 77,
+  77, 75, 77, 77, 75, 77, 77, 75,
+  77, 77, 77, 77, 77, 77, 77, 2236,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 2237, 2238,
+  2239, 2240, 77, 2241, 77, 2242, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 1109, 75, 75,
+  75, 75, 1109, 1109, 1109, 1109, 75, 75,
+  1109, 75, 2243, 2243, 2244, 2245, 75, 75,
+  75, 2246, 2247, 2243, 2248, 2249, 2243, 75,
+  75, 75, 2243, 14, 84, 75, 2243, 2243,
+  75, 75, 75, 2243, 2243, 2243, 2243, 75,
+  2243, 2243, 2243, 2243, 2250, 2251, 2252, 2253,
+  75, 75, 75, 75, 2243, 2254, 2255, 2243,
+  2256, 2257, 2243, 2243, 2243, 75, 75, 75,
+  75, 75, 2243, 75, 2243, 2258, 2243, 2243,
+  2243, 2243, 2259, 2243, 2260, 2261, 2262, 2243,
+  2263, 2264, 2265, 2243, 2243, 2243, 2266, 75,
+  75, 75, 75, 2243, 2243, 2243, 2243, 75,
+  75, 75, 75, 75, 75, 75, 75, 75,
+  2243, 2267, 2268, 2269, 75, 2270, 2271, 2243,
+  2243, 2243, 2243, 2243, 2243, 75, 2272, 2273,
+  2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281,
+  2282, 2283, 2284, 2285, 2286, 2287, 2288, 2243,
+  2243, 2289, 2290, 2291, 2292, 2293, 2294, 2295,
+  2296, 2297, 2298, 2243, 2243, 2243, 75, 75,
+  2243, 2243, 2299, 2300, 75, 75, 75, 75,
+  75, 2243, 75, 75, 75, 75, 75, 75,
+  75, 75, 75, 2301, 2243, 75, 75, 2243,
+  2243, 2302, 2303, 2243, 2304, 2305, 2306, 2307,
+  2308, 2243, 2243, 2309, 2310, 2311, 2312, 2243,
+  2243, 2243, 75, 75, 75, 75, 75, 2243,
+  2243, 75, 75, 75, 75, 75, 75, 75,
+  75, 75, 2243, 2243, 2243, 2243, 2243, 75,
+  75, 2243, 2243, 75, 75, 75, 75, 2243,
+  2243, 2243, 2243, 2243, 2243, 2243, 2243, 2243,
+  2243, 2313, 2314, 2315, 2316, 2243, 2243, 2243,
+  2243, 2243, 2243, 2317, 2318, 2319, 2320, 75,
+  75, 2243, 2243, 2321, 2321, 2243, 2321, 2321,
+  2243, 2243, 2321, 2321, 2321, 2243, 2321, 2243,
+  2321, 77, 77, 77, 77, 77, 77, 77,
+  77, 12, 13, 12, 13, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 1085, 1085, 77, 77, 77,
+  77, 2243, 2243, 77, 77, 77, 77, 77,
+  77, 77, 2322, 2323, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 1085, 1109, 1085, 1085,
+  77, 77, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 838, 77,
+  1085, 1085, 1085, 1085, 75, 75, 75, 75,
+  75, 75, 75, 75, 75, 75, 75, 75,
+  75, 75, 75, 75, 75, 75, 75, 75,
+  75, 75, 75, 1109, 1109, 1085, 1085, 1085,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 77, 77, 1085, 1085,
+  77, 77, 77, 77, 77, 1085, 1085, 1085,
+  1085, 1085, 1085, 77, 1085, 1109, 1109, 1109,
+  1109, 1109, 1109, 1085, 1085, 1085, 1085, 1085,
+  1085, 77, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 77, 77, 77, 77, 77,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 2324, 2325, 2326, 2327, 2328, 2329, 2330,
+  2331, 2332, 2333, 2334, 2335, 2336, 2337, 2338,
+  2339, 2340, 2341, 2342, 2343, 2344, 2345, 2346,
+  2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354,
+  2355, 2356, 2357, 2358, 2359, 2360, 2361, 2362,
+  2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370,
+  2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378,
+  2379, 2380, 2381, 2382, 2383, 2384, 2385, 2386,
+  2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394,
+  2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402,
+  2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410,
+  2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418,
+  2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426,
+  2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434,
+  2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442,
+  2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450,
+  2451, 2452, 2453, 2454, 2455, 2456, 2457, 2458,
+  2459, 2460, 2461, 2462, 1220, 1220, 1220, 1220,
+  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220,
+  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220,
+  1220, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  75, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 75, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 75, 75, 75, 75, 75, 1109, 1109,
+  75, 77, 77, 77, 1085, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 1085, 1085, 1085,
+  1085, 1085, 1085, 77, 77, 77, 2463, 77,
+  77, 77, 77, 1085, 1085, 1085, 77, 77,
+  77, 77, 77, 77, 1085, 1085, 77, 77,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  75, 77, 77, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 77, 77, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 77, 1085, 1085, 1085, 838, 1085, 1085,
+  1085, 1085, 1085, 77, 77, 77, 77, 1085,
+  77, 77, 77, 77, 77, 77, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 77, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 2464, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 2464, 2464, 2464, 2464, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 2465, 1085, 1085,
+  1085, 12, 13, 12, 13, 12, 13, 12,
+  13, 12, 13, 12, 13, 12, 13, 1220,
+  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220,
+  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220,
+  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220,
+  1220, 1220, 1220, 1220, 1220, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 2243, 1109, 75, 2321, 2321, 12, 13,
+  75, 2321, 2321, 75, 2321, 2321, 2321, 1109,
+  1109, 1109, 75, 1109, 2243, 2243, 2321, 2321,
+  1109, 1109, 1109, 1109, 1109, 2321, 2321, 2321,
+  1109, 75, 1109, 2321, 2321, 2321, 2321, 12,
+  13, 12, 13, 12, 13, 12, 13, 12,
+  13, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 75, 75, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 75, 75, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 75, 75, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 75, 1109, 1109, 75, 75, 1109,
+  75, 1109, 75, 1109, 1109, 75, 75, 1109,
+  1109, 75, 75, 1109, 1109, 75, 75, 1109,
+  1109, 75, 75, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 75, 75, 1109,
+  1109, 75, 1109, 75, 12, 13, 12, 13,
+  12, 13, 12, 13, 12, 13, 12, 13,
+  12, 13, 12, 13, 1258, 1259, 1258, 1259,
+  12, 13, 75, 1109, 2321, 2321, 2321, 2321,
+  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2243,
+  2243, 2321, 2321, 2321, 2321, 2321, 2321, 2321,
+  2321, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 2321, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 2321, 2321, 2321, 2321, 2321, 2321, 1109,
+  1109, 1109, 2321, 1109, 1109, 1109, 1109, 2321,
+  2321, 2321, 2243, 2243, 75, 2243, 2243, 75,
+  75, 12, 13, 1258, 1259, 2321, 1109, 1109,
+  1109, 1109, 2321, 1109, 2321, 2321, 2321, 1109,
+  1109, 2321, 2321, 1109, 75, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 2321, 2243, 2243,
+  2243, 2243, 2243, 75, 75, 12, 13, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 2321, 2321, 2466, 2321, 2321,
+  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321,
+  2321, 2321, 2321, 2321, 2321, 2321, 1109, 2243,
+  2243, 2321, 2243, 75, 75, 2243, 75, 2243,
+  1109, 75, 2243, 75, 2243, 2243, 2321, 2321,
+  75, 75, 75, 75, 1109, 2321, 2321, 1109,
+  1109, 1109, 1109, 1109, 1109, 2243, 2243, 2243,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 75,
+  75, 75, 75, 75, 75, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  2321, 2321, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 2321, 2321, 75,
+  75, 1109, 1109, 2243, 2243, 2243, 2243, 1109,
+  2243, 2243, 75, 75, 2243, 2467, 2468, 2469,
+  75, 1109, 2321, 2321, 2321, 2321, 2321, 2321,
+  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321,
+  2321, 2321, 2321, 2321, 2243, 2243, 2321, 2321,
+  2243, 2243, 2243, 2243, 2243, 2243, 2321, 2321,
+  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321,
+  2321, 2321, 2321, 2321, 2321, 1109, 1109, 2321,
+  2321, 2321, 2321, 2321, 2321, 2321, 2321, 1109,
+  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321,
+  2321, 2321, 2321, 2321, 2321, 2321, 2321, 2321,
+  2243, 2243, 2243, 2243, 2243, 2243, 2243, 2243,
+  2321, 2321, 2243, 2243, 2243, 2243, 2321, 2321,
+  2321, 2321, 2321, 2321, 2243, 2243, 2243, 2243,
+  1109, 1109, 1109, 1109, 1109, 2470, 2471, 2243,
+  1109, 1109, 1109, 2321, 2321, 2321, 2321, 2321,
+  1109, 1109, 1109, 1109, 1109, 2321, 2321, 2243,
+  75, 75, 75, 75, 2321, 1109, 1109, 75,
+  2321, 2321, 2321, 2321, 2321, 1109, 2321, 75,
+  75, 1085, 1085, 1085, 1085, 1085, 1085, 77,
+  77, 1085, 1085, 1085, 1085, 1085, 77, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 77, 77,
+  1085, 1085, 1085, 1085, 1085, 1085, 77, 77,
+  77, 77, 77, 77, 77, 1085, 1085, 77,
+  77, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+  1109, 1109, 1109, 1109, 1109, 1109, 1085, 1085,
+  1109, 1109, 1109, 1109, 1109, 1109, 1085, 77,
+  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 0, 0, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 0, 0, 0, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 0, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 1085, 1085, 1085,
+  1085, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 2472, 2473, 2474, 2475, 2476, 2477, 2478,
+  2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486,
+  2487, 2488, 2489, 2490, 2491, 2492, 2493, 2494,
+  2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502,
+  2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510,
+  2511, 2512, 2513, 2514, 2515, 2516, 2517, 2518,
+  0, 2519, 2520, 2521, 2522, 2523, 2524, 2525,
+  2526, 2527, 2528, 2529, 2530, 2531, 2532, 2533,
+  2534, 2535, 2536, 2537, 2538, 2539, 2540, 2541,
+  2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549,
+  2550, 2551, 2552, 2553, 2554, 2555, 2556, 2557,
+  2558, 2559, 2560, 2561, 2562, 2563, 2564, 2565,
+  0, 2566, 2567, 2568, 2569, 2570, 2571, 2572,
+  2573, 2574, 2575, 2576, 2577, 2578, 2579, 2580,
+  2581, 2582, 214, 2583, 2584, 214, 2585, 2586,
+  214, 214, 214, 214, 214, 2587, 2588, 2589,
+  2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597,
+  2598, 2599, 2600, 2601, 2602, 2603, 2604, 2605,
+  2606, 2607, 2608, 2609, 2610, 2611, 2612, 2613,
+  2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621,
+  2622, 2623, 2624, 2625, 2626, 2627, 2628, 2629,
+  2630, 2631, 2632, 2633, 2634, 2635, 2636, 2637,
+  2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645,
+  2646, 2647, 2648, 2649, 2650, 2651, 2652, 2653,
+  2654, 2655, 2656, 2657, 2658, 2659, 2660, 2661,
+  2662, 2663, 2664, 2665, 2666, 2667, 2668, 2669,
+  2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677,
+  2678, 2679, 2680, 2681, 2682, 2683, 2684, 2685,
+  2686, 2687, 2688, 2689, 2690, 214, 77, 77,
+  1085, 77, 77, 1085, 2691, 2692, 2693, 2694,
+  540, 540, 540, 2695, 2696, 0, 0, 0,
+  0, 0, 9, 9, 9, 9, 1427, 9,
+  9, 2697, 2698, 2699, 2700, 2701, 2702, 2703,
+  2704, 2705, 2706, 2707, 2708, 2709, 2710, 2711,
+  2712, 2713, 2714, 2715, 2716, 2717, 2718, 2719,
+  2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727,
+  2728, 2729, 2730, 2731, 2732, 2733, 2734, 0,
+  2735, 0, 0, 0, 0, 0, 2736, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 1160, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 0, 0, 0, 0, 0, 0, 0,
+  2737, 1044, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  1168, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 9, 9, 80, 92, 80, 92, 9,
+  9, 9, 80, 92, 9, 80, 92, 1428,
+  1428, 1428, 1428, 9, 1428, 1428, 1428, 9,
+  1084, 9, 9, 1084, 9, 80, 92, 9,
+  9, 80, 92, 12, 13, 12, 13, 12,
+  13, 12, 13, 9, 9, 9, 9, 9,
+  522, 9, 9, 9, 9, 9, 9, 9,
+  9, 9, 9, 1084, 1084, 9, 9, 9,
+  9, 1084, 9, 2061, 1428, 9, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 0, 1085, 1085, 1085, 1085,
+  2738, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 2739, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 2740, 2741, 2742, 2743, 2744, 2745, 2746,
+  2747, 2748, 2749, 2750, 2751, 2752, 2753, 2754,
+  2755, 2756, 2757, 2758, 2759, 2760, 2761, 2762,
+  2763, 2764, 2765, 2766, 2767, 2768, 2769, 2770,
+  2771, 2772, 2773, 2774, 2775, 2776, 2777, 2778,
+  2779, 2780, 2781, 2782, 2783, 2784, 2785, 2786,
+  2787, 2788, 2789, 2790, 2791, 2792, 2793, 2794,
+  2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802,
+  2803, 2804, 2805, 2806, 2807, 2808, 2809, 2810,
+  2811, 2812, 2813, 2814, 2815, 2816, 2817, 2818,
+  2819, 2820, 2821, 2822, 2823, 2824, 2825, 2826,
+  2827, 2828, 2829, 2830, 2831, 2832, 2833, 2834,
+  2835, 2836, 2837, 2838, 2839, 2840, 2841, 2842,
+  2843, 2844, 2845, 2846, 2847, 2848, 2849, 2850,
+  2851, 2852, 2853, 2854, 2855, 2856, 2857, 2858,
+  2859, 2860, 2861, 2862, 2863, 2864, 2865, 2866,
+  2867, 2868, 2869, 2870, 2871, 2872, 2873, 2874,
+  2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882,
+  2883, 2884, 2885, 2886, 2887, 2888, 2889, 2890,
+  2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898,
+  2899, 2900, 2901, 2902, 2903, 2904, 2905, 2906,
+  2907, 2908, 2909, 2910, 2911, 2912, 2913, 2914,
+  2915, 2916, 2917, 2918, 2919, 2920, 2921, 2922,
+  2923, 2924, 2925, 2926, 2927, 2928, 2929, 2930,
+  2931, 2932, 2933, 2934, 2935, 2936, 2937, 2938,
+  2939, 2940, 2941, 2942, 2943, 2944, 2945, 2946,
+  2947, 2948, 2949, 2950, 2951, 2952, 2953, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 0, 0, 0,
+  0, 2954, 1428, 1428, 1428, 1085, 1179, 1160,
+  2227, 1258, 1259, 1258, 1259, 1258, 1259, 1258,
+  1259, 1258, 1259, 1085, 1085, 1258, 1259, 1258,
+  1259, 1258, 1259, 1258, 1259, 1424, 2955, 2956,
+  2956, 1085, 2227, 2227, 2227, 2227, 2227, 2227,
+  2227, 2227, 2227, 2957, 1087, 552, 1086, 2958,
+  2958, 1424, 1179, 1179, 1179, 1179, 1179, 2959,
+  1085, 2960, 2961, 2962, 1179, 1160, 1428, 1085,
+  77, 0, 1160, 1160, 1160, 1160, 1160, 2963,
+  1160, 1160, 1160, 1160, 2964, 2965, 2966, 2967,
+  2968, 2969, 2970, 2971, 2972, 2973, 2974, 2975,
+  2976, 2977, 2978, 2979, 2980, 2981, 2982, 2983,
+  2984, 2985, 2986, 2987, 1160, 2988, 2989, 2990,
+  2991, 2992, 2993, 1160, 1160, 1160, 1160, 1160,
+  2994, 2995, 2996, 2997, 2998, 2999, 3000, 3001,
+  3002, 3003, 3004, 3005, 3006, 3007, 3008, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 3009, 1160, 1160,
+  0, 0, 3010, 3011, 3012, 3013, 3014, 3015,
+  3016, 1424, 1160, 1160, 1160, 1160, 1160, 3017,
+  1160, 1160, 1160, 1160, 3018, 3019, 3020, 3021,
+  3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029,
+  3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037,
+  3038, 3039, 3040, 3041, 1160, 3042, 3043, 3044,
+  3045, 3046, 3047, 1160, 1160, 1160, 1160, 1160,
+  3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055,
+  3056, 3057, 3058, 3059, 3060, 3061, 3062, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  3063, 3064, 3065, 3066, 1160, 3067, 1160, 1160,
+  3068, 3069, 3070, 3071, 1428, 1179, 3072, 3073,
+  3074, 0, 0, 0, 0, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0,
+  0, 0, 3075, 3076, 3077, 3078, 3079, 3080,
+  3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088,
+  3089, 3090, 3091, 3092, 3093, 3094, 3095, 3096,
+  3097, 3098, 3099, 3100, 3101, 3102, 3103, 3104,
+  3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112,
+  3113, 3114, 3115, 3116, 3117, 3118, 3119, 3120,
+  3121, 3122, 3123, 3124, 3125, 3126, 3127, 3128,
+  3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136,
+  3137, 3138, 3139, 3140, 3141, 3142, 3143, 3144,
+  3145, 3146, 3147, 3148, 3149, 3150, 3151, 3152,
+  3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160,
+  3161, 3162, 3163, 3164, 3165, 3166, 3167, 3168,
+  0, 1191, 1191, 3169, 3170, 3171, 3172, 3173,
+  3174, 3175, 3176, 3177, 3178, 3179, 3180, 3181,
+  3182, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 3183, 3184, 3185, 3186, 3187, 3188, 3189,
+  3190, 3191, 3192, 3193, 3194, 3195, 3196, 3197,
+  3198, 3199, 3200, 3201, 3202, 3203, 3204, 3205,
+  3206, 3207, 3208, 3209, 3210, 3211, 3212, 3213,
+  0, 3214, 3215, 3216, 3217, 3218, 3219, 3220,
+  3221, 3222, 3223, 3224, 3225, 3226, 3227, 3228,
+  3229, 3230, 3231, 3232, 3233, 3234, 3235, 3236,
+  3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244,
+  3245, 3246, 3247, 3248, 3249, 3250, 3251, 3252,
+  3253, 1190, 1190, 1190, 1190, 1190, 1190, 1190,
+  1190, 3254, 3255, 3256, 3257, 3258, 3259, 3260,
+  3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268,
+  3269, 3270, 3271, 3272, 3273, 3274, 3275, 3276,
+  3277, 3278, 3279, 3280, 3281, 3282, 3283, 3284,
+  3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292,
+  3293, 3294, 3295, 3296, 3297, 3298, 3299, 3300,
+  1191, 3301, 3302, 3303, 3304, 3305, 3306, 3307,
+  3308, 3309, 3310, 3311, 3312, 3313, 3314, 3315,
+  3316, 3317, 3318, 3319, 3320, 3321, 3322, 3323,
+  3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331,
+  3332, 3333, 3334, 3335, 3336, 3337, 3338, 3339,
+  3340, 3341, 3342, 3343, 3344, 3345, 3346, 3347,
+  3348, 3349, 3350, 3351, 3352, 3353, 3354, 3355,
+  3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363,
+  3364, 3365, 3366, 3367, 3368, 3369, 3370, 3371,
+  3372, 3373, 3374, 3375, 3376, 3377, 3378, 3379,
+  3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387,
+  3388, 3389, 3390, 3391, 3392, 3393, 3394, 3395,
+  3396, 3397, 3398, 3399, 3400, 3401, 3402, 3403,
+  3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411,
+  3412, 3413, 3414, 3415, 3416, 3417, 3418, 3419,
+  3420, 3421, 3422, 3423, 3424, 3425, 3426, 3427,
+  0, 3428, 3429, 3430, 3431, 3432, 3433, 3434,
+  3435, 3436, 3437, 3438, 3439, 3440, 3441, 3442,
+  3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450,
+  3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458,
+  3459, 3460, 3461, 3462, 3463, 3464, 3465, 3466,
+  3467, 3468, 3469, 3470, 3471, 3472, 3473, 3474,
+  3475, 3476, 3477, 3478, 3479, 3480, 3481, 3482,
+  3483, 3484, 3485, 3486, 3487, 3488, 3489, 3490,
+  3491, 3492, 3493, 3494, 3495, 3496, 3497, 3498,
+  3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506,
+  3507, 3508, 3509, 3510, 3511, 3512, 3513, 3514,
+  3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522,
+  3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530,
+  3531, 3532, 3533, 3534, 3535, 3536, 3537, 3538,
+  3539, 3540, 3541, 3542, 3543, 3544, 3545, 3546,
+  3547, 3548, 3549, 3550, 3551, 3552, 3553, 3554,
+  3555, 3556, 3557, 3558, 3559, 3560, 3561, 3562,
+  3563, 3564, 3565, 3566, 3567, 3568, 3569, 3570,
+  3571, 3572, 3573, 3574, 3575, 3576, 3577, 3578,
+  3579, 3580, 3581, 3582, 3583, 3584, 3585, 3586,
+  3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594,
+  3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602,
+  3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610,
+  3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618,
+  3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626,
+  3627, 3628, 3629, 3630, 3631, 3632, 3633, 3634,
+  3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642,
+  3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650,
+  3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658,
+  3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666,
+  3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674,
+  3675, 3676, 3677, 3678, 3679, 3680, 3681, 3682,
+  3683, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1179, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 523, 523, 523, 523, 523, 523, 1044,
+  1044, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1179, 1428, 1428,
+  1428, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1160, 1160, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 3684, 3685, 3686, 3687, 3688, 3689, 3690,
+  3691, 3692, 3693, 3694, 3695, 3696, 3697, 3698,
+  3699, 3700, 3701, 3702, 3703, 3704, 3705, 3706,
+  3707, 3708, 3709, 3710, 3711, 3712, 3713, 3714,
+  3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722,
+  3723, 3724, 3725, 3726, 3727, 3728, 3729, 1160,
+  540, 839, 839, 839, 9, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 9,
+  522, 3730, 3731, 3732, 3733, 3734, 3735, 3736,
+  3737, 3738, 3739, 3740, 3741, 3742, 3743, 3744,
+  3745, 3746, 3747, 3748, 3749, 3750, 3751, 3752,
+  3753, 3754, 3755, 3756, 3757, 3758, 3759, 540,
+  540, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 540, 540, 1044, 1044, 1044, 1044, 1044,
+  1044, 0, 0, 0, 0, 0, 0, 0,
+  0, 47, 47, 47, 47, 47, 47, 47,
+  47, 47, 47, 47, 47, 47, 47, 47,
+  47, 47, 47, 47, 47, 47, 47, 47,
+  522, 522, 522, 522, 522, 522, 522, 522,
+  522, 47, 47, 3760, 3761, 3762, 3763, 3764,
+  3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772,
+  3773, 214, 214, 3774, 3775, 3776, 3777, 3778,
+  3779, 3780, 3781, 3782, 3783, 3784, 3785, 3786,
+  3787, 3788, 3789, 3790, 3791, 3792, 3793, 3794,
+  3795, 3796, 3797, 3798, 3799, 3800, 3801, 3802,
+  3803, 3804, 3805, 3806, 3807, 3808, 3809, 3810,
+  3811, 3812, 3813, 3814, 3815, 3816, 3817, 3818,
+  3819, 3820, 3821, 3822, 3823, 3824, 3825, 3826,
+  3827, 3828, 3829, 3830, 3831, 3832, 3833, 3834,
+  3835, 3836, 1523, 1523, 1523, 1523, 1523, 1523,
+  1523, 214, 3837, 3838, 3839, 3840, 3841, 3842,
+  3843, 3844, 3845, 3846, 3847, 3848, 3849, 3850,
+  3851, 522, 3852, 3852, 3853, 3854, 3855, 214,
+  340, 3856, 3857, 3858, 3859, 214, 214, 3860,
+  3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868,
+  3869, 3870, 3871, 3872, 3873, 3874, 3875, 3876,
+  3877, 3878, 3879, 3880, 3881, 3882, 3883, 3884,
+  0, 3885, 3886, 3887, 3888, 3889, 3890, 3891,
+  3892, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  340, 3893, 3894, 214, 340, 340, 340, 340,
+  1160, 1160, 1160, 1153, 1160, 1160, 1160, 1168,
+  1160, 1160, 1160, 1160, 1153, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1159, 1159, 1153, 1153,
+  1159, 77, 77, 1085, 1085, 0, 0, 0,
+  0, 1190, 1190, 1190, 1190, 1190, 1190, 1191,
+  1191, 1189, 3895, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1428, 1428, 1428,
+  1428, 0, 0, 0, 0, 0, 0, 0,
+  0, 1159, 1159, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1159, 1159, 1159,
+  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159,
+  1159, 1159, 1159, 1159, 1159, 1168, 1153, 0,
+  0, 0, 0, 0, 0, 0, 0, 1177,
+  1177, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 1160, 1160, 1160, 1160, 1160,
+  1160, 1177, 1177, 1177, 1160, 1177, 1160, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1153,
+  1153, 1153, 1153, 1153, 553, 553, 553, 1177,
+  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1159, 1452, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  1177, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 1327, 1327,
+  1327, 1327, 1327, 1327, 1327, 1327, 0, 0,
+  0, 1153, 1153, 1153, 1159, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1180, 1159, 1159, 1153,
+  1153, 1153, 1153, 1159, 1159, 1153, 1159, 1159,
+  1159, 1452, 1177, 1177, 1177, 1177, 1177, 1177,
+  1177, 1177, 1177, 1177, 1177, 1177, 1177, 0,
+  1179, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 1177,
+  1177, 340, 1160, 1160, 1160, 1160, 1153, 523,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1178, 1160, 1160, 1160, 340, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1153, 1153, 1153, 1153, 1153, 1153,
+  1159, 1159, 1153, 1153, 1159, 1159, 1153, 1153,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1153, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1153, 1159, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 1177, 1177, 1177,
+  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1179, 1160, 1160, 1160, 1160, 1160, 1160,
+  1191, 1191, 1191, 1160, 1284, 1153, 1284, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 540, 1160, 540, 540, 553, 1160, 1160,
+  540, 540, 1160, 1160, 1160, 1160, 1160, 540,
+  540, 1160, 540, 1160, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 1160, 1160, 1179, 1177,
+  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1159, 1153, 1153, 1159,
+  1159, 1177, 1177, 1160, 1179, 1179, 1159, 1168,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 0, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 0, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 214, 214, 214, 214,
+  214, 214, 214, 214, 3896, 214, 214, 214,
+  214, 214, 214, 214, 3852, 3897, 3898, 3899,
+  3900, 214, 214, 214, 214, 214, 214, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 3901, 3902, 3903, 3904, 3905, 3906, 3907,
+  3908, 3909, 3910, 3911, 3912, 3913, 3914, 3915,
+  3916, 3917, 3918, 3919, 3920, 3921, 3922, 3923,
+  3924, 3925, 3926, 3927, 3928, 3929, 3930, 3931,
+  3932, 3933, 3934, 3935, 3936, 3937, 3938, 3939,
+  3940, 3941, 3942, 3943, 3944, 3945, 3946, 3947,
+  3948, 3949, 3950, 3951, 3952, 3953, 3954, 3955,
+  3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963,
+  3964, 3965, 3966, 3967, 3968, 3969, 3970, 3971,
+  3972, 3973, 3974, 3975, 3976, 3977, 3978, 3979,
+  3980, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1159, 1159, 1153, 1159,
+  1159, 1153, 1159, 1159, 1177, 1159, 1168, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3981, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3981, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982,
+  3982, 3982, 3982, 3982, 3982, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330,
+  0, 0, 0, 0, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331,
+  1331, 1331, 1331, 1331, 1331, 0, 0, 0,
+  0, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983,
+  3983, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3985, 3986, 3987, 3988, 3989, 3990, 3991,
+  3992, 3992, 3993, 3994, 3995, 3996, 3997, 3998,
+  3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006,
+  4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014,
+  4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022,
+  4023, 4024, 4025, 4026, 4027, 4028, 4029, 4030,
+  4031, 4032, 4033, 4034, 4035, 4036, 4037, 4038,
+  4039, 4040, 4041, 4042, 4043, 4044, 4045, 4046,
+  4047, 4048, 4049, 4050, 4051, 4052, 4053, 4054,
+  4055, 4056, 4057, 4058, 4059, 4060, 4061, 4062,
+  4063, 4064, 4065, 4066, 4067, 4068, 4069, 4070,
+  4071, 4072, 4073, 4074, 4075, 4004, 4076, 4077,
+  4078, 4079, 4080, 4081, 4082, 4083, 4084, 4085,
+  4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093,
+  4094, 4095, 4096, 4097, 4098, 4099, 4100, 4101,
+  4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109,
+  4110, 4111, 4112, 4113, 4114, 4115, 4116, 4117,
+  4118, 4119, 4120, 4121, 4122, 4123, 4124, 4125,
+  4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133,
+  4134, 4135, 4136, 4137, 4138, 4139, 4140, 4141,
+  4142, 4143, 4094, 4144, 4145, 4146, 4147, 4148,
+  4149, 4150, 4151, 4078, 4152, 4153, 4154, 4155,
+  4156, 4157, 4158, 4159, 4160, 4161, 4162, 4163,
+  4164, 4165, 4166, 4167, 4168, 4169, 4170, 4171,
+  4004, 4172, 4173, 4174, 4175, 4176, 4177, 4178,
+  4179, 4180, 4181, 4182, 4183, 4184, 4185, 4186,
+  4187, 4188, 4189, 4190, 4191, 4192, 4193, 4194,
+  4195, 4196, 4197, 4198, 4080, 4199, 4200, 4201,
+  4202, 4203, 4204, 4205, 4206, 4207, 4208, 4209,
+  4210, 4211, 4212, 4213, 4214, 4215, 4216, 4217,
+  4218, 4219, 4220, 4221, 4222, 4223, 4224, 4225,
+  4226, 4227, 4228, 4229, 4230, 4231, 4232, 4233,
+  4234, 4235, 4236, 4237, 4238, 4239, 4240, 4241,
+  4242, 4243, 4244, 4245, 4246, 4247, 4248, 1160,
+  1160, 4249, 1160, 4250, 1160, 1160, 4251, 4252,
+  4253, 4254, 4255, 4256, 4257, 4258, 4259, 4260,
+  1160, 4261, 1160, 4262, 1160, 1160, 4263, 4264,
+  1160, 1160, 1160, 4265, 4266, 4267, 4268, 4269,
+  4270, 4271, 4272, 4273, 4274, 4275, 4276, 4277,
+  4278, 4279, 4280, 4281, 4282, 4283, 4284, 4285,
+  4286, 4287, 4288, 4289, 4290, 4291, 4292, 4293,
+  4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301,
+  4302, 4303, 4304, 4305, 4306, 4307, 4308, 4309,
+  4133, 4310, 4311, 4312, 4313, 4314, 4315, 4315,
+  4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323,
+  4263, 4324, 4325, 4326, 4327, 4328, 4329, 0,
+  0, 4330, 4331, 4332, 4333, 4334, 4335, 4336,
+  4337, 4277, 4338, 4339, 4340, 4249, 4341, 4342,
+  4343, 4344, 4345, 4346, 4347, 4348, 4349, 4350,
+  4351, 4352, 4286, 4353, 4287, 4354, 4355, 4356,
+  4357, 4358, 4250, 4025, 4359, 4360, 4361, 4095,
+  4182, 4362, 4363, 4294, 4364, 4295, 4365, 4366,
+  4367, 4252, 4368, 4369, 4370, 4371, 4372, 4253,
+  4373, 4374, 4375, 4376, 4377, 4378, 4309, 4379,
+  4380, 4133, 4381, 4313, 4382, 4383, 4384, 4385,
+  4386, 4318, 4387, 4262, 4388, 4319, 4076, 4389,
+  4320, 4390, 4322, 4391, 4392, 4393, 4394, 4395,
+  4324, 4258, 4396, 4325, 4397, 4326, 4398, 3992,
+  4399, 4400, 4401, 4402, 4403, 4404, 4405, 4406,
+  4407, 4408, 4409, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 4410, 4411, 4412, 4413, 4414, 4415, 4416,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 4417, 4418, 4419, 4420,
+  4421, 0, 0, 0, 0, 0, 4422, 4423,
+  4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431,
+  4432, 4433, 4434, 4435, 4436, 4437, 4438, 4439,
+  4440, 4441, 4442, 4443, 4444, 4445, 4446, 4447,
+  0, 4448, 4449, 4450, 4451, 4452, 0, 4453,
+  0, 4454, 4455, 0, 4456, 4457, 0, 4458,
+  4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466,
+  4467, 4468, 4469, 4470, 4471, 4472, 4473, 4474,
+  4475, 4476, 4477, 4478, 4479, 4480, 4481, 4482,
+  4483, 4484, 4485, 4486, 4487, 4488, 4489, 4490,
+  4491, 4492, 4493, 4494, 4495, 4496, 4497, 4498,
+  4499, 4500, 4501, 4502, 4503, 4504, 4505, 4506,
+  4507, 4508, 4509, 4510, 4511, 4512, 4513, 4514,
+  4515, 4516, 4517, 4518, 4519, 4520, 4521, 4522,
+  4523, 4524, 4525, 4526, 4527, 4528, 4529, 4530,
+  4531, 4532, 4533, 4534, 4535, 4536, 4537, 4538,
+  4539, 4540, 4541, 4542, 4543, 4544, 4545, 4546,
+  4547, 4548, 4549, 4550, 4551, 4552, 4553, 4554,
+  4555, 4556, 4557, 4558, 4559, 4560, 4561, 4562,
+  4563, 4564, 4565, 4566, 4566, 4566, 4566, 4566,
+  4566, 4566, 4566, 4566, 4566, 4566, 4566, 4566,
+  4566, 4566, 4566, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 4567, 4568, 4569, 4570,
+  4571, 4572, 4573, 4574, 4575, 4576, 4577, 4578,
+  4579, 4580, 4581, 4582, 4583, 4584, 4585, 4586,
+  4587, 4588, 4589, 4590, 4591, 4592, 4593, 4594,
+  4595, 4596, 4597, 4598, 4599, 4600, 4601, 4602,
+  4603, 4604, 4605, 4606, 4607, 4608, 4609, 4610,
+  4611, 4612, 4613, 4614, 4605, 4615, 4616, 4617,
+  4618, 4619, 4620, 4621, 4622, 4623, 4624, 4625,
+  4626, 4627, 4628, 4629, 4630, 4631, 4632, 4633,
+  4634, 4635, 4636, 4637, 4638, 4639, 4640, 4641,
+  4642, 4643, 4644, 4645, 4646, 4647, 4648, 4649,
+  4650, 4651, 4652, 4653, 4654, 4655, 4656, 4657,
+  4658, 4659, 4660, 4661, 4662, 4663, 4664, 4665,
+  4666, 4667, 4668, 4669, 4670, 4671, 4672, 4673,
+  4674, 4675, 4676, 4677, 4678, 4679, 4680, 4681,
+  4682, 4683, 4684, 4685, 4686, 4687, 4688, 4689,
+  4690, 4691, 4692, 4693, 4694, 4695, 4696, 4697,
+  4698, 4699, 4700, 4701, 4702, 4703, 4704, 4705,
+  4706, 4707, 4708, 4709, 4710, 4711, 4712, 4713,
+  4714, 4606, 4715, 4716, 4717, 4718, 4719, 4720,
+  4721, 4722, 4723, 4724, 4725, 4726, 4727, 4728,
+  4729, 4730, 4731, 4732, 4733, 4734, 4735, 4736,
+  4737, 4738, 4739, 4740, 4741, 4742, 4743, 4744,
+  4745, 4746, 4747, 4748, 4749, 4750, 4751, 4752,
+  4753, 4754, 4755, 4756, 4757, 4758, 4759, 4760,
+  4761, 4762, 4763, 4764, 4765, 4766, 4767, 4768,
+  4769, 4770, 4771, 4772, 4773, 4774, 4775, 4776,
+  4777, 4778, 4779, 4780, 4781, 4782, 4783, 4784,
+  4785, 4786, 4787, 4788, 4789, 4790, 4791, 4792,
+  4793, 4794, 4795, 4796, 4797, 4798, 4799, 4800,
+  4801, 4802, 4803, 4804, 4805, 4806, 4807, 4808,
+  4809, 4810, 4811, 4812, 4813, 4814, 4815, 4816,
+  4817, 4818, 4819, 4820, 4821, 4822, 4823, 4824,
+  4825, 4826, 4827, 4828, 4829, 4830, 4831, 4832,
+  4833, 4834, 4835, 4836, 4837, 4838, 4839, 4840,
+  4841, 4842, 4843, 4844, 4845, 4846, 4847, 4848,
+  4849, 4850, 4851, 4852, 4853, 4854, 4855, 4856,
+  4857, 4858, 4859, 4860, 4861, 4862, 4863, 4864,
+  4865, 4866, 4867, 4868, 4869, 4870, 4871, 4872,
+  4873, 4874, 4875, 4876, 4877, 4878, 4879, 4880,
+  4881, 4882, 4883, 4884, 4885, 4886, 4887, 4888,
+  4889, 4890, 4891, 4892, 4893, 4894, 4895, 4896,
+  4897, 4898, 4899, 4900, 4901, 4902, 4903, 4904,
+  4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912,
+  4913, 4914, 4915, 4916, 4917, 4918, 4919, 4920,
+  4921, 4922, 4923, 4924, 4925, 4926, 4927, 2956,
+  2955, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 4928, 4929, 4930, 4931, 4932, 4933, 4934,
+  4935, 4936, 4937, 4938, 4939, 4940, 4941, 4942,
+  4943, 4944, 4945, 4946, 4947, 4948, 4949, 4950,
+  4951, 4952, 4953, 4954, 4955, 4956, 4957, 4958,
+  4959, 4960, 4961, 4962, 4963, 4964, 4965, 4966,
+  4967, 4968, 4969, 4970, 4971, 4972, 4973, 4974,
+  4975, 4976, 4977, 4978, 4979, 4980, 4981, 4982,
+  4983, 4984, 4985, 4986, 4987, 4988, 4989, 4990,
+  4991, 0, 0, 4992, 4993, 4994, 4995, 4996,
+  4997, 4998, 4999, 5000, 5001, 5002, 5003, 5004,
+  5005, 5006, 5007, 5008, 5009, 5010, 5011, 5012,
+  5013, 5014, 5015, 5016, 5017, 5018, 5019, 5020,
+  5021, 5022, 5023, 5024, 5025, 5026, 5027, 5028,
+  5029, 5030, 5031, 5032, 5033, 5034, 5035, 5036,
+  5037, 5038, 5039, 5040, 5041, 5042, 5043, 5044,
+  5045, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 5046, 5047, 5048, 5049, 5050, 5051, 5052,
+  5053, 5054, 5055, 5056, 5057, 5058, 1085, 0,
+  0, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 5059, 5060, 5061, 5062, 5063, 5064, 5065,
+  5066, 5067, 5068, 0, 0, 0, 0, 0,
+  0, 540, 540, 540, 540, 540, 540, 540,
+  553, 553, 553, 553, 553, 553, 553, 540,
+  540, 5069, 5070, 5071, 5072, 5072, 5073, 5074,
+  5075, 5076, 5077, 5078, 5079, 5080, 5081, 5082,
+  5083, 5084, 5085, 5086, 5087, 5088, 1428, 1428,
+  5089, 5090, 5091, 5091, 5091, 5091, 5092, 5092,
+  5092, 5093, 5094, 5095, 0, 5096, 5097, 5098,
+  5099, 5100, 5101, 5102, 5103, 5104, 5105, 5106,
+  5107, 5108, 5109, 5110, 5111, 5112, 5113, 5114,
+  0, 5115, 5116, 5117, 5118, 0, 0, 0,
+  0, 5119, 5120, 5121, 1118, 5122, 0, 5123,
+  5124, 5125, 5126, 5127, 5128, 5129, 5130, 5131,
+  5132, 5133, 5134, 5135, 5136, 5137, 5138, 5139,
+  5140, 5141, 5142, 5143, 5144, 5145, 5146, 5147,
+  5148, 5149, 5150, 5151, 5152, 5153, 5154, 5155,
+  5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163,
+  5164, 5165, 5166, 5167, 5168, 5169, 5170, 5171,
+  5172, 5173, 5174, 5175, 5176, 5177, 5178, 5179,
+  5180, 5181, 5182, 5183, 5184, 5185, 5186, 5187,
+  5188, 5189, 5190, 5191, 5192, 5193, 5194, 5195,
+  5196, 5197, 5198, 5199, 5200, 5201, 5202, 5203,
+  5204, 5205, 5206, 5207, 5208, 5209, 5210, 5211,
+  5212, 5213, 5214, 5215, 5216, 5217, 5218, 5219,
+  5220, 5221, 5222, 5223, 5224, 5225, 5226, 5227,
+  5228, 5229, 5230, 5231, 5232, 5233, 5234, 5235,
+  5236, 5237, 5238, 5239, 5240, 5241, 5242, 5243,
+  5244, 5245, 5246, 5247, 5248, 5249, 5250, 5251,
+  5252, 5253, 5254, 5255, 5256, 5257, 0, 0,
+  81, 0, 5258, 5259, 5260, 5261, 5262, 5263,
+  5264, 5265, 5266, 5267, 5268, 5269, 5270, 5271,
+  5272, 5273, 5274, 5275, 5276, 5277, 5278, 5279,
+  5280, 5281, 5282, 5283, 5284, 5285, 5286, 5287,
+  5288, 5289, 5290, 5291, 5292, 5293, 5294, 5295,
+  5296, 5297, 5298, 5299, 5300, 5301, 5302, 5303,
+  5304, 5305, 5306, 5307, 5308, 5309, 5310, 5311,
+  5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319,
+  5320, 5321, 5322, 5323, 5324, 5325, 5326, 5327,
+  5328, 5329, 5330, 5331, 5332, 5333, 5334, 5335,
+  5336, 5337, 5338, 5339, 5340, 5341, 5342, 5343,
+  5344, 5345, 5346, 5347, 5348, 5349, 5350, 5351,
+  5352, 5353, 5354, 5355, 5356, 5357, 5358, 5359,
+  5360, 5361, 5362, 5363, 5364, 5365, 5366, 5367,
+  5368, 5369, 5370, 5371, 5372, 5373, 5374, 5375,
+  5376, 5377, 5378, 5379, 5380, 5381, 5382, 5383,
+  5384, 5385, 5386, 5387, 5388, 5389, 5390, 5391,
+  5392, 5393, 5394, 5395, 5396, 5397, 5398, 5399,
+  5400, 5401, 5402, 5403, 5404, 5405, 5406, 5407,
+  5408, 5409, 5410, 5411, 5412, 5413, 5414, 5415,
+  5416, 5417, 5418, 5419, 5420, 5421, 5422, 5423,
+  5424, 5425, 5426, 5427, 5428, 5429, 5430, 5431,
+  5432, 5433, 5434, 5435, 5436, 5437, 5438, 5439,
+  5440, 5441, 5442, 5443, 5444, 5445, 5446, 5447,
+  0, 0, 0, 5448, 5449, 5450, 5451, 5452,
+  5453, 0, 0, 5454, 5455, 5456, 5457, 5458,
+  5459, 0, 0, 5460, 5461, 5462, 5463, 5464,
+  5465, 0, 0, 5466, 5467, 5468, 0, 0,
+  0, 5469, 5470, 5471, 5472, 5473, 5474, 5475,
+  0, 5476, 5477, 5478, 5479, 5480, 5481, 5482,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 5483, 5483, 5483, 1085, 77, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 0, 340, 1160,
+  1160, 340, 340, 340, 1160, 340, 340, 340,
+  340, 340, 340, 340, 340, 1160, 340, 340,
+  340, 340, 340, 1160, 1160, 1160, 340, 340,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 1160,
+  340, 340, 340, 340, 0, 340, 340, 0,
+  340, 340, 1160, 340, 340, 1160, 1160, 1160,
+  340, 340, 340, 1160, 1160, 340, 1160, 0,
+  0, 340, 340, 1160, 340, 340, 1160, 340,
+  1160, 1160, 1160, 340, 1160, 1160, 1160, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 1160, 1160, 1160, 1160, 340,
+  340, 340, 340, 1160, 1160, 1160, 1160, 1160,
+  340, 1160, 340, 340, 340, 340, 1160, 1160,
+  1160, 1160, 1160, 340, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 340, 1160, 340, 1160,
+  1160, 1160, 1160, 1160, 340, 340, 1160, 1160,
+  1160, 1160, 1160, 1160, 340, 1160, 1160, 1160,
+  1160, 1160, 340, 340, 340, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 0, 0, 0, 0,
+  0, 1044, 9, 1044, 0, 0, 0, 0,
+  5484, 5484, 5484, 5484, 5484, 5484, 5484, 5484,
+  5484, 5484, 5484, 5484, 5484, 5484, 5484, 5484,
+  5484, 5484, 5484, 5484, 5484, 5484, 5484, 5484,
+  5484, 5484, 1190, 5484, 1190, 5484, 1190, 1190,
+  1190, 1190, 1190, 1190, 5484, 1190, 5484, 1190,
+  1190, 1190, 1190, 1190, 1190, 0, 0, 0,
+  1191, 838, 1191, 838, 838, 838, 838, 838,
+  1191, 5485, 5485, 5485, 5485, 5485, 5485, 5485,
+  5485, 5485, 5485, 5485, 5485, 5485, 5485, 5485,
+  5485, 5485, 5485, 5485, 5485, 5485, 5485, 5485,
+  5485, 5485, 5485, 5485, 5485, 5485, 5485, 5485,
+  5485, 5485, 5485, 5485, 5485, 5485, 5485, 5485,
+  5485, 5485, 5486, 5486, 5486, 5486, 5486, 5486,
+  5485, 5486, 5485, 5485, 5485, 5485, 1427, 1427,
+  1220, 1427, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 1085, 77, 1427, 1427, 77, 838, 838,
+  0, 77, 77, 77, 77, 77, 77, 77,
+  1085, 1085, 1085, 77, 77, 0, 0, 0,
+  0, 77, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 553, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 1160,
+  1160, 340, 340, 340, 340, 340, 340, 340,
+  340, 1160, 340, 1160, 340, 340, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 1160, 340, 340, 340, 340, 340, 340,
+  1160, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 553, 5487, 5487, 5487, 5487, 5487, 5487,
+  5487, 5487, 5487, 5487, 5487, 5487, 5487, 5487,
+  5487, 5487, 5487, 5487, 5487, 5487, 5487, 5487,
+  5487, 5487, 5487, 5487, 5487, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 5484, 5484, 5484, 5484, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 1426, 340, 340, 340, 340, 340,
+  340, 340, 340, 1426, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 540,
+  540, 540, 540, 540, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0,
+  1177, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1177, 2227, 2227, 2227, 2227, 2227, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 5488, 5489, 5490, 5491, 5492, 5493, 5494,
+  5495, 5496, 5497, 5498, 5499, 5500, 5501, 5502,
+  5503, 5504, 5505, 5506, 5507, 5508, 5509, 5510,
+  5511, 5512, 5513, 5514, 5515, 5516, 5517, 5518,
+  5519, 5520, 5521, 5522, 5523, 5524, 5525, 5526,
+  5527, 5528, 5529, 5530, 5531, 5532, 5533, 5534,
+  5535, 5536, 5537, 5538, 5539, 5540, 5541, 5542,
+  5543, 5544, 5545, 5546, 5547, 5548, 5549, 5550,
+  5551, 5552, 5553, 5554, 5555, 5556, 5557, 5558,
+  5559, 5560, 5561, 5562, 5563, 5564, 5565, 5566,
+  5567, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 1160, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 1160,
+  340, 1160, 340, 340, 1160, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 1160, 0,
+  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1250, 0, 0, 0, 0, 0,
+  0, 5568, 5569, 5570, 5571, 5572, 5573, 5574,
+  5575, 5576, 5577, 5578, 5579, 5580, 5581, 5582,
+  5583, 5584, 5585, 5586, 5587, 5588, 5589, 5590,
+  5591, 5592, 5593, 5594, 5595, 5596, 5597, 5598,
+  5599, 5600, 5601, 5602, 5603, 0, 0, 0,
+  0, 5604, 5605, 5606, 5607, 5608, 5609, 5610,
+  5611, 5612, 5613, 5614, 5615, 5616, 5617, 5618,
+  5619, 5620, 5621, 5622, 5623, 5624, 5625, 5626,
+  5627, 5628, 5629, 5630, 5631, 5632, 5633, 5634,
+  5635, 5636, 5637, 5638, 5639, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  1044, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 1160, 340, 340, 340,
+  340, 1160, 340, 1160, 1160, 1160, 340, 340,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 340, 340, 1160, 340, 340, 1160, 1160,
+  340, 340, 1160, 1160, 1160, 1160, 340, 1160,
+  340, 340, 340, 340, 340, 1160, 1160, 1160,
+  340, 1160, 340, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 340, 1160, 1160, 1160, 340,
+  1160, 1160, 340, 340, 1160, 1160, 1160, 1160,
+  1160, 1160, 340, 340, 1160, 1160, 1160, 340,
+  340, 340, 340, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 340, 1160, 1160, 1160, 1160,
+  340, 1160, 1160, 340, 340, 340, 1160, 1160,
+  1160, 1160, 340, 340, 340, 1160, 1160, 1160,
+  1160, 340, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 1160, 1160, 1160, 1160, 1160, 340, 340,
+  1160, 1160, 340, 1160, 1160, 340, 1160, 1160,
+  1160, 1160, 1160, 340, 1160, 1160, 1160, 340,
+  1160, 1160, 340, 1160, 1160, 340, 1160, 340,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 340, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 340, 340, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 340, 1160,
+  340, 340, 340, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 340, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 340, 1160, 1160, 340, 1160, 340, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1156, 1156, 1156, 1106, 1156, 1106, 0,
+  0, 1156, 0, 1106, 1156, 1156, 1156, 1156,
+  1156, 1106, 1156, 1106, 1156, 1156, 1156, 1156,
+  1156, 1156, 1106, 1156, 1156, 1156, 1156, 1106,
+  1156, 1106, 1156, 1156, 1106, 1106, 1156, 1106,
+  1156, 1106, 1106, 1106, 1106, 1156, 1106, 1106,
+  1106, 1106, 1106, 1156, 1106, 1156, 1106, 0,
+  1156, 1106, 0, 0, 0, 1156, 0, 0,
+  1156, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 0,
+  1103, 5640, 5640, 5640, 5640, 5640, 5640, 5640,
+  5640, 1156, 1156, 1156, 1106, 1106, 1106, 1106,
+  1156, 1106, 1106, 1156, 1106, 1156, 1106, 1106,
+  1156, 1156, 1106, 1156, 1156, 1106, 1156, 1156,
+  5641, 5641, 5640, 5640, 5642, 5642, 5642, 5642,
+  5640, 1156, 1106, 1156, 1156, 1156, 1106, 1106,
+  1106, 1106, 1106, 1156, 1156, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1156,
+  1156, 1106, 1156, 1156, 1106, 1106, 1106, 1106,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  5640, 5640, 5640, 5640, 5640, 5640, 5640, 5640,
+  5640, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 0, 1106, 1106, 0,
+  0, 0, 0, 0, 5640, 5640, 5640, 5640,
+  5640, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 5640,
+  5640, 5640, 5640, 5640, 5640, 0, 0, 0,
+  9, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 0, 0, 0, 0, 0,
+  1103, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1156, 1106, 1156, 1156, 1156, 1156, 1156,
+  1106, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1106, 1156, 1156, 1156, 1156, 1156, 1156, 1106,
+  1156, 1156, 1106, 1156, 1106, 1156, 1106, 1106,
+  1106, 1106, 1156, 1106, 1156, 1106, 1156, 1106,
+  1106, 1106, 1156, 1106, 1156, 1106, 1156, 1156,
+  1106, 0, 0, 0, 0, 5642, 5640, 1106,
+  1156, 5640, 5640, 5640, 5640, 5642, 5642, 5642,
+  5640, 5640, 5642, 5642, 5642, 5642, 5642, 5642,
+  5642, 0, 0, 5642, 5642, 5642, 5642, 5642,
+  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5642,
+  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5642,
+  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5642,
+  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5640,
+  5640, 5640, 5640, 5642, 5640, 5642, 5642, 5642,
+  5642, 1156, 1153, 1153, 1153, 0, 1153, 1153,
+  0, 0, 0, 0, 0, 1153, 553, 1153,
+  540, 1156, 1156, 1156, 1156, 0, 1156, 1156,
+  1156, 0, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 0, 0, 0,
+  0, 540, 566, 553, 0, 0, 0, 0,
+  1168, 5642, 5642, 5642, 5642, 5642, 5642, 5642,
+  5642, 0, 0, 0, 0, 0, 0, 0,
+  0, 1158, 1158, 1158, 1158, 1158, 1158, 1158,
+  1158, 1158, 0, 0, 0, 0, 0, 0,
+  0, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 5640, 5640,
+  1103, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 5640, 5640,
+  5640, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1106, 1156, 1156, 1106, 1106, 1106, 1156,
+  1106, 5643, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1156, 1156, 1156, 1106, 1156, 1156, 1156,
+  1106, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1106, 1156, 1156, 1106, 540, 553,
+  0, 0, 0, 0, 5640, 5642, 5642, 5642,
+  5642, 1158, 1158, 1158, 1158, 1103, 1103, 1103,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1106, 1156, 1156, 1156, 1156, 1106, 1106,
+  1106, 1156, 1156, 1156, 1156, 1106, 1106, 1106,
+  1106, 1106, 1156, 1156, 1156, 1156, 1106, 1156,
+  1106, 1106, 1106, 1106, 1156, 1106, 1106, 1106,
+  1106, 1156, 1156, 1106, 1106, 1106, 1106, 1106,
+  1156, 1106, 1106, 1156, 1156, 1106, 1106, 1106,
+  1106, 1106, 1156, 1156, 1156, 1156, 1156, 0,
+  0, 0, 9, 9, 9, 9, 9, 9,
+  9, 1156, 1156, 1106, 1106, 1156, 1106, 1106,
+  1106, 1156, 1106, 1156, 1106, 1156, 1156, 1106,
+  1106, 1156, 1156, 1106, 1106, 1106, 1106, 0,
+  0, 5640, 5640, 5640, 5640, 5640, 5640, 5642,
+  5640, 1106, 1106, 1106, 1106, 1156, 1106, 1106,
+  1156, 1106, 1106, 1106, 1106, 1156, 1106, 1156,
+  1106, 1106, 1156, 1106, 0, 0, 0, 0,
+  0, 5640, 5640, 5640, 5640, 5640, 5640, 5640,
+  5640, 1106, 1156, 1106, 1156, 1106, 1106, 1106,
+  1156, 1106, 1156, 1106, 1106, 1106, 1156, 1106,
+  1106, 1156, 1106, 0, 0, 0, 0, 0,
+  0, 0, 1158, 1158, 1158, 1158, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 5640, 5640, 5640, 5642, 5640, 5640,
+  5642, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+  1106, 1106, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 5644, 5645, 5646, 5647, 5648, 5649, 5650,
+  5651, 5652, 5653, 5654, 5655, 5656, 5657, 5658,
+  5659, 5660, 5661, 5662, 5663, 5664, 5665, 5666,
+  5667, 5668, 5669, 5670, 5671, 5672, 5673, 5674,
+  5675, 5676, 5677, 5678, 5679, 5680, 5681, 5682,
+  5683, 5684, 5685, 5686, 5687, 5688, 5689, 5690,
+  5691, 5692, 5693, 5694, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 5695, 5696, 5697, 5698, 5699, 5700, 5701,
+  5702, 5703, 5704, 5705, 5706, 5707, 5708, 5709,
+  5710, 5711, 5712, 5713, 5714, 5715, 5716, 5717,
+  5718, 5719, 5720, 5721, 5722, 5723, 5724, 5725,
+  5726, 5727, 5728, 5729, 5730, 5731, 5732, 5733,
+  5734, 5735, 5736, 5737, 5738, 5739, 5740, 5741,
+  5742, 5743, 5744, 5745, 0, 0, 0, 0,
+  0, 0, 0, 5640, 5640, 5640, 5640, 5640,
+  5640, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 5746, 5746, 5747, 5746, 5746, 5746, 5746,
+  5746, 5747, 5746, 5746, 5747, 5747, 5747, 5746,
+  5746, 5747, 5746, 5746, 5746, 5747, 5747, 5746,
+  5747, 5747, 5746, 5746, 5747, 5747, 5747, 5747,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1159, 1153, 1159, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1168,
+  1177, 1177, 1177, 1177, 1177, 1177, 1177, 0,
+  0, 0, 0, 1220, 1220, 1220, 1220, 1220,
+  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220,
+  1220, 1220, 1220, 1220, 1220, 1220, 1220, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  1168, 1153, 1153, 1159, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 5748, 5749, 5750, 5751, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 5752, 1160,
+  1160, 1160, 1160, 1160, 5753, 1160, 1160, 1160,
+  1160, 1159, 1159, 1159, 1153, 1153, 1153, 1153,
+  1159, 1159, 1168, 5754, 1177, 1177, 5755, 1177,
+  1177, 1177, 1177, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 0, 0, 0, 0, 0, 0,
+  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1250, 0, 0, 0, 0, 0,
+  0, 540, 540, 540, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  5756, 1153, 1153, 1153, 1153, 1159, 1153, 5757,
+  5758, 1153, 5759, 5760, 1168, 1168, 0, 1178,
+  1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1177, 1177, 1177, 1177, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 340, 340, 340, 1160, 340, 340,
+  340, 340, 1160, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 1160, 340, 1160,
+  1160, 1160, 1160, 1160, 340, 1160, 340, 1160,
+  340, 340, 340, 340, 1180, 1044, 1044, 1160,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1153, 1153, 1159, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1159, 1159, 1159, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1159, 1452, 1160, 1237, 1237, 1160, 1177, 1177,
+  1177, 1177, 1177, 1180, 1153, 1153, 1177, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1160, 1177, 1160, 1177, 1177,
+  1177, 0, 1190, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1190, 1190, 1190, 1190, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 0, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1159, 1159, 1159,
+  1153, 1153, 1153, 1159, 1159, 1153, 1452, 1180,
+  1153, 1177, 1177, 1177, 1177, 1177, 1177, 1153,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 1160, 0, 1160, 1160, 1160, 1160, 0,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1177, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1153, 1159, 1159, 1159, 1153, 1153, 1153, 1153,
+  1153, 1153, 1180, 1168, 0, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 1153, 1153, 1159, 1159, 0, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 0,
+  1160, 1160, 0, 0, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 0, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 1180, 1160, 5761,
+  1159, 1153, 1159, 1159, 1159, 1159, 0, 0,
+  5762, 1159, 0, 0, 5763, 5764, 1452, 0,
+  0, 1160, 0, 0, 0, 0, 0, 0,
+  5765, 0, 0, 0, 0, 0, 1160, 1160,
+  1160, 1160, 1160, 1159, 1159, 0, 0, 540,
+  540, 540, 540, 540, 540, 540, 0, 0,
+  0, 540, 540, 540, 540, 540, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1159, 1159,
+  1159, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1159, 1159, 1168, 1153, 1153, 1159, 1180,
+  1160, 1160, 1160, 1160, 1177, 1177, 1177, 1177,
+  1177, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 1177, 0, 1177, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 5766, 1159, 1159, 1153, 1153, 1153, 1153,
+  1153, 1153, 5767, 5768, 5769, 5770, 5771, 5772,
+  1153, 1153, 1159, 1168, 1180, 1160, 1160, 1177,
+  1160, 0, 0, 0, 0, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  5773, 1159, 1159, 1153, 1153, 1153, 1153, 0,
+  0, 5774, 5775, 5776, 5777, 1153, 1153, 1159,
+  1168, 1180, 1177, 1177, 1177, 1177, 1177, 1177,
+  1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177,
+  1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177,
+  1177, 1160, 1160, 1160, 1160, 1153, 1153, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1159, 1159, 1159, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1159, 1159, 1153, 1159,
+  1168, 1153, 1177, 1177, 1177, 1160, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 1428, 1428, 1428, 1428, 1428, 1428, 1428,
+  1428, 1428, 1428, 1428, 1428, 1428, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1153, 1159, 1153, 1159,
+  1159, 1153, 1153, 1153, 1153, 1153, 1153, 1452,
+  1180, 0, 0, 0, 0, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 0, 1153, 1153,
+  1153, 1159, 1159, 1153, 1153, 1153, 1153, 1159,
+  1153, 1153, 1153, 1153, 1168, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1190, 1190, 1177, 1177, 1177,
+  1191, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 5778, 5779, 5780, 5781, 5782, 5783, 5784,
+  5785, 5786, 5787, 5788, 5789, 5790, 5791, 5792,
+  5793, 5794, 5795, 5796, 5797, 5798, 5799, 5800,
+  5801, 5802, 5803, 5804, 5805, 5806, 5807, 5808,
+  5809, 5810, 5811, 5812, 5813, 5814, 5815, 5816,
+  5817, 5818, 5819, 5820, 5821, 5822, 5823, 5824,
+  5825, 5826, 5827, 5828, 5829, 5830, 5831, 5832,
+  5833, 5834, 5835, 5836, 5837, 5838, 5839, 5840,
+  5841, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1250, 5484, 5484, 5484, 5484, 5484,
+  5484, 5484, 5484, 5484, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  340, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 0, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  5842, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  0, 1153, 1153, 1153, 1153, 1153, 1153, 1159,
+  5843, 1160, 1177, 1177, 1177, 1177, 1177, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+  1178, 1178, 1178, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1190, 1190, 1190, 1190, 0, 0,
+  0, 1044, 1044, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 0, 0, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 0, 1159, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1159, 1153, 1153, 1159, 1153, 1153,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
+  0, 1044, 1044, 1044, 1044, 1044, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1250, 0, 0, 0, 0, 1044,
+  1044, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 0,
+  0, 566, 566, 566, 566, 566, 1044, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 540, 540, 540, 540, 540, 540, 540,
+  1044, 1044, 1044, 1044, 1044, 838, 838, 838,
+  838, 523, 523, 523, 523, 1044, 838, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+  1250, 1250, 1250, 0, 5484, 5484, 5484, 5484,
+  5484, 5484, 5484, 0, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 0, 0, 0, 0, 0, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1159, 1159, 1159, 1159, 1159, 1159,
+  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159,
+  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159,
+  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159,
+  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159,
+  1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  1153, 1153, 1153, 1153, 1179, 1179, 1179, 1179,
+  1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179,
+  1179, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1179, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 1160, 1160,
+  1160, 1160, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 1160, 1160, 340, 340,
+  1160, 1160, 340, 340, 1160, 1160, 1160, 1160,
+  340, 340, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 1160, 1160, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 1160, 340, 340, 340, 1160, 340, 340,
+  1160, 1160, 1160, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 340, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  340, 1160, 340, 340, 340, 340, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 0, 0, 0, 0, 0, 0,
+  0, 340, 340, 340, 340, 340, 340, 340,
+  340, 340, 340, 0, 0, 1191, 1153, 566,
+  1177, 81, 81, 81, 81, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 838, 838, 838, 838, 838, 838, 838,
+  838, 1191, 1191, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 1191, 838, 1191, 838,
+  838, 838, 1191, 838, 838, 838, 1191, 1191,
+  1191, 838, 1191, 838, 1191, 838, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 838, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 838, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  838, 838, 1191, 1191, 1191, 1191, 1191, 838,
+  838, 838, 838, 1191, 838, 1191, 1191, 1191,
+  838, 838, 838, 1191, 1191, 1191, 1191, 1191,
+  838, 1191, 1191, 1191, 838, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 838, 1191, 1191, 1191, 838,
+  838, 838, 1191, 1191, 838, 838, 838, 838,
+  1191, 1191, 838, 838, 838, 1191, 1191, 838,
+  838, 838, 838, 1191, 1191, 1191, 1191, 1191,
+  838, 838, 838, 838, 838, 838, 1191, 838,
+  838, 1191, 1191, 1191, 838, 1191, 1191, 1191,
+  1191, 838, 838, 1191, 838, 1191, 838, 1191,
+  1191, 1191, 1191, 1191, 1191, 838, 838, 838,
+  1191, 1191, 838, 838, 838, 1191, 838, 1191,
+  838, 1191, 838, 838, 1191, 1191, 1191, 1191,
+  838, 1191, 1191, 1191, 838, 1191, 1191, 1191,
+  1191, 838, 1191, 1191, 1191, 838, 1191, 1191,
+  1191, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 1191,
+  838, 1191, 838, 838, 838, 838, 838, 838,
+  838, 1191, 838, 1191, 838, 838, 838, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 838, 1191, 838, 838, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 838,
+  838, 838, 1191, 1191, 1191, 1191, 838, 838,
+  0, 0, 1191, 838, 1191, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 1191,
+  1191, 1191, 1191, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  5844, 5845, 1191, 838, 838, 1191, 838, 5846,
+  5847, 5848, 5849, 5850, 5851, 5852, 5853, 5854,
+  566, 566, 566, 1191, 1191, 1191, 5855, 5856,
+  5857, 5858, 5859, 5860, 81, 81, 81, 81,
+  81, 81, 81, 81, 553, 553, 553, 553,
+  553, 553, 553, 553, 838, 838, 540, 540,
+  540, 540, 540, 553, 553, 838, 838, 838,
+  838, 838, 838, 1191, 1191, 838, 838, 1191,
+  1191, 1191, 1191, 838, 838, 1191, 1191, 838,
+  838, 838, 838, 838, 1191, 1191, 838, 1191,
+  1191, 838, 838, 540, 540, 540, 540, 1191,
+  1191, 1191, 1191, 1191, 1191, 838, 1191, 1191,
+  1191, 1191, 5861, 5862, 5863, 5864, 5865, 5866,
+  5867, 5868, 838, 838, 838, 838, 838, 838,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 838, 838, 838, 838, 838, 838, 838,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 540, 540, 540, 1085, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1190, 1190, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 5484, 1190, 1190, 1190, 1190, 1190,
+  1190, 1190, 1190, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 5869, 2157, 2132, 5870, 2159, 2160, 5871,
+  2139, 2142, 5872, 5873, 2143, 2162, 2145, 5874,
+  2147, 2148, 2149, 5875, 5876, 5877, 5878, 5879,
+  5880, 5881, 2153, 5882, 5883, 5884, 5885, 2158,
+  5886, 2138, 2140, 2168, 2177, 5887, 2144, 5888,
+  5889, 2163, 5890, 5891, 5892, 5893, 5894, 5895,
+  5896, 5897, 5898, 5899, 5900, 5901, 5902, 5903,
+  2175, 5904, 5905, 5906, 5907, 5908, 5909, 5910,
+  5911, 5912, 5913, 5914, 5915, 5916, 5917, 5918,
+  5919, 5920, 5921, 5922, 5923, 5924, 5925, 5926,
+  5927, 5928, 2176, 5929, 5930, 5931, 0, 5932,
+  5933, 5934, 5935, 5936, 5937, 5938, 5939, 5940,
+  5941, 5942, 5943, 5944, 5945, 5946, 5947, 5948,
+  5949, 5901, 5902, 5903, 2175, 5904, 5905, 5906,
+  5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914,
+  5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922,
+  5923, 5924, 5925, 5926, 5927, 5928, 2176, 5929,
+  5930, 5931, 5950, 5932, 5933, 5934, 5935, 5936,
+  5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944,
+  5945, 5946, 5947, 5948, 5949, 5901, 0, 5903,
+  2175, 0, 0, 5906, 0, 0, 5909, 5910,
+  0, 0, 5913, 5914, 5915, 5916, 0, 5918,
+  5919, 5920, 5921, 5922, 5923, 5924, 5925, 5926,
+  5927, 5928, 2176, 0, 5930, 0, 5950, 5932,
+  5933, 5934, 5935, 5936, 5937, 0, 5939, 5940,
+  5941, 5942, 5943, 5944, 5945, 5946, 5947, 5948,
+  5949, 5901, 5902, 5903, 2175, 5904, 5905, 5906,
+  5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914,
+  5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922,
+  5923, 5924, 5925, 5926, 5927, 5928, 2176, 5929,
+  5930, 5931, 5950, 5932, 5933, 5934, 5935, 5936,
+  5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944,
+  5945, 5946, 5947, 5948, 5949, 5869, 2157, 0,
+  5870, 2159, 2160, 5871, 0, 0, 5872, 5873,
+  2143, 2162, 2145, 5874, 2147, 2148, 0, 5875,
+  5876, 5877, 5878, 5879, 5880, 5881, 0, 5882,
+  5883, 5884, 5885, 2158, 5886, 2138, 2140, 2168,
+  2177, 5887, 2144, 5888, 5889, 2163, 5890, 5891,
+  5892, 5893, 5894, 5895, 5896, 5897, 5898, 5899,
+  5900, 5869, 2157, 0, 5870, 2159, 2160, 5871,
+  0, 2142, 5872, 5873, 2143, 2162, 0, 5874,
+  0, 0, 0, 5875, 5876, 5877, 5878, 5879,
+  5880, 5881, 0, 5882, 5883, 5884, 5885, 2158,
+  5886, 2138, 2140, 2168, 2177, 5887, 2144, 5888,
+  5889, 2163, 5890, 5891, 5892, 5893, 5894, 5895,
+  5896, 5897, 5898, 5899, 5900, 5869, 2157, 2132,
+  5870, 2159, 2160, 5871, 2139, 2142, 5872, 5873,
+  2143, 2162, 2145, 5874, 2147, 2148, 2149, 5875,
+  5876, 5877, 5878, 5879, 5880, 5881, 2153, 5882,
+  5883, 5884, 5885, 2158, 5886, 2138, 2140, 2168,
+  2177, 5887, 2144, 5888, 5889, 2163, 5890, 5891,
+  5892, 5893, 5894, 5895, 5896, 5897, 5898, 5899,
+  5900, 5869, 2157, 2132, 5870, 2159, 2160, 5871,
+  2139, 2142, 5872, 5873, 2143, 2162, 2145, 5874,
+  2147, 2148, 2149, 5875, 5876, 5877, 5878, 5879,
+  5880, 5881, 2153, 5882, 5883, 5884, 5885, 2158,
+  5886, 2138, 2140, 2168, 2177, 5887, 2144, 5888,
+  5889, 2163, 5890, 5891, 5892, 5893, 5894, 5895,
+  5896, 5897, 5898, 5899, 5900, 5869, 2157, 2132,
+  5870, 2159, 2160, 5871, 2139, 2142, 5872, 5873,
+  2143, 2162, 2145, 5874, 2147, 2148, 2149, 5875,
+  5876, 5877, 5878, 5879, 5880, 5881, 2153, 5882,
+  5883, 5884, 5885, 2158, 5886, 2138, 2140, 2168,
+  2177, 5887, 2144, 5888, 5889, 2163, 5890, 5891,
+  5892, 5893, 5894, 5895, 5896, 5897, 5898, 5899,
+  5900, 5901, 5902, 5903, 2175, 5904, 5905, 5906,
+  5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914,
+  5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922,
+  5923, 5924, 5925, 5926, 5927, 5928, 2176, 5929,
+  5930, 5931, 5950, 5932, 5933, 5934, 5935, 5936,
+  5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944,
+  5945, 5946, 5947, 5948, 5949, 5901, 5902, 5903,
+  2175, 5904, 5905, 5906, 5907, 5908, 5909, 5910,
+  5911, 5912, 5913, 5914, 5915, 5916, 5917, 5918,
+  5919, 5920, 5921, 5922, 5923, 5924, 5925, 5926,
+  5927, 5928, 2176, 5929, 5930, 5931, 5950, 5932,
+  5933, 5934, 5935, 5936, 5937, 5938, 5939, 5940,
+  5941, 5942, 5943, 5944, 5945, 5946, 5947, 5948,
+  5949, 5901, 5902, 5903, 2175, 5904, 5905, 5906,
+  5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914,
+  5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922,
+  5923, 5924, 5925, 5926, 5927, 5928, 2176, 5929,
+  5930, 5931, 5950, 5932, 5933, 5934, 5935, 5936,
+  5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944,
+  5945, 5946, 5947, 5948, 5949, 5951, 5952, 0,
+  0, 5953, 5954, 2172, 5955, 5956, 5957, 5958,
+  5959, 5960, 5961, 5962, 5963, 5964, 5965, 5966,
+  5967, 5968, 5969, 5970, 5971, 5972, 5973, 5974,
+  5975, 5976, 5977, 5978, 5979, 5980, 5981, 5982,
+  5983, 5984, 5985, 5986, 5987, 5988, 5989, 5990,
+  5991, 5992, 5993, 5994, 5995, 5996, 5997, 5998,
+  5999, 6000, 6001, 6002, 6003, 6004, 6005, 6006,
+  6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014,
+  6015, 6016, 6017, 6018, 6019, 6020, 6021, 6022,
+  6023, 6024, 2173, 6025, 6026, 6027, 6028, 6029,
+  6030, 6031, 6032, 6033, 6034, 6035, 6036, 2171,
+  6037, 6038, 6039, 6040, 6041, 6042, 6043, 6044,
+  6045, 6046, 6047, 6048, 2170, 6049, 6050, 6051,
+  6052, 6053, 6054, 6055, 6056, 6057, 6058, 6059,
+  6005, 6060, 6061, 6062, 6063, 6010, 6011, 6012,
+  6013, 6014, 6015, 6016, 6017, 6018, 6019, 6020,
+  6021, 6022, 6023, 6024, 2173, 6025, 6026, 6027,
+  6028, 6029, 6030, 6031, 6032, 6033, 6034, 6035,
+  6036, 2171, 6037, 6038, 6039, 6040, 6041, 6042,
+  6043, 6044, 6045, 6046, 6047, 6048, 2170, 6049,
+  6050, 6051, 6052, 6053, 6054, 6055, 6056, 6057,
+  6058, 6059, 6064, 6060, 6061, 6062, 6063, 5953,
+  5954, 2172, 5955, 5956, 5957, 5958, 5959, 5960,
+  5961, 5962, 5963, 5964, 5965, 5966, 5967, 5968,
+  5969, 5970, 5971, 5972, 5973, 5974, 5975, 5976,
+  5977, 5978, 5979, 5980, 5981, 5982, 5983, 5984,
+  5985, 5986, 5987, 5988, 5989, 5990, 5991, 5992,
+  5993, 5994, 5995, 5996, 5997, 5998, 5999, 6000,
+  6001, 6002, 6003, 6004, 6005, 6006, 6007, 6008,
+  6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016,
+  6017, 6018, 6019, 6020, 6021, 6022, 6023, 6024,
+  2173, 6025, 6026, 6027, 6028, 6029, 6030, 6031,
+  6032, 6033, 6034, 6035, 6036, 2171, 6037, 6038,
+  6039, 6040, 6041, 6042, 6043, 6044, 6045, 6046,
+  6047, 6048, 2170, 6049, 6050, 6051, 6052, 6053,
+  6054, 6055, 6056, 6057, 6058, 6059, 6064, 6060,
+  6061, 6062, 6063, 6065, 6066, 0, 0, 6067,
+  6068, 6069, 6070, 6071, 6072, 6073, 6074, 6075,
+  6076, 6067, 6068, 6069, 6070, 6071, 6072, 6073,
+  6074, 6075, 6076, 6067, 6068, 6069, 6070, 6071,
+  6072, 6073, 6074, 6075, 6076, 6067, 6068, 6069,
+  6070, 6071, 6072, 6073, 6074, 6075, 6076, 6077,
+  6078, 6079, 6080, 6081, 6082, 6083, 6084, 6085,
+  6086, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  838, 838, 838, 838, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 838, 838,
+  838, 838, 838, 838, 838, 838, 1153, 838,
+  838, 838, 838, 838, 838, 838, 838, 838,
+  838, 838, 838, 838, 838, 1153, 838, 838,
+  1044, 1044, 1044, 1044, 1044, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 1153, 1153, 1153, 1153,
+  1153, 0, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153,
+  1153, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 540, 540, 540, 540, 540, 540, 540,
+  0, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 540, 540, 540, 540, 540, 540,
+  540, 540, 0, 0, 540, 540, 540, 540,
+  540, 540, 540, 0, 540, 540, 0, 540,
+  540, 540, 540, 540, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1106, 1106, 1106, 1106,
+  1106, 1156, 1156, 1106, 1106, 1106, 1106, 1106,
+  1156, 1106, 1156, 1106, 1106, 1106, 1156, 1106,
+  1156, 1156, 1106, 1106, 1106, 1106, 1156, 1106,
+  1106, 1106, 1156, 1156, 1106, 1156, 1156, 1156,
+  1156, 1156, 1156, 1156, 1106, 1106, 1156, 1156,
+  1156, 1156, 1156, 1106, 1156, 1106, 1106, 1106,
+  1106, 1106, 1156, 1156, 1106, 1106, 1106, 1106,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156,
+  1106, 1156, 1156, 1106, 1106, 1106, 1106, 1156,
+  1156, 1156, 1156, 1106, 1156, 1156, 1156, 1156,
+  1106, 1156, 1156, 1106, 1156, 1106, 1156, 1106,
+  1156, 1156, 1106, 1106, 1106, 1106, 1106, 1156,
+  1156, 1156, 1106, 1156, 1106, 1156, 1106, 1156,
+  1156, 1156, 1156, 1106, 1156, 1156, 1156, 1156,
+  1156, 1156, 1106, 1156, 1156, 1156, 1156, 1156,
+  1156, 1106, 1106, 1156, 1156, 1156, 1106, 1106,
+  1156, 1156, 1156, 1156, 1106, 1156, 1156, 1106,
+  1156, 1156, 1156, 1156, 1106, 1156, 1156, 1106,
+  1156, 1156, 1106, 1156, 1156, 1156, 1106, 1156,
+  1156, 1156, 1156, 1106, 1106, 1156, 1156, 1106,
+  1156, 1156, 1156, 1156, 1156, 1156, 1156, 1106,
+  1156, 1156, 1156, 1156, 1156, 1156, 0, 0,
+  5642, 5642, 5642, 5642, 5642, 5642, 5642, 5642,
+  5642, 553, 553, 553, 553, 553, 553, 553,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 6087, 6088, 6089, 6090, 6091, 6092, 6093,
+  6094, 6095, 6096, 6097, 6098, 6099, 6100, 6101,
+  6102, 6103, 6104, 6105, 6106, 6107, 6108, 6109,
+  6110, 6111, 6112, 6113, 6114, 6115, 6116, 6117,
+  6118, 6119, 6120, 6121, 6122, 6123, 6124, 6125,
+  6126, 6127, 6128, 6129, 6130, 6131, 6132, 6133,
+  6134, 6135, 6136, 6137, 6138, 6139, 6140, 6141,
+  6142, 6143, 6144, 6145, 6146, 6147, 6148, 6149,
+  6150, 6151, 6152, 6153, 6154, 540, 540, 540,
+  540, 540, 540, 1180, 0, 0, 0, 0,
+  0, 1154, 1154, 1154, 1154, 1154, 1154, 1154,
+  1154, 1154, 1154, 0, 0, 0, 0, 1103,
+  1103, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 6155, 6156, 6157, 6158, 0, 6159, 6160,
+  6161, 6162, 6163, 6164, 6165, 6166, 6167, 6168,
+  6169, 6170, 6171, 6172, 6173, 6174, 6175, 6176,
+  6177, 6178, 6179, 6180, 6181, 6182, 6183, 6184,
+  6185, 0, 6156, 6157, 0, 6186, 0, 0,
+  6161, 0, 6163, 6164, 6165, 6166, 6167, 6168,
+  6169, 6170, 6171, 6172, 0, 6174, 6175, 6176,
+  6177, 0, 6179, 0, 6181, 0, 0, 0,
+  0, 0, 0, 6157, 0, 0, 0, 0,
+  6161, 0, 6163, 0, 6165, 0, 6167, 6168,
+  6169, 0, 6171, 6172, 0, 6174, 0, 0,
+  6177, 0, 6179, 0, 6181, 0, 6183, 0,
+  6185, 0, 6156, 6157, 0, 6187, 0, 0,
+  6161, 6162, 6163, 6164, 0, 6166, 6167, 6168,
+  6169, 6170, 6171, 6172, 0, 6174, 6175, 6176,
+  6177, 0, 6179, 6180, 6181, 6182, 0, 6184,
+  0, 6155, 6156, 6157, 6158, 6187, 6159, 6160,
+  6161, 6162, 6163, 0, 6165, 6166, 6167, 6168,
+  6169, 6170, 6171, 6172, 6173, 6174, 6175, 6176,
+  6177, 6178, 6179, 6180, 6181, 0, 0, 0,
+  0, 0, 6188, 6189, 6190, 0, 6191, 6192,
+  6193, 6194, 6195, 0, 6196, 6197, 6198, 6199,
+  6200, 6201, 6202, 6203, 6204, 6205, 6206, 6207,
+  6208, 6209, 6210, 6211, 6212, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1109, 1109, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 77, 77, 77,
+  77, 77, 77, 77, 77, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  0, 0, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 0, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 0, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 6213, 6214, 6215, 6216, 6217, 6218, 6219,
+  6220, 6221, 6222, 6223, 1220, 1220, 0, 0,
+  0, 6224, 6225, 6226, 6227, 6228, 6229, 6230,
+  6231, 6232, 6233, 6234, 6235, 6236, 6237, 6238,
+  6239, 6240, 6241, 6242, 6243, 6244, 6245, 6246,
+  6247, 6248, 6249, 6250, 6251, 6252, 6253, 6254,
+  0, 6255, 6256, 6257, 6258, 6259, 6260, 6261,
+  6262, 6263, 6264, 6265, 6266, 6267, 6268, 6269,
+  6270, 6271, 6272, 6273, 6274, 6275, 6276, 6277,
+  6278, 6279, 6280, 6281, 3613, 6282, 6283, 6284,
+  6285, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 6286, 6287, 0, 0, 0,
+  0, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 6288, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+  1191, 1191, 1191, 1191, 1191, 1191, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 6289,
+  6289, 6289, 6289, 6289, 6289, 6289, 6289, 6289,
+  6289, 6289, 6289, 6289, 6289, 6289, 6289, 6289,
+  6289, 6289, 6289, 6289, 6289, 6289, 6289, 6289,
+  6289, 6290, 6291, 6292, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 6293, 6294, 6295, 6296, 6297, 6298, 6299,
+  6300, 6301, 6302, 6303, 6304, 6305, 6306, 6307,
+  6308, 6309, 6310, 6311, 6312, 6313, 6314, 6315,
+  6316, 6317, 6318, 6319, 6320, 6321, 6322, 6323,
+  6324, 6325, 6326, 6327, 6328, 6329, 6330, 6331,
+  6332, 6333, 6334, 6335, 6336, 0, 0, 0,
+  0, 6337, 6338, 6339, 6340, 6341, 6342, 6343,
+  6344, 6345, 0, 0, 0, 0, 0, 0,
+  0, 6346, 6347, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 2464, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 2464, 2464, 1085, 1085,
+  1085, 1085, 1085, 2464, 2464, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 6348, 6348, 6348, 6348,
+  6348, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 2464, 2464, 1085, 1085, 2464,
+  2464, 2464, 2464, 2464, 2464, 2464, 2464, 2464,
+  2464, 2464, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 6349,
+  6349, 6349, 6349, 1085, 1085, 1085, 1085, 2464,
+  1085, 2464, 2464, 2464, 2464, 2464, 2464, 2464,
+  2464, 2464, 1085, 1085, 1085, 2464, 1085, 1085,
+  1085, 1085, 2464, 2464, 2464, 1085, 2464, 2464,
+  2464, 1085, 1085, 1085, 2465, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 2464, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 2464, 1085,
+  1085, 1085, 1085, 2464, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 2464, 1085, 1085, 1085, 1085, 2464, 2464,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  77, 2465, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 2464, 2464,
+  2464, 1085, 1085, 1085, 2464, 2464, 2464, 2464,
+  2464, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 77,
+  77, 77, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 2464, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 2464, 2464, 2464,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 2464, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 77, 77, 1085, 77, 77,
+  77, 1085, 1085, 1085, 1085, 77, 77, 77,
+  1085, 1085, 77, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 77, 1085, 77, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 77, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 77, 77, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  77, 77, 77, 1085, 1085, 1085, 77, 77,
+  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 77, 77, 77, 77, 77, 77, 77,
+  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 0, 0, 0, 0, 0, 0, 0,
+  0, 77, 77, 77, 77, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 77, 77, 77,
+  77, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 77, 77, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 2464, 2464, 2464, 2464, 2464, 2464, 2464,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 2464,
+  1085, 0, 0, 0, 0, 0, 0, 0,
+  0, 2464, 0, 0, 2464, 2464, 2464, 2464,
+  2464, 2464, 2464, 1085, 1085, 2464, 2464, 2464,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 1085, 1085, 1085, 1085, 1085,
+  1085, 1085, 1085, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1085, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 0,
+  0, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160,
+  1160, 1160, 1160, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 6350, 6351, 6352, 6353, 6354, 4271, 6355,
+  6356, 6357, 6358, 4272, 6359, 6360, 6361, 4273,
+  6362, 6363, 6364, 6365, 6366, 6367, 6368, 6369,
+  6370, 6371, 6372, 6373, 4331, 6374, 6375, 6376,
+  6377, 6378, 6379, 6380, 6381, 6382, 4336, 4274,
+  4275, 4337, 6383, 6384, 4082, 6385, 4276, 6386,
+  6387, 6388, 6389, 6389, 6389, 6390, 6391, 6392,
+  6393, 6394, 6395, 6396, 6397, 6398, 6399, 6400,
+  6401, 6402, 6403, 6404, 6405, 6406, 6407, 6407,
+  4339, 6408, 6409, 6410, 6411, 4278, 6412, 6413,
+  6414, 4235, 6415, 6416, 6417, 6418, 6419, 6420,
+  6421, 6422, 6423, 6424, 6425, 6426, 6427, 6428,
+  6429, 6430, 6431, 6432, 6433, 6434, 6435, 6436,
+  6437, 6438, 6439, 6440, 6440, 6441, 6442, 6443,
+  4078, 6444, 6445, 6446, 6447, 6448, 6449, 6450,
+  6451, 4283, 6452, 6453, 6454, 6455, 6456, 6457,
+  6458, 6459, 6460, 6461, 6462, 6463, 6464, 6465,
+  6466, 6467, 6468, 6469, 6470, 6471, 6472, 4024,
+  6473, 6474, 6475, 6475, 6476, 6477, 6477, 6478,
+  6479, 6480, 6481, 6482, 6483, 6484, 6485, 6486,
+  6487, 6488, 6489, 6490, 4284, 6491, 6492, 6493,
+  6494, 4351, 6494, 6495, 4286, 6496, 6497, 6498,
+  6499, 4287, 3997, 6500, 6501, 6502, 6503, 6504,
+  6505, 6506, 6507, 6508, 6509, 6510, 6511, 6512,
+  6513, 6514, 6515, 6516, 6517, 6518, 6519, 6520,
+  6521, 4288, 6522, 6523, 6524, 6525, 6526, 6527,
+  4290, 6528, 6529, 6530, 6531, 6532, 6533, 6534,
+  6535, 4025, 4359, 6536, 6537, 6538, 6539, 6540,
+  6541, 6542, 6543, 4291, 6544, 6545, 6546, 6547,
+  4402, 6548, 6549, 6550, 6551, 6552, 6553, 6554,
+  6555, 6556, 6557, 6558, 6559, 6560, 4095, 6561,
+  6562, 6563, 6564, 6565, 6566, 6567, 6568, 6569,
+  6570, 6571, 4292, 4182, 6572, 6573, 6574, 6575,
+  6576, 6577, 6578, 6579, 4363, 6580, 6581, 6582,
+  6583, 6584, 6585, 6586, 6587, 4364, 6588, 6589,
+  6590, 6591, 6592, 6593, 6594, 6595, 6596, 6597,
+  6598, 6599, 4366, 6600, 6601, 6602, 6603, 6604,
+  6605, 6606, 6607, 6608, 6609, 6610, 6610, 6611,
+  6612, 4368, 6613, 6614, 6615, 6616, 6617, 6618,
+  6619, 4081, 6620, 6621, 6622, 6623, 6624, 6625,
+  6626, 4374, 6627, 6628, 6629, 6630, 6631, 6632,
+  6632, 4375, 4404, 6633, 6634, 6635, 6636, 6637,
+  4043, 4377, 6638, 6639, 4303, 6640, 6641, 4257,
+  6642, 6643, 4307, 6644, 6645, 6646, 6647, 6647,
+  6648, 6649, 6650, 6651, 6652, 6653, 6654, 6655,
+  6656, 6657, 6658, 6659, 6660, 6661, 6662, 6663,
+  6664, 6665, 6666, 6667, 6668, 6669, 6670, 6671,
+  6672, 6673, 6674, 4313, 6675, 6676, 6677, 6678,
+  6679, 6680, 6681, 6682, 6683, 6684, 6685, 6686,
+  6687, 6688, 6689, 6690, 6476, 6691, 6692, 6693,
+  6694, 6695, 6696, 6697, 6698, 6699, 6700, 6701,
+  6702, 4099, 6703, 6704, 6705, 6706, 6707, 6708,
+  4316, 6709, 6710, 6711, 6712, 6713, 6714, 6715,
+  6716, 6717, 6718, 6719, 6720, 6721, 6722, 6723,
+  6724, 6725, 6726, 6727, 6728, 4038, 6729, 6730,
+  6731, 6732, 6733, 6734, 4384, 6735, 6736, 6737,
+  6738, 6739, 6740, 6741, 6742, 6743, 6744, 6745,
+  6746, 6747, 6748, 6749, 6750, 6751, 6752, 6753,
+  6754, 4389, 4390, 6755, 6756, 6757, 6758, 6759,
+  6760, 6761, 6762, 6763, 6764, 6765, 6766, 6767,
+  4391, 6768, 6769, 6770, 6771, 6772, 6773, 6774,
+  6775, 6776, 6777, 6778, 6779, 6780, 6781, 6782,
+  6783, 6784, 6785, 6786, 6787, 6788, 6789, 6790,
+  6791, 6792, 6793, 6794, 6795, 6796, 6797, 4397,
+  4397, 6798, 6799, 6800, 6801, 6802, 6803, 6804,
+  6805, 6806, 6807, 4398, 6808, 6809, 6810, 6811,
+  6812, 6813, 6814, 6815, 6816, 6817, 6818, 6819,
+  6820, 6821, 6822, 6823, 6824, 6825, 6826, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 81, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053,
+  2053, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 574, 574, 574, 574, 574, 574, 574,
+  574, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984,
+  3984, 3984, 3984, 3984, 3984, 3984, 3984, 0,
   0, };
 
 UTF8PROC_DATA
@@ -13426,966 +13426,966 @@ const utf8proc_property_t utf8proc_properties[] = {
 
 UTF8PROC_DATA
 const utf8proc_uint16_t utf8proc_combinations[] = {
-  0, 46, 192, 193, 194, 195, 196, 197, 0, 
-  256, 258, 260, 550, 461, 0, 0, 512, 
-  514, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7680, 7840, 0, 0, 0, 0, 0, 7842, 
-1, 11, 
-  262, 264, 0, 0, 0, 199, 0, 0, 
-  0, 266, 268, 
-0, 46, 200, 201, 202, 7868, 203, 
-  0, 552, 274, 276, 280, 278, 282, 0, 
-  0, 516, 518, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7864, 0, 7704, 7706, 0, 
-  0, 7866, 
-0, 46, 204, 205, 206, 296, 207, 0, 
-  0, 298, 300, 302, 304, 463, 0, 0, 
-  520, 522, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7882, 0, 0, 7724, 0, 0, 
-  7880, 
-0, 42, 504, 323, 0, 209, 0, 0, 325, 
-  0, 0, 0, 7748, 327, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 7750, 7752, 7754, 
-0, 46, 210, 211, 212, 213, 
-  214, 0, 0, 332, 334, 490, 558, 465, 
-  336, 416, 524, 526, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 7884, 0, 0, 0, 
-  0, 0, 7886, 
-0, 46, 217, 218, 219, 360, 220, 
-  366, 0, 362, 364, 370, 0, 467, 368, 
-  431, 532, 534, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7908, 0, 7798, 7796, 0, 
-  7794, 7910, 
-0, 46, 7922, 221, 374, 7928, 376, 0, 
-  0, 562, 0, 0, 7822, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7924, 0, 0, 0, 0, 0, 
-  7926, 
-0, 46, 224, 225, 226, 227, 228, 229, 0, 
-  257, 259, 261, 551, 462, 0, 0, 513, 
-  515, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7681, 7841, 0, 0, 0, 0, 0, 7843, 
-1, 11, 
-  263, 265, 0, 0, 0, 231, 0, 0, 
-  0, 267, 269, 
-0, 46, 232, 233, 234, 7869, 235, 
-  0, 553, 275, 277, 281, 279, 283, 0, 
-  0, 517, 519, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7865, 0, 7705, 7707, 0, 
-  0, 7867, 
-0, 46, 236, 237, 238, 297, 239, 0, 
-  0, 299, 301, 303, 0, 464, 0, 0, 
-  521, 523, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7883, 0, 0, 7725, 0, 0, 
-  7881, 
-0, 42, 505, 324, 0, 241, 0, 0, 326, 
-  0, 0, 0, 7749, 328, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 7751, 7753, 7755, 
-0, 46, 242, 243, 244, 245, 
-  246, 0, 0, 333, 335, 491, 559, 466, 
-  337, 417, 525, 527, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 7885, 0, 0, 0, 
-  0, 0, 7887, 
-0, 46, 249, 250, 251, 361, 252, 
-  367, 0, 363, 365, 371, 0, 468, 369, 
-  432, 533, 535, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7909, 0, 7799, 7797, 0, 
-  7795, 7911, 
-0, 46, 7923, 253, 375, 7929, 255, 7833, 
-  0, 563, 0, 0, 7823, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7925, 0, 0, 0, 0, 0, 
-  7927, 
-6, 42, 7696, 0, 0, 0, 7690, 270, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7692, 7694, 7698, 
-6, 42, 7697, 0, 
-  0, 0, 7691, 271, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7693, 7695, 7699, 
-1, 11, 500, 284, 0, 0, 0, 
-  290, 7712, 286, 0, 288, 486, 
-1, 11, 501, 285, 
-  0, 0, 0, 291, 7713, 287, 0, 289, 
-  487, 
-2, 44, 292, 0, 7718, 0, 7720, 0, 0, 
-  0, 7714, 542, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7716, 
-  0, 0, 0, 7722, 
-2, 44, 293, 0, 7719, 0, 
-  7721, 0, 0, 0, 7715, 543, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7717, 7830, 0, 0, 7723, 
-2, 2, 308, 
-2, 11, 
-  309, 0, 0, 0, 0, 0, 0, 0, 
-  0, 496, 
-1, 41, 7728, 0, 0, 0, 0, 310, 
-  0, 0, 0, 0, 488, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 7730, 7732, 
-1, 41, 7729, 0, 0, 0, 0, 
-  311, 0, 0, 0, 0, 489, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7731, 7733, 
-1, 42, 313, 0, 0, 0, 
-  0, 315, 0, 0, 0, 0, 317, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7734, 7738, 7740, 
-1, 42, 314, 0, 
-  0, 0, 0, 316, 0, 0, 0, 0, 
-  318, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 7735, 7739, 7741, 
-1, 41, 
-  340, 0, 0, 0, 0, 342, 0, 0, 
-  0, 7768, 344, 0, 0, 528, 530, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7770, 
-  7774, 
-1, 41, 341, 0, 0, 0, 0, 343, 0, 
-  0, 0, 7769, 345, 0, 0, 529, 531, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7771, 7775, 
-1, 40, 346, 348, 0, 0, 0, 350, 
-  0, 0, 0, 7776, 352, 0, 0, 0, 
-  0, 536, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 7778, 
-1, 40, 347, 349, 0, 0, 0, 351, 
-  0, 0, 0, 7777, 353, 0, 0, 0, 
-  0, 537, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 7779, 
-6, 42, 354, 0, 0, 0, 7786, 356, 
-  0, 0, 0, 0, 538, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 7788, 7790, 7792, 
-4, 42, 7831, 
-  0, 355, 0, 0, 0, 7787, 357, 0, 
-  0, 0, 0, 539, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7789, 7791, 7793, 
-0, 40, 7808, 7810, 
-  372, 0, 7812, 0, 0, 0, 0, 0, 
-  7814, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7816, 
-0, 40, 7809, 
-  7811, 373, 0, 7813, 7832, 0, 0, 0, 
-  0, 7815, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7817, 
-1, 41, 
-  377, 7824, 0, 0, 0, 0, 0, 0, 
-  0, 379, 381, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7826, 
-  7828, 
-1, 41, 378, 7825, 0, 0, 0, 0, 0, 
-  0, 0, 380, 382, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7827, 7829, 
-0, 11, 475, 471, 0, 0, 0, 0, 
-  0, 469, 0, 0, 0, 473, 
-0, 11, 476, 472, 
-  0, 0, 0, 0, 0, 470, 0, 0, 
-  0, 474, 
-7, 7, 478, 
-7, 7, 479, 
-7, 7, 480, 
-7, 7, 481, 
-1, 7, 508, 0, 
-  0, 0, 0, 0, 482, 
-1, 7, 509, 0, 0, 
-  0, 0, 0, 483, 
-7, 7, 492, 
-7, 7, 493, 
-11, 11, 494, 
-11, 11, 495, 
-1, 1, 
-  506, 
-1, 1, 507, 
-1, 1, 510, 
-1, 1, 511, 
-7, 7, 554, 
-7, 7, 555, 
-1, 7, 7756, 0, 
-  0, 7758, 0, 0, 556, 
-1, 7, 7757, 0, 0, 
-  7759, 0, 0, 557, 
-7, 7, 560, 
-7, 7, 561, 
-0, 49, 8173, 901, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 8129, 
-0, 50, 
-  8122, 902, 0, 0, 0, 0, 0, 8121, 
-  8120, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7944, 
-  7945, 0, 8124, 
-0, 48, 8136, 904, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7960, 7961, 
-0, 50, 8138, 905, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7976, 7977, 0, 8140, 
-0, 48, 8154, 
-  906, 0, 0, 938, 0, 0, 8153, 8152, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7992, 7993, 
-0, 48, 
-  8184, 908, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 8008, 
-  8009, 
-0, 48, 8170, 910, 0, 0, 939, 0, 0, 
-  8169, 8168, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 8025, 
-0, 50, 8186, 911, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 8040, 8041, 0, 8188, 
-0, 49, 8146, 912, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 8151, 
-0, 50, 8048, 
-  940, 0, 0, 0, 0, 0, 8113, 8112, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7936, 7937, 
-  8118, 8115, 
-0, 48, 8050, 941, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 7952, 7953, 
-0, 50, 8052, 942, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7968, 7969, 8134, 8131, 
-0, 49, 8054, 943, 
-  0, 0, 970, 0, 0, 8145, 8144, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 7984, 7985, 8150, 
-0, 49, 
-  8162, 944, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 8167, 
-0, 49, 8058, 973, 0, 0, 971, 0, 
-  0, 8161, 8160, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 8016, 8017, 8166, 
-0, 48, 8056, 972, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 8000, 8001, 
-0, 50, 8060, 974, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 8032, 8033, 8182, 8179, 
-1, 4, 
-  979, 0, 0, 980, 
-0, 8, 1024, 0, 0, 0, 
-  1025, 0, 0, 0, 1238, 
-1, 1, 1027, 
-4, 4, 1031, 
-1, 1, 1036, 
-0, 8, 
-  1037, 0, 0, 0, 1252, 0, 0, 1250, 
-  1049, 
-4, 12, 1264, 0, 0, 1262, 1038, 0, 0, 
-  0, 1266, 
-0, 8, 1117, 0, 0, 0, 1253, 0, 
-  0, 1251, 1081, 
-0, 8, 1104, 0, 0, 0, 1105, 
-  0, 0, 0, 1239, 
-1, 1, 1107, 
-4, 4, 1111, 
-1, 1, 1116, 
-4, 12, 1265, 
-  0, 0, 1263, 1118, 0, 0, 0, 1267, 
-14, 14, 
-  1142, 
-14, 14, 1143, 
-4, 8, 1244, 0, 0, 0, 1217, 
-4, 8, 1245, 
-  0, 0, 0, 1218, 
-4, 8, 1234, 0, 0, 0, 
-  1232, 
-4, 8, 1235, 0, 0, 0, 1233, 
-4, 4, 1242, 
-4, 4, 1243, 
-4, 4, 
-  1246, 
-4, 4, 1247, 
-4, 4, 1254, 
-4, 4, 1255, 
-4, 4, 1258, 
-4, 4, 1259, 
-4, 4, 1260, 
-4, 4, 1261, 
-4, 4, 
-  1268, 
-4, 4, 1269, 
-4, 4, 1272, 
-4, 4, 1273, 
-17, 19, 1570, 1571, 1573, 
-18, 18, 1572, 
-18, 18, 
-  1574, 
-18, 18, 1728, 
-18, 18, 1730, 
-18, 18, 1747, 
-20, 20, 2345, 
-20, 20, 2353, 
-20, 20, 2356, 
-21, 22, 2507, 
-  2508, 
-23, 25, 2888, 2891, 2892, 
-26, 26, 2964, 
-26, 27, 3020, 3018, 
-27, 27, 3019, 
-28, 28, 
-  3144, 
-29, 29, 3264, 
-29, 31, 3271, 3272, 3274, 
-29, 29, 3275, 
-32, 33, 3402, 3404, 
-32, 32, 
-  3403, 
-34, 36, 3546, 3548, 3550, 
-34, 34, 3549, 
-37, 37, 4134, 
-38, 38, 6918, 
-38, 38, 6920, 
-38, 38, 
-  6922, 
-38, 38, 6924, 
-38, 38, 6926, 
-38, 38, 6930, 
-38, 38, 6971, 
-38, 38, 6973, 
-38, 38, 6976, 
-38, 38, 6977, 
-38, 38, 
-  6979, 
-10, 41, 7682, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7684, 
-  7686, 
-10, 41, 7683, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7685, 
-  7687, 
-1, 1, 7688, 
-1, 1, 7689, 
-0, 1, 7700, 7702, 
-0, 1, 7701, 7703, 
-8, 8, 7708, 
-8, 8, 
-  7709, 
-10, 10, 7710, 
-10, 10, 7711, 
-1, 1, 7726, 
-1, 1, 7727, 
-7, 7, 7736, 
-7, 7, 7737, 
-1, 40, 7742, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7744, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7746, 
-1, 40, 7743, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7745, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7747, 
-0, 1, 7760, 
-  7762, 
-0, 1, 7761, 7763, 
-1, 10, 7764, 0, 0, 0, 0, 
-  0, 0, 0, 0, 7766, 
-1, 10, 7765, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7767, 
-7, 7, 7772, 
-7, 7, 
-  7773, 
-10, 10, 7780, 
-10, 10, 7781, 
-10, 10, 7782, 
-10, 10, 7783, 
-10, 10, 7784, 
-10, 10, 7785, 
-1, 1, 7800, 
-1, 1, 
-  7801, 
-4, 4, 7802, 
-4, 4, 7803, 
-3, 40, 7804, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7806, 
-3, 40, 7805, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7807, 
-4, 10, 7820, 
-  0, 0, 0, 0, 0, 7818, 
-4, 10, 7821, 0, 
-  0, 0, 0, 0, 7819, 
-10, 10, 7835, 
-0, 46, 7846, 7844, 
-  0, 7850, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 7848, 
-0, 46, 7847, 7845, 0, 
-  7851, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7849, 
-2, 8, 7852, 0, 0, 0, 
-  0, 0, 7862, 
-2, 8, 7853, 0, 0, 0, 0, 
-  0, 7863, 
-0, 46, 7856, 7854, 0, 7860, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7858, 
-0, 46, 7857, 7855, 0, 7861, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7859, 
-0, 46, 
-  7872, 7870, 0, 7876, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7874, 
-0, 46, 7873, 
-  7871, 0, 7877, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 7875, 
-2, 2, 7878, 
-2, 2, 7879, 
-0, 46, 
-  7890, 7888, 0, 7894, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7892, 
-0, 46, 7891, 
-  7889, 0, 7895, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 7893, 
-2, 2, 7896, 
-2, 2, 7897, 
-0, 46, 
-  7900, 7898, 0, 7904, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7906, 0, 0, 0, 0, 0, 7902, 
-0, 46, 7901, 
-  7899, 0, 7905, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7907, 
-  0, 0, 0, 0, 0, 7903, 
-0, 46, 7914, 7912, 
-  0, 7918, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7920, 0, 
-  0, 0, 0, 0, 7916, 
-0, 46, 7915, 7913, 0, 
-  7919, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 7921, 0, 0, 
-  0, 0, 0, 7917, 
-0, 50, 7938, 7940, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 7942, 8064, 
-0, 50, 7939, 
-  7941, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  7943, 8065, 
-0, 50, 7946, 7948, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7950, 8072, 
-0, 50, 7947, 7949, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 7951, 8073, 
-0, 1, 
-  7954, 7956, 
-0, 1, 7955, 7957, 
-0, 1, 7962, 7964, 
-0, 1, 7963, 7965, 
-0, 50, 
-  7970, 7972, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 7974, 8080, 
-0, 50, 7971, 7973, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 7975, 8081, 
-0, 50, 7978, 7980, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7982, 
-  8088, 
-0, 50, 7979, 7981, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 7983, 8089, 
-0, 49, 7986, 7988, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 7990, 
-0, 49, 7987, 7989, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 7991, 
-0, 49, 
-  7994, 7996, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 7998, 
-0, 49, 7995, 7997, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 7999, 
-0, 1, 8002, 8004, 
-0, 1, 8003, 8005, 
-0, 1, 
-  8010, 8012, 
-0, 1, 8011, 8013, 
-0, 49, 8018, 8020, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 8022, 
-0, 49, 8019, 8021, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 8023, 
-0, 49, 
-  8027, 8029, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 8031, 
-0, 50, 8034, 8036, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 8038, 8096, 
-0, 50, 8035, 8037, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 8039, 8097, 
-0, 50, 
-  8042, 8044, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 8046, 8104, 
-0, 50, 8043, 8045, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 8047, 8105, 
-50, 50, 8066, 
-50, 50, 8067, 
-50, 50, 
-  8068, 
-50, 50, 8069, 
-50, 50, 8070, 
-50, 50, 8071, 
-50, 50, 8074, 
-50, 50, 8075, 
-50, 50, 8076, 
-50, 50, 8077, 
-50, 50, 
-  8078, 
-50, 50, 8079, 
-50, 50, 8082, 
-50, 50, 8083, 
-50, 50, 8084, 
-50, 50, 8085, 
-50, 50, 8086, 
-50, 50, 8087, 
-50, 50, 
-  8090, 
-50, 50, 8091, 
-50, 50, 8092, 
-50, 50, 8093, 
-50, 50, 8094, 
-50, 50, 8095, 
-50, 50, 8098, 
-50, 50, 8099, 
-50, 50, 
-  8100, 
-50, 50, 8101, 
-50, 50, 8102, 
-50, 50, 8103, 
-50, 50, 8106, 
-50, 50, 8107, 
-50, 50, 8108, 
-50, 50, 8109, 
-50, 50, 
-  8110, 
-50, 50, 8111, 
-50, 50, 8114, 
-50, 50, 8116, 
-50, 50, 8119, 
-50, 50, 8130, 
-50, 50, 8132, 
-50, 50, 8135, 
-0, 49, 
-  8141, 8142, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 8143, 
-0, 49, 8157, 8158, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 8159, 
-47, 48, 8164, 8165, 
-48, 48, 8172, 
-50, 50, 8178, 
-50, 50, 
-  8180, 
-50, 50, 8183, 
-51, 51, 8602, 
-51, 51, 8603, 
-51, 51, 8622, 
-51, 51, 8653, 
-51, 51, 8654, 
-51, 51, 8655, 
-51, 51, 
-  8708, 
-51, 51, 8713, 
-51, 51, 8716, 
-51, 51, 8740, 
-51, 51, 8742, 
-51, 51, 8769, 
-51, 51, 8772, 
-51, 51, 8775, 
-51, 51, 
-  8777, 
-51, 51, 8800, 
-51, 51, 8802, 
-51, 51, 8813, 
-51, 51, 8814, 
-51, 51, 8815, 
-51, 51, 8816, 
-51, 51, 8817, 
-51, 51, 
-  8820, 
-51, 51, 8821, 
-51, 51, 8824, 
-51, 51, 8825, 
-51, 51, 8832, 
-51, 51, 8833, 
-51, 51, 8836, 
-51, 51, 8837, 
-51, 51, 
-  8840, 
-51, 51, 8841, 
-51, 51, 8876, 
-51, 51, 8877, 
-51, 51, 8878, 
-51, 51, 8879, 
-51, 51, 8928, 
-51, 51, 8929, 
-51, 51, 
-  8930, 
-51, 51, 8931, 
-51, 51, 8938, 
-51, 51, 8939, 
-51, 51, 8940, 
-51, 51, 8941, 
-51, 51, 10972, 
-52, 52, 12364, 
-52, 52, 
-  12366, 
-52, 52, 12368, 
-52, 52, 12370, 
-52, 52, 12372, 
-52, 52, 12374, 
-52, 52, 12376, 
-52, 52, 12378, 
-52, 52, 12380, 
-52, 52, 
-  12382, 
-52, 52, 12384, 
-52, 52, 12386, 
-52, 52, 12389, 
-52, 52, 12391, 
-52, 52, 12393, 
-52, 53, 12400, 12401, 
-52, 53, 
-  12403, 12404, 
-52, 53, 12406, 12407, 
-52, 53, 12409, 12410, 
-52, 53, 12412, 12413, 
-52, 52, 
-  12436, 
-52, 52, 12446, 
-52, 52, 12460, 
-52, 52, 12462, 
-52, 52, 12464, 
-52, 52, 12466, 
-52, 52, 12468, 
-52, 52, 12470, 
-52, 52, 
-  12472, 
-52, 52, 12474, 
-52, 52, 12476, 
-52, 52, 12478, 
-52, 52, 12480, 
-52, 52, 12482, 
-52, 52, 12485, 
-52, 52, 12487, 
-52, 52, 
-  12489, 
-52, 53, 12496, 12497, 
-52, 53, 12499, 12500, 
-52, 53, 12502, 12503, 
-52, 53, 12505, 
-  12506, 
-52, 53, 12508, 12509, 
-52, 52, 12532, 
-52, 52, 12535, 
-52, 52, 12536, 
-52, 52, 12537, 
-52, 52, 12538, 
-52, 52, 
-  12542, 
-54, 55, 1, 4250, 
-54, 55, 1, 4252, 
-54, 55, 1, 4267, 
-56, 57, 1, 4398, 
-56, 57, 1, 4399, 
-58, 61, 1, 4939, 1, 4940, 
-62, 67, 
-  1, 5307, 1, 5308, 1, 5310, 
-68, 69, 1, 5562, 
-68, 69, 1, 5563, 
-70, 71, 1, 53598, 
-70, 71, 1, 53599, 
-72, 81, 1, 53600, 
-  1, 53601, 1, 53602, 1, 53603, 1, 53604, 
-70, 71, 1, 53691, 
-70, 71, 1, 53692, 
-72, 75, 1, 53693, 1, 53695, 
-72, 75, 
-  1, 53694, 1, 53696, 
+  0, 46, 192, 193, 194, 195, 196, 197, 0,
+  256, 258, 260, 550, 461, 0, 0, 512,
+  514, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7680, 7840, 0, 0, 0, 0, 0, 7842,
+1, 11,
+  262, 264, 0, 0, 0, 199, 0, 0,
+  0, 266, 268,
+0, 46, 200, 201, 202, 7868, 203,
+  0, 552, 274, 276, 280, 278, 282, 0,
+  0, 516, 518, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7864, 0, 7704, 7706, 0,
+  0, 7866,
+0, 46, 204, 205, 206, 296, 207, 0,
+  0, 298, 300, 302, 304, 463, 0, 0,
+  520, 522, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7882, 0, 0, 7724, 0, 0,
+  7880,
+0, 42, 504, 323, 0, 209, 0, 0, 325,
+  0, 0, 0, 7748, 327, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 7750, 7752, 7754,
+0, 46, 210, 211, 212, 213,
+  214, 0, 0, 332, 334, 490, 558, 465,
+  336, 416, 524, 526, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 7884, 0, 0, 0,
+  0, 0, 7886,
+0, 46, 217, 218, 219, 360, 220,
+  366, 0, 362, 364, 370, 0, 467, 368,
+  431, 532, 534, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7908, 0, 7798, 7796, 0,
+  7794, 7910,
+0, 46, 7922, 221, 374, 7928, 376, 0,
+  0, 562, 0, 0, 7822, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7924, 0, 0, 0, 0, 0,
+  7926,
+0, 46, 224, 225, 226, 227, 228, 229, 0,
+  257, 259, 261, 551, 462, 0, 0, 513,
+  515, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7681, 7841, 0, 0, 0, 0, 0, 7843,
+1, 11,
+  263, 265, 0, 0, 0, 231, 0, 0,
+  0, 267, 269,
+0, 46, 232, 233, 234, 7869, 235,
+  0, 553, 275, 277, 281, 279, 283, 0,
+  0, 517, 519, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7865, 0, 7705, 7707, 0,
+  0, 7867,
+0, 46, 236, 237, 238, 297, 239, 0,
+  0, 299, 301, 303, 0, 464, 0, 0,
+  521, 523, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7883, 0, 0, 7725, 0, 0,
+  7881,
+0, 42, 505, 324, 0, 241, 0, 0, 326,
+  0, 0, 0, 7749, 328, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 7751, 7753, 7755,
+0, 46, 242, 243, 244, 245,
+  246, 0, 0, 333, 335, 491, 559, 466,
+  337, 417, 525, 527, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 7885, 0, 0, 0,
+  0, 0, 7887,
+0, 46, 249, 250, 251, 361, 252,
+  367, 0, 363, 365, 371, 0, 468, 369,
+  432, 533, 535, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7909, 0, 7799, 7797, 0,
+  7795, 7911,
+0, 46, 7923, 253, 375, 7929, 255, 7833,
+  0, 563, 0, 0, 7823, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7925, 0, 0, 0, 0, 0,
+  7927,
+6, 42, 7696, 0, 0, 0, 7690, 270, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7692, 7694, 7698,
+6, 42, 7697, 0,
+  0, 0, 7691, 271, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7693, 7695, 7699,
+1, 11, 500, 284, 0, 0, 0,
+  290, 7712, 286, 0, 288, 486,
+1, 11, 501, 285,
+  0, 0, 0, 291, 7713, 287, 0, 289,
+  487,
+2, 44, 292, 0, 7718, 0, 7720, 0, 0,
+  0, 7714, 542, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7716,
+  0, 0, 0, 7722,
+2, 44, 293, 0, 7719, 0,
+  7721, 0, 0, 0, 7715, 543, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7717, 7830, 0, 0, 7723,
+2, 2, 308,
+2, 11,
+  309, 0, 0, 0, 0, 0, 0, 0,
+  0, 496,
+1, 41, 7728, 0, 0, 0, 0, 310,
+  0, 0, 0, 0, 488, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 7730, 7732,
+1, 41, 7729, 0, 0, 0, 0,
+  311, 0, 0, 0, 0, 489, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7731, 7733,
+1, 42, 313, 0, 0, 0,
+  0, 315, 0, 0, 0, 0, 317, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7734, 7738, 7740,
+1, 42, 314, 0,
+  0, 0, 0, 316, 0, 0, 0, 0,
+  318, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 7735, 7739, 7741,
+1, 41,
+  340, 0, 0, 0, 0, 342, 0, 0,
+  0, 7768, 344, 0, 0, 528, 530, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7770,
+  7774,
+1, 41, 341, 0, 0, 0, 0, 343, 0,
+  0, 0, 7769, 345, 0, 0, 529, 531,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7771, 7775,
+1, 40, 346, 348, 0, 0, 0, 350,
+  0, 0, 0, 7776, 352, 0, 0, 0,
+  0, 536, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 7778,
+1, 40, 347, 349, 0, 0, 0, 351,
+  0, 0, 0, 7777, 353, 0, 0, 0,
+  0, 537, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 7779,
+6, 42, 354, 0, 0, 0, 7786, 356,
+  0, 0, 0, 0, 538, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 7788, 7790, 7792,
+4, 42, 7831,
+  0, 355, 0, 0, 0, 7787, 357, 0,
+  0, 0, 0, 539, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7789, 7791, 7793,
+0, 40, 7808, 7810,
+  372, 0, 7812, 0, 0, 0, 0, 0,
+  7814, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7816,
+0, 40, 7809,
+  7811, 373, 0, 7813, 7832, 0, 0, 0,
+  0, 7815, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7817,
+1, 41,
+  377, 7824, 0, 0, 0, 0, 0, 0,
+  0, 379, 381, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7826,
+  7828,
+1, 41, 378, 7825, 0, 0, 0, 0, 0,
+  0, 0, 380, 382, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7827, 7829,
+0, 11, 475, 471, 0, 0, 0, 0,
+  0, 469, 0, 0, 0, 473,
+0, 11, 476, 472,
+  0, 0, 0, 0, 0, 470, 0, 0,
+  0, 474,
+7, 7, 478,
+7, 7, 479,
+7, 7, 480,
+7, 7, 481,
+1, 7, 508, 0,
+  0, 0, 0, 0, 482,
+1, 7, 509, 0, 0,
+  0, 0, 0, 483,
+7, 7, 492,
+7, 7, 493,
+11, 11, 494,
+11, 11, 495,
+1, 1,
+  506,
+1, 1, 507,
+1, 1, 510,
+1, 1, 511,
+7, 7, 554,
+7, 7, 555,
+1, 7, 7756, 0,
+  0, 7758, 0, 0, 556,
+1, 7, 7757, 0, 0,
+  7759, 0, 0, 557,
+7, 7, 560,
+7, 7, 561,
+0, 49, 8173, 901,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 8129,
+0, 50,
+  8122, 902, 0, 0, 0, 0, 0, 8121,
+  8120, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7944,
+  7945, 0, 8124,
+0, 48, 8136, 904, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7960, 7961,
+0, 50, 8138, 905, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7976, 7977, 0, 8140,
+0, 48, 8154,
+  906, 0, 0, 938, 0, 0, 8153, 8152,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7992, 7993,
+0, 48,
+  8184, 908, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 8008,
+  8009,
+0, 48, 8170, 910, 0, 0, 939, 0, 0,
+  8169, 8168, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 8025,
+0, 50, 8186, 911, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 8040, 8041, 0, 8188,
+0, 49, 8146, 912, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 8151,
+0, 50, 8048,
+  940, 0, 0, 0, 0, 0, 8113, 8112,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7936, 7937,
+  8118, 8115,
+0, 48, 8050, 941, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 7952, 7953,
+0, 50, 8052, 942, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7968, 7969, 8134, 8131,
+0, 49, 8054, 943,
+  0, 0, 970, 0, 0, 8145, 8144, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 7984, 7985, 8150,
+0, 49,
+  8162, 944, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 8167,
+0, 49, 8058, 973, 0, 0, 971, 0,
+  0, 8161, 8160, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 8016, 8017, 8166,
+0, 48, 8056, 972, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 8000, 8001,
+0, 50, 8060, 974, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 8032, 8033, 8182, 8179,
+1, 4,
+  979, 0, 0, 980,
+0, 8, 1024, 0, 0, 0,
+  1025, 0, 0, 0, 1238,
+1, 1, 1027,
+4, 4, 1031,
+1, 1, 1036,
+0, 8,
+  1037, 0, 0, 0, 1252, 0, 0, 1250,
+  1049,
+4, 12, 1264, 0, 0, 1262, 1038, 0, 0,
+  0, 1266,
+0, 8, 1117, 0, 0, 0, 1253, 0,
+  0, 1251, 1081,
+0, 8, 1104, 0, 0, 0, 1105,
+  0, 0, 0, 1239,
+1, 1, 1107,
+4, 4, 1111,
+1, 1, 1116,
+4, 12, 1265,
+  0, 0, 1263, 1118, 0, 0, 0, 1267,
+14, 14,
+  1142,
+14, 14, 1143,
+4, 8, 1244, 0, 0, 0, 1217,
+4, 8, 1245,
+  0, 0, 0, 1218,
+4, 8, 1234, 0, 0, 0,
+  1232,
+4, 8, 1235, 0, 0, 0, 1233,
+4, 4, 1242,
+4, 4, 1243,
+4, 4,
+  1246,
+4, 4, 1247,
+4, 4, 1254,
+4, 4, 1255,
+4, 4, 1258,
+4, 4, 1259,
+4, 4, 1260,
+4, 4, 1261,
+4, 4,
+  1268,
+4, 4, 1269,
+4, 4, 1272,
+4, 4, 1273,
+17, 19, 1570, 1571, 1573,
+18, 18, 1572,
+18, 18,
+  1574,
+18, 18, 1728,
+18, 18, 1730,
+18, 18, 1747,
+20, 20, 2345,
+20, 20, 2353,
+20, 20, 2356,
+21, 22, 2507,
+  2508,
+23, 25, 2888, 2891, 2892,
+26, 26, 2964,
+26, 27, 3020, 3018,
+27, 27, 3019,
+28, 28,
+  3144,
+29, 29, 3264,
+29, 31, 3271, 3272, 3274,
+29, 29, 3275,
+32, 33, 3402, 3404,
+32, 32,
+  3403,
+34, 36, 3546, 3548, 3550,
+34, 34, 3549,
+37, 37, 4134,
+38, 38, 6918,
+38, 38, 6920,
+38, 38,
+  6922,
+38, 38, 6924,
+38, 38, 6926,
+38, 38, 6930,
+38, 38, 6971,
+38, 38, 6973,
+38, 38, 6976,
+38, 38, 6977,
+38, 38,
+  6979,
+10, 41, 7682, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7684,
+  7686,
+10, 41, 7683, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7685,
+  7687,
+1, 1, 7688,
+1, 1, 7689,
+0, 1, 7700, 7702,
+0, 1, 7701, 7703,
+8, 8, 7708,
+8, 8,
+  7709,
+10, 10, 7710,
+10, 10, 7711,
+1, 1, 7726,
+1, 1, 7727,
+7, 7, 7736,
+7, 7, 7737,
+1, 40, 7742,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7744, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7746,
+1, 40, 7743,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7745, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7747,
+0, 1, 7760,
+  7762,
+0, 1, 7761, 7763,
+1, 10, 7764, 0, 0, 0, 0,
+  0, 0, 0, 0, 7766,
+1, 10, 7765, 0, 0,
+  0, 0, 0, 0, 0, 0, 7767,
+7, 7, 7772,
+7, 7,
+  7773,
+10, 10, 7780,
+10, 10, 7781,
+10, 10, 7782,
+10, 10, 7783,
+10, 10, 7784,
+10, 10, 7785,
+1, 1, 7800,
+1, 1,
+  7801,
+4, 4, 7802,
+4, 4, 7803,
+3, 40, 7804, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7806,
+3, 40, 7805, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7807,
+4, 10, 7820,
+  0, 0, 0, 0, 0, 7818,
+4, 10, 7821, 0,
+  0, 0, 0, 0, 7819,
+10, 10, 7835,
+0, 46, 7846, 7844,
+  0, 7850, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 7848,
+0, 46, 7847, 7845, 0,
+  7851, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7849,
+2, 8, 7852, 0, 0, 0,
+  0, 0, 7862,
+2, 8, 7853, 0, 0, 0, 0,
+  0, 7863,
+0, 46, 7856, 7854, 0, 7860, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7858,
+0, 46, 7857, 7855, 0, 7861, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7859,
+0, 46,
+  7872, 7870, 0, 7876, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7874,
+0, 46, 7873,
+  7871, 0, 7877, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 7875,
+2, 2, 7878,
+2, 2, 7879,
+0, 46,
+  7890, 7888, 0, 7894, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7892,
+0, 46, 7891,
+  7889, 0, 7895, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 7893,
+2, 2, 7896,
+2, 2, 7897,
+0, 46,
+  7900, 7898, 0, 7904, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7906, 0, 0, 0, 0, 0, 7902,
+0, 46, 7901,
+  7899, 0, 7905, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7907,
+  0, 0, 0, 0, 0, 7903,
+0, 46, 7914, 7912,
+  0, 7918, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7920, 0,
+  0, 0, 0, 0, 7916,
+0, 46, 7915, 7913, 0,
+  7919, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 7921, 0, 0,
+  0, 0, 0, 7917,
+0, 50, 7938, 7940, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 7942, 8064,
+0, 50, 7939,
+  7941, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  7943, 8065,
+0, 50, 7946, 7948, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7950, 8072,
+0, 50, 7947, 7949, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 7951, 8073,
+0, 1,
+  7954, 7956,
+0, 1, 7955, 7957,
+0, 1, 7962, 7964,
+0, 1, 7963, 7965,
+0, 50,
+  7970, 7972, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 7974, 8080,
+0, 50, 7971, 7973, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 7975, 8081,
+0, 50, 7978, 7980,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7982,
+  8088,
+0, 50, 7979, 7981, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 7983, 8089,
+0, 49, 7986, 7988, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 7990,
+0, 49, 7987, 7989,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7991,
+0, 49,
+  7994, 7996, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 7998,
+0, 49, 7995, 7997, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 7999,
+0, 1, 8002, 8004,
+0, 1, 8003, 8005,
+0, 1,
+  8010, 8012,
+0, 1, 8011, 8013,
+0, 49, 8018, 8020, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 8022,
+0, 49, 8019, 8021,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 8023,
+0, 49,
+  8027, 8029, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 8031,
+0, 50, 8034, 8036, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 8038, 8096,
+0, 50, 8035, 8037, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 8039, 8097,
+0, 50,
+  8042, 8044, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 8046, 8104,
+0, 50, 8043, 8045, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 8047, 8105,
+50, 50, 8066,
+50, 50, 8067,
+50, 50,
+  8068,
+50, 50, 8069,
+50, 50, 8070,
+50, 50, 8071,
+50, 50, 8074,
+50, 50, 8075,
+50, 50, 8076,
+50, 50, 8077,
+50, 50,
+  8078,
+50, 50, 8079,
+50, 50, 8082,
+50, 50, 8083,
+50, 50, 8084,
+50, 50, 8085,
+50, 50, 8086,
+50, 50, 8087,
+50, 50,
+  8090,
+50, 50, 8091,
+50, 50, 8092,
+50, 50, 8093,
+50, 50, 8094,
+50, 50, 8095,
+50, 50, 8098,
+50, 50, 8099,
+50, 50,
+  8100,
+50, 50, 8101,
+50, 50, 8102,
+50, 50, 8103,
+50, 50, 8106,
+50, 50, 8107,
+50, 50, 8108,
+50, 50, 8109,
+50, 50,
+  8110,
+50, 50, 8111,
+50, 50, 8114,
+50, 50, 8116,
+50, 50, 8119,
+50, 50, 8130,
+50, 50, 8132,
+50, 50, 8135,
+0, 49,
+  8141, 8142, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 8143,
+0, 49, 8157, 8158, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 8159,
+47, 48, 8164, 8165,
+48, 48, 8172,
+50, 50, 8178,
+50, 50,
+  8180,
+50, 50, 8183,
+51, 51, 8602,
+51, 51, 8603,
+51, 51, 8622,
+51, 51, 8653,
+51, 51, 8654,
+51, 51, 8655,
+51, 51,
+  8708,
+51, 51, 8713,
+51, 51, 8716,
+51, 51, 8740,
+51, 51, 8742,
+51, 51, 8769,
+51, 51, 8772,
+51, 51, 8775,
+51, 51,
+  8777,
+51, 51, 8800,
+51, 51, 8802,
+51, 51, 8813,
+51, 51, 8814,
+51, 51, 8815,
+51, 51, 8816,
+51, 51, 8817,
+51, 51,
+  8820,
+51, 51, 8821,
+51, 51, 8824,
+51, 51, 8825,
+51, 51, 8832,
+51, 51, 8833,
+51, 51, 8836,
+51, 51, 8837,
+51, 51,
+  8840,
+51, 51, 8841,
+51, 51, 8876,
+51, 51, 8877,
+51, 51, 8878,
+51, 51, 8879,
+51, 51, 8928,
+51, 51, 8929,
+51, 51,
+  8930,
+51, 51, 8931,
+51, 51, 8938,
+51, 51, 8939,
+51, 51, 8940,
+51, 51, 8941,
+51, 51, 10972,
+52, 52, 12364,
+52, 52,
+  12366,
+52, 52, 12368,
+52, 52, 12370,
+52, 52, 12372,
+52, 52, 12374,
+52, 52, 12376,
+52, 52, 12378,
+52, 52, 12380,
+52, 52,
+  12382,
+52, 52, 12384,
+52, 52, 12386,
+52, 52, 12389,
+52, 52, 12391,
+52, 52, 12393,
+52, 53, 12400, 12401,
+52, 53,
+  12403, 12404,
+52, 53, 12406, 12407,
+52, 53, 12409, 12410,
+52, 53, 12412, 12413,
+52, 52,
+  12436,
+52, 52, 12446,
+52, 52, 12460,
+52, 52, 12462,
+52, 52, 12464,
+52, 52, 12466,
+52, 52, 12468,
+52, 52, 12470,
+52, 52,
+  12472,
+52, 52, 12474,
+52, 52, 12476,
+52, 52, 12478,
+52, 52, 12480,
+52, 52, 12482,
+52, 52, 12485,
+52, 52, 12487,
+52, 52,
+  12489,
+52, 53, 12496, 12497,
+52, 53, 12499, 12500,
+52, 53, 12502, 12503,
+52, 53, 12505,
+  12506,
+52, 53, 12508, 12509,
+52, 52, 12532,
+52, 52, 12535,
+52, 52, 12536,
+52, 52, 12537,
+52, 52, 12538,
+52, 52,
+  12542,
+54, 55, 1, 4250,
+54, 55, 1, 4252,
+54, 55, 1, 4267,
+56, 57, 1, 4398,
+56, 57, 1, 4399,
+58, 61, 1, 4939, 1, 4940,
+62, 67,
+  1, 5307, 1, 5308, 1, 5310,
+68, 69, 1, 5562,
+68, 69, 1, 5563,
+70, 71, 1, 53598,
+70, 71, 1, 53599,
+72, 81, 1, 53600,
+  1, 53601, 1, 53602, 1, 53603, 1, 53604,
+70, 71, 1, 53691,
+70, 71, 1, 53692,
+72, 75, 1, 53693, 1, 53695,
+72, 75,
+  1, 53694, 1, 53696,
 };
 
diff --git a/subversion/libsvn_subr/version.c b/subversion/libsvn_subr/version.c
index f0a6704..1c50ad0 100644
--- a/subversion/libsvn_subr/version.c
+++ b/subversion/libsvn_subr/version.c
@@ -143,7 +143,7 @@ svn_version_extended(svn_boolean_t verbose,
   info->build_time = __TIME__;
   info->build_host = SVN_BUILD_HOST;
   info->copyright = apr_pstrdup
-    (pool, _("Copyright (C) 2019 The Apache Software Foundation.\n"
+    (pool, _("Copyright (C) 2020 The Apache Software Foundation.\n"
              "This software consists of contributions made by many people;\n"
              "see the NOTICE file for more information.\n"
              "Subversion is open source software, see "
diff --git a/subversion/libsvn_subr/x509parse.c b/subversion/libsvn_subr/x509parse.c
index a121575..9459432 100644
--- a/subversion/libsvn_subr/x509parse.c
+++ b/subversion/libsvn_subr/x509parse.c
@@ -262,7 +262,7 @@ x509_get_alg(const unsigned char **p, const unsigned char *end, x509_buf * alg)
 
   if (*p == end)
     return SVN_NO_ERROR;
-  
+
   /* The OID encoding of 1.2.840.113549.1.1.10 (id-RSASSA-PSS) */
 #define OID_RSASSA_PSS "\x2a\x86\x48\x86\xf7\x0d\x01\x01\x0a"
 
diff --git a/subversion/libsvn_wc/conflicts.c b/subversion/libsvn_wc/conflicts.c
index ab5db31..b4bc6c0 100644
--- a/subversion/libsvn_wc/conflicts.c
+++ b/subversion/libsvn_wc/conflicts.c
@@ -1386,7 +1386,7 @@ generate_propconflict(svn_boolean_t *conflict_remains,
         }
       case svn_wc_conflict_choose_merged:
         {
-          if (!cdesc->merged_file 
+          if (!cdesc->merged_file
               && (!result->merged_file && !result->merged_value))
             return svn_error_create
                 (SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
@@ -2381,7 +2381,7 @@ svn_wc__read_conflict_descriptions2_t(const apr_array_header_t **conflicts,
                                       apr_pool_t *result_pool,
                                       apr_pool_t *scratch_pool)
 {
-  return svn_wc__read_conflicts(conflicts, NULL, wc_ctx->db, local_abspath, 
+  return svn_wc__read_conflicts(conflicts, NULL, wc_ctx->db, local_abspath,
                                 FALSE, FALSE, result_pool, scratch_pool);
 }
 
@@ -2637,7 +2637,7 @@ resolve_prop_conflict_on_node(svn_boolean_t *did_resolve,
   return SVN_NO_ERROR;
 }
 
-/* 
+/*
  * Record a tree conflict resolution failure due to error condition ERR
  * in the RESOLVE_LATER hash table. If the hash table is not available
  * (meaning the caller does not wish to retry resolution later), or if
@@ -3965,8 +3965,8 @@ svn_wc__guess_incoming_move_target_nodes(apr_array_header_t **possible_targets,
         {
           insert_index = (*possible_targets)->nelts; /* append */
         }
-      svn_sort__array_insert(*possible_targets, &moved_to_abspath,
-                             insert_index);
+      SVN_ERR(svn_sort__array_insert2(*possible_targets, &moved_to_abspath,
+                                      insert_index));
     }
 
   svn_pool_destroy(iterpool);
diff --git a/subversion/libsvn_wc/conflicts.h b/subversion/libsvn_wc/conflicts.h
index d4a6742..a566457 100644
--- a/subversion/libsvn_wc/conflicts.h
+++ b/subversion/libsvn_wc/conflicts.h
@@ -220,7 +220,7 @@ svn_wc__conflict_skel_add_prop_conflict(svn_skel_t *conflict_skel,
    with (1), MOVE_SRC_OP_ROOT_ABSPATH should be A/B for a conflict
    associated with (2).
    MOVE_DST_OP_ROOT_ABSPATH is the op-root of the move target (i.e. the
-   op-root of the corresponding copy). This needs to be stored because 
+   op-root of the corresponding copy). This needs to be stored because
    moves in the NODE table do not always persist after an update, while
    the conflict resolver may need information about the pre-update state
    of the move.
diff --git a/subversion/libsvn_wc/entries.c b/subversion/libsvn_wc/entries.c
index 5748aa3..c7e3ae0 100644
--- a/subversion/libsvn_wc/entries.c
+++ b/subversion/libsvn_wc/entries.c
@@ -781,7 +781,7 @@ read_one_entry(const svn_wc_entry_t **new_entry,
               if (parent_root_url != NULL
                        && strcmp(original_root_url, parent_root_url) == 0)
                 {
-                  
+
                   const char *relpath_to_entry = svn_dirent_is_child(
                     op_root_abspath, entry_abspath, NULL);
                   const char *entry_repos_relpath = svn_relpath_join(
@@ -1049,7 +1049,7 @@ read_entries_new(apr_hash_t **result_entries,
       svn_pool_clear(iterpool);
 
       SVN_ERR(read_one_entry(&entry,
-                             db, dir_abspath, 
+                             db, dir_abspath,
                              wcroot, dir_relpath,
                              name, parent_entry,
                              result_pool, iterpool));
diff --git a/subversion/libsvn_wc/upgrade.c b/subversion/libsvn_wc/upgrade.c
index 0a218c7..67791c6 100644
--- a/subversion/libsvn_wc/upgrade.c
+++ b/subversion/libsvn_wc/upgrade.c
@@ -1667,7 +1667,7 @@ svn_wc__upgrade_sdb(int *result_format,
                                "use the current client"),
                              svn_dirent_local_style(wcroot_abspath,
                                                     scratch_pool),
-                             start_format);                             
+                             start_format);
 
   /* ### need lock-out. only one upgrade at a time. note that other code
      ### cannot use this un-upgraded database until we finish the upgrade.  */
diff --git a/subversion/libsvn_wc/wc-queries.sql b/subversion/libsvn_wc/wc-queries.sql
index 7ac4317..962e57d 100644
--- a/subversion/libsvn_wc/wc-queries.sql
+++ b/subversion/libsvn_wc/wc-queries.sql
@@ -260,7 +260,7 @@ WHERE wc_id = ?1 AND IS_STRICT_DESCENDANT_OF(local_relpath, ?2)
 
 -- STMT_DELETE_BASE_RECURSIVE
 DELETE FROM nodes
-WHERE wc_id = ?1 AND (local_relpath = ?2 
+WHERE wc_id = ?1 AND (local_relpath = ?2
                       OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
   AND op_depth = 0
 
diff --git a/subversion/libsvn_wc/wc_db.c b/subversion/libsvn_wc/wc_db.c
index fe09974..c76a8b1 100644
--- a/subversion/libsvn_wc/wc_db.c
+++ b/subversion/libsvn_wc/wc_db.c
@@ -2374,7 +2374,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcroot,
 
           /* For file externals we only want to place a not present marker
              if there is a BASE parent */
-          
+
           svn_relpath_split(&parent_local_relpath, &name, local_relpath,
                             scratch_pool);
 
@@ -6702,7 +6702,7 @@ svn_wc__db_op_mark_resolved_internal(svn_wc__db_wcroot_t *wcroot,
     return SVN_NO_ERROR;
 
   conflicts = svn_skel__parse(conflict_data, conflict_len, scratch_pool);
-  
+
 
   SVN_ERR(svn_wc__conflict_skel_resolve(&resolved_all, conflicts,
                                         db, wcroot->abspath,
@@ -7991,7 +7991,7 @@ struct op_delete_baton_t {
  * Note that the following sequence results in the same DB state:
  *   mv A B; mv B/F B/G
  * We do not care about the order the moves were performed in.
- * For details, see http://wiki.apache.org/subversion/MultiLayerMoves
+ * For details, see https://cwiki.apache.org/confluence/display/SVN/MultiLayerMoves
  */
 struct moved_node_t {
   /* The source of the move. */
@@ -8396,7 +8396,7 @@ delete_node(void *baton,
                                          scratch_pool, iterpool));
 
               if (!mn->local_relpath)
-                svn_sort__array_delete(moved_nodes, i--, 1);
+                SVN_ERR(svn_sort__array_delete2(moved_nodes, i--, 1));
             }
         }
 
@@ -10804,7 +10804,7 @@ db_read_inherited_props(apr_array_header_t **inherited_props,
 
                   iprop_elt->prop_hash = node_props;
                   /* Build the output array in depth-first order. */
-                  svn_sort__array_insert(iprops, &iprop_elt, 0);
+                  SVN_ERR(svn_sort__array_insert2(iprops, &iprop_elt, 0));
                 }
             }
         }
@@ -10840,7 +10840,7 @@ db_read_inherited_props(apr_array_header_t **inherited_props,
 
           /* If we didn't filter everything then keep this iprop. */
           if (apr_hash_count(cached_iprop->prop_hash))
-            svn_sort__array_insert(iprops, &cached_iprop, 0);
+            SVN_ERR(svn_sort__array_insert2(iprops, &cached_iprop, 0));
         }
     }
 
@@ -16616,7 +16616,7 @@ svn_wc__db_find_repos_node_in_wc(apr_array_header_t **local_abspath_list,
 
       SVN_ERR(svn_sqlite__step(&have_row, stmt));
     }
-    
+
   return svn_error_trace(svn_sqlite__reset(stmt));
 }
 
diff --git a/subversion/libsvn_wc/wc_db_update_move.c b/subversion/libsvn_wc/wc_db_update_move.c
index f502126..e420a84 100644
--- a/subversion/libsvn_wc/wc_db_update_move.c
+++ b/subversion/libsvn_wc/wc_db_update_move.c
@@ -95,7 +95,7 @@
  * to avoid tree conflicts where the "incoming" and "local" change both
  * originated in the working copy, because the resolver code cannot handle
  * such tree conflicts at present.
- * 
+ *
  * The whole drive occurs as one single wc.db transaction.  At the end
  * of the transaction the destination NODES table should have a WORKING
  * layer that is equivalent to the WORKING layer found in the copied victim
@@ -1056,7 +1056,7 @@ tc_editor_incoming_add_file(node_move_baton_t *nmb,
       SVN_ERR(svn_wc__wq_build_file_remove(&work_item, b->db,
                                            b->wcroot->abspath, src_abspath,
                                            scratch_pool, scratch_pool));
-    
+
       work_items = svn_wc__wq_merge(work_items, work_item, scratch_pool);
     }
 
@@ -2527,7 +2527,7 @@ update_incoming_moved_node(node_move_baton_t *nmb,
           SVN_ERR(svn_stream_open_unique(&temp_stream, &temp_abspath,
                                          wctemp_abspath, svn_io_file_del_none,
                                          scratch_pool, scratch_pool));
-          err = svn_stream_copy3(working_stream, temp_stream, 
+          err = svn_stream_copy3(working_stream, temp_stream,
                                  b->cancel_func, b->cancel_baton,
                                  scratch_pool);
           if (err && err->apr_err == SVN_ERR_CANCELLED)
@@ -2692,7 +2692,7 @@ update_incoming_move(svn_revnum_t *old_rev,
    * recorded for any tree conflicts created during the editor drive.
    * We assume this path contains no local changes, and create local changes
    * in DST_RELPATH corresponding to changes contained in the conflict victim.
-   * 
+   *
    * DST_OP_DEPTH is used to infer the "op-root" of the incoming move. This
    * "op-root" is virtual because all nodes belonging to the incoming move
    * live in the BASE tree. It is used for constructing repository paths
@@ -2988,7 +2988,7 @@ tc_editor_update_add_new_file(added_node_baton_t *nb,
       nb->skip = TRUE;
       return SVN_NO_ERROR;
     }
-  
+
   /* Check for obstructions. */
   local_abspath = svn_dirent_join(nb->b->wcroot->abspath, nb->local_relpath,
                                   scratch_pool);
@@ -3589,7 +3589,7 @@ svn_wc__db_update_local_add(svn_wc__db_t *db,
   VERIFY_USABLE_WCROOT(wcroot);
 
   SVN_WC__DB_WITH_TXN(update_local_add(&new_rev, db, wcroot,
-                                       local_relpath, 
+                                       local_relpath,
                                        cancel_func, cancel_baton,
                                        scratch_pool),
                       wcroot);
@@ -4258,7 +4258,7 @@ svn_wc__db_op_raise_moved_away(svn_wc__db_t *db,
                                             scratch_pool),
     wcroot);
 
-  /* These version numbers are valid for update/switch notifications 
+  /* These version numbers are valid for update/switch notifications
      only! */
   SVN_ERR(svn_wc__db_update_move_list_notify(wcroot,
                                              (left_version
diff --git a/subversion/mod_authz_svn/mod_authz_svn.c b/subversion/mod_authz_svn/mod_authz_svn.c
index 6ebd9d6..922dd08 100644
--- a/subversion/mod_authz_svn/mod_authz_svn.c
+++ b/subversion/mod_authz_svn/mod_authz_svn.c
@@ -92,7 +92,7 @@ typedef struct authz_svn_config_rec {
 #    define USE_FORCE_AUTHN 1
 #    define IN_SOME_AUTHN_NOTE "authz_svn-in-some-authn"
 #    define FORCE_AUTHN_NOTE "authz_svn-force-authn"
-#  else 
+#  else
      /* ap_some_auth_required() is busted and no viable alternative exists */
 #    ifndef SVN_ALLOW_BROKEN_HTTPD_AUTH
 #      error This Apache httpd has broken auth (CVE-2015-3184)
@@ -961,7 +961,7 @@ access_checker(request_rec *r)
           else
             return HTTP_FORBIDDEN;
         }
-    }    
+    }
 
 #else
   /* Support for older versions of httpd that have a working
diff --git a/subversion/mod_dav_svn/dav_svn.h b/subversion/mod_dav_svn/dav_svn.h
index 34efccb..d4469f9 100644
--- a/subversion/mod_dav_svn/dav_svn.h
+++ b/subversion/mod_dav_svn/dav_svn.h
@@ -303,6 +303,9 @@ struct dav_resource_private {
   /* whether this resource parameters are fixed and won't change
      between requests. */
   svn_boolean_t idempotent;
+
+  /* resource is accessed by 'public' uri (not under "!svn") */
+  svn_boolean_t is_public_uri;
 };
 
 
diff --git a/subversion/mod_dav_svn/mod_dav_svn.c b/subversion/mod_dav_svn/mod_dav_svn.c
index 2731f10..20fb019 100644
--- a/subversion/mod_dav_svn/mod_dav_svn.c
+++ b/subversion/mod_dav_svn/mod_dav_svn.c
@@ -231,8 +231,8 @@ merge_server_config(apr_pool_t *p, void *base, void *overrides)
       newconf->compression_level = child->compression_level;
     }
 
-  newconf->use_utf8 = INHERIT_VALUE(parent, child, use_utf8);                 
-  svn_utf_initialize2(newconf->use_utf8, p); 
+  newconf->use_utf8 = INHERIT_VALUE(parent, child, use_utf8);
+  svn_utf_initialize2(newconf->use_utf8, p);
 
   return newconf;
 }
diff --git a/subversion/mod_dav_svn/reports/list.c b/subversion/mod_dav_svn/reports/list.c
index 6009337..2602906 100644
--- a/subversion/mod_dav_svn/reports/list.c
+++ b/subversion/mod_dav_svn/reports/list.c
@@ -141,7 +141,7 @@ list_receiver(const char *path,
     }
 
   SVN_ERR(maybe_send_header(b));
- 
+
   /* If we need to close the element, then send the attributes
      that apply to all changed items and then close the element. */
   SVN_ERR(dav_svn__brigade_printf(b->bb, b->output,
diff --git a/subversion/mod_dav_svn/reports/log.c b/subversion/mod_dav_svn/reports/log.c
index 5f3802b..2f108a7 100644
--- a/subversion/mod_dav_svn/reports/log.c
+++ b/subversion/mod_dav_svn/reports/log.c
@@ -125,7 +125,7 @@ start_path_with_copy_from(const char **element,
 {
   switch (log_item->change_kind)
     {
-      case svn_fs_path_change_add: 
+      case svn_fs_path_change_add:
         *element = "S:added-path";
         break;
 
@@ -244,7 +244,7 @@ log_revision_receiver(void *baton,
   SVN_ERR(maybe_start_log_item(lrb));
   lrb->needs_log_item = TRUE;
 
-  /* Path changes have been processed already. 
+  /* Path changes have been processed already.
      Now send the remaining per-revision info. */
   SVN_ERR(dav_svn__brigade_printf(lrb->bb, lrb->output,
                                   "<D:version-name>%ld"
diff --git a/subversion/mod_dav_svn/repos.c b/subversion/mod_dav_svn/repos.c
index 824f835..8cbd5e7 100644
--- a/subversion/mod_dav_svn/repos.c
+++ b/subversion/mod_dav_svn/repos.c
@@ -714,6 +714,8 @@ parse_uri(dav_resource_combined *comb,
       && ((ch = uri[len2]) == '/' || ch == '\0')
       && memcmp(uri, special_uri, len2) == 0)
     {
+      comb->priv.is_public_uri = FALSE;
+
       if (ch == '\0')
         {
           /* URI was "/root/!svn". It exists, but has restricted usage. */
@@ -789,6 +791,8 @@ parse_uri(dav_resource_combined *comb,
       /* The location of these resources corresponds directly to the URI,
          and we keep the leading "/". */
       comb->priv.repos_path = comb->priv.uri_path->data;
+
+      comb->priv.is_public_uri = TRUE;
     }
 
   return FALSE;
@@ -1596,6 +1600,7 @@ get_parentpath_resource(request_rec *r,
   comb->priv.r = r;
   comb->priv.repos_path = "Collection of Repositories";
   comb->priv.root = *droot;
+  comb->priv.is_public_uri = TRUE;
   droot->rev = SVN_INVALID_REVNUM;
 
   comb->priv.repos = repos;
@@ -3139,50 +3144,6 @@ seek_stream(dav_stream *stream, apr_off_t abs_position)
        && resource->baselined))
 
 
-/* Return the last modification time of RESOURCE, or -1 if the DAV
-   resource type is not handled, or if an error occurs.  Temporary
-   allocations are made from RESOURCE->POOL. */
-static apr_time_t
-get_last_modified(const dav_resource *resource)
-{
-  apr_time_t last_modified;
-  svn_error_t *serr;
-  svn_revnum_t created_rev;
-  svn_string_t *date_time;
-
-  if (RESOURCE_LACKS_ETAG_POTENTIAL(resource))
-    return -1;
-
-  if ((serr = svn_fs_node_created_rev(&created_rev, resource->info->root.root,
-                                      resource->info->repos_path,
-                                      resource->pool)))
-    {
-      svn_error_clear(serr);
-      return -1;
-    }
-
-  if ((serr = svn_fs_revision_prop2(&date_time, resource->info->repos->fs,
-                                    created_rev, SVN_PROP_REVISION_DATE,
-                                    TRUE, resource->pool, resource->pool)))
-    {
-      svn_error_clear(serr);
-      return -1;
-    }
-
-  if (date_time == NULL || date_time->data == NULL)
-    return -1;
-
-  if ((serr = svn_time_from_cstring(&last_modified, date_time->data,
-                                    resource->pool)))
-    {
-      svn_error_clear(serr);
-      return -1;
-    }
-
-  return last_modified;
-}
-
-
 const char *
 dav_svn__getetag(const dav_resource *resource, apr_pool_t *pool)
 {
@@ -3263,21 +3224,43 @@ set_headers(request_rec *r, const dav_resource *resource)
   if (!resource->exists)
     return NULL;
 
-  if ((resource->type == DAV_RESOURCE_TYPE_REGULAR) 
-      && (resource->info->repos_path == resource->info->uri_path->data))
+  if ((resource->type == DAV_RESOURCE_TYPE_REGULAR)
+      && resource->info->is_public_uri)
     {
       /* Include Last-Modified header for 'external' GET or HEAD requests
          (i.e. requests to URI's not under /!svn), to support usage of an
          SVN server as a file server, where the client needs timestamps
          for instance to use as "last modification time" of files on disk. */
-      const apr_time_t last_modified = get_last_modified(resource);
-      if (last_modified != -1)
+
+      svn_revnum_t created_rev;
+      svn_string_t *date_str = NULL;
+
+      serr = svn_fs_node_created_rev(&created_rev, resource->info->root.root,
+                                     resource->info->repos_path,
+                                     resource->pool);
+
+      if (serr == NULL)
+        {
+          serr = svn_fs_revision_prop2(&date_str, resource->info->repos->fs,
+                                       created_rev, SVN_PROP_REVISION_DATE,
+                                       TRUE, resource->pool, resource->pool);
+        }
+
+      if ((serr == NULL) && date_str && date_str->data)
         {
-          /* Note the modification time for the requested resource, and
-             include the Last-Modified header in the response. */
-          ap_update_mtime(r, last_modified);
-          ap_set_last_modified(r);
-        }  
+          apr_time_t mtime;
+          serr = svn_time_from_cstring(&mtime, date_str->data, resource->pool);
+
+          if (serr == NULL)
+            {
+              /* Note the modification time for the requested resource, and
+                 include the Last-Modified header in the response. */
+              ap_update_mtime(r, mtime);
+              ap_set_last_modified(r);
+            }
+        }
+
+      svn_error_clear(serr);
     }
 
   /* generate our etag and place it into the output */
diff --git a/subversion/po/de.po b/subversion/po/de.po
index 71655b5..06aeaef 100644
--- a/subversion/po/de.po
+++ b/subversion/po/de.po
@@ -1556,7 +1556,7 @@ msgid "Certificate signature mismatch"
 msgstr "Signatur des Zertifikats stimmt nicht überein"
 
 #: ../include/svn_error_codes.h:1772
-msgid "Certficate verification failed"
+msgid "Certificate verification failed"
 msgstr "Überprüfung des Zertifikats fehlgeschlagen"
 
 #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:290
@@ -17977,7 +17977,7 @@ msgid ""
 "Print the names of uncommitted transactions. With -rN skip the output\n"
 "of those that have a base revision more recent than rN.  Transactions\n"
 "with base revisions much older than HEAD are likely to have been\n"
-"abandonded and are candidates to be removed.\n"
+"abandoned and are candidates to be removed.\n"
 msgstr ""
 
 #: ../svnadmin/svnadmin.c:501
diff --git a/subversion/po/ja.po b/subversion/po/ja.po
index bce5bf3..534a68a 100644
--- a/subversion/po/ja.po
+++ b/subversion/po/ja.po
@@ -1688,7 +1688,7 @@ msgstr ""
 
 #: ../include/svn_error_codes.h:1752
 #, fuzzy
-msgid "Certficate verification failed"
+msgid "Certificate verification failed"
 msgstr "競合を解決できませんでした"
 
 #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152
@@ -17120,7 +17120,7 @@ msgid ""
 "Print the names of uncommitted transactions. With -rN skip the output\n"
 "of those that have a base revision more recent than rN.  Transactions\n"
 "with base revisions much older than HEAD are likely to have been\n"
-"abandonded and are candidates to be removed.\n"
+"abandoned and are candidates to be removed.\n"
 msgstr ""
 
 #: ../svnadmin/svnadmin.c:436
diff --git a/subversion/po/ko.po b/subversion/po/ko.po
index d9ee453..ca3047d 100644
--- a/subversion/po/ko.po
+++ b/subversion/po/ko.po
@@ -1487,7 +1487,7 @@ msgstr ""
 
 #: ../include/svn_error_codes.h:1752
 #, fuzzy
-msgid "Certficate verification failed"
+msgid "Certificate verification failed"
 msgstr "충돌상황 해제에 실패하였습니다"
 
 #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152
@@ -16546,7 +16546,7 @@ msgid ""
 "Print the names of uncommitted transactions. With -rN skip the output\n"
 "of those that have a base revision more recent than rN.  Transactions\n"
 "with base revisions much older than HEAD are likely to have been\n"
-"abandonded and are candidates to be removed.\n"
+"abandoned and are candidates to be removed.\n"
 msgstr ""
 
 #: ../svnadmin/svnadmin.c:436
diff --git a/subversion/po/pl.po b/subversion/po/pl.po
index 6390448..513517a 100644
--- a/subversion/po/pl.po
+++ b/subversion/po/pl.po
@@ -1525,7 +1525,7 @@ msgstr ""
 
 #: ../include/svn_error_codes.h:1752
 #, fuzzy
-msgid "Certficate verification failed"
+msgid "Certificate verification failed"
 msgstr "Rozwiązanie konfliktu nie powiodło się"
 
 #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152
@@ -16715,7 +16715,7 @@ msgid ""
 "Print the names of uncommitted transactions. With -rN skip the output\n"
 "of those that have a base revision more recent than rN.  Transactions\n"
 "with base revisions much older than HEAD are likely to have been\n"
-"abandonded and are candidates to be removed.\n"
+"abandoned and are candidates to be removed.\n"
 msgstr ""
 
 #: ../svnadmin/svnadmin.c:436
diff --git a/subversion/po/subversion.pot b/subversion/po/subversion.pot
index d073736..5caa908 100644
--- a/subversion/po/subversion.pot
+++ b/subversion/po/subversion.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2019-10-25 09:30+0000\n"
+"POT-Creation-Date: 2020-05-20 12:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,7 +135,7 @@ msgstr ""
 msgid "Bogus UUID"
 msgstr ""
 
-#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1046
+#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1056
 msgid "Invalid configuration value"
 msgstr ""
 
@@ -220,8 +220,8 @@ msgid "Read error in pipe"
 msgstr ""
 
 #. is errno on POSIX
-#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435
-#: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:573
+#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:436
+#: ../libsvn_subr/cmdline.c:467 ../libsvn_subr/cmdline.c:490 ../svn/util.c:573
 #: ../svnlook/svnlook.c:2034
 #, c-format
 msgid "Write error"
@@ -596,7 +596,7 @@ msgstr ""
 msgid "Path is already locked"
 msgstr ""
 
-#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:993
 msgid "Path is not locked"
 msgstr ""
 
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Lock has expired"
 msgstr ""
 
-#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:970
+#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:980
 msgid "Item is out of date"
 msgstr ""
 
@@ -724,748 +724,756 @@ msgstr ""
 msgid "Unrecognized filesystem I/O control code"
 msgstr ""
 
-#: ../include/svn_error_codes.h:900
-msgid "The repository is locked, perhaps for db recovery"
+#: ../include/svn_error_codes.h:899
+msgid "Rep-sharing is not allowed."
 msgstr ""
 
 #: ../include/svn_error_codes.h:904
+msgid "Rep-sharing is not supported."
+msgstr ""
+
+#: ../include/svn_error_codes.h:910
+msgid "The repository is locked, perhaps for db recovery"
+msgstr ""
+
+#: ../include/svn_error_codes.h:914
 msgid "A repository hook failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:908
+#: ../include/svn_error_codes.h:918
 msgid "Incorrect arguments supplied"
 msgstr ""
 
-#: ../include/svn_error_codes.h:912
+#: ../include/svn_error_codes.h:922
 msgid "A report cannot be generated because no data was supplied"
 msgstr ""
 
-#: ../include/svn_error_codes.h:916
+#: ../include/svn_error_codes.h:926
 msgid "Bogus revision report"
 msgstr ""
 
-#: ../include/svn_error_codes.h:925
+#: ../include/svn_error_codes.h:935
 msgid "Unsupported repository version"
 msgstr ""
 
-#: ../include/svn_error_codes.h:929
+#: ../include/svn_error_codes.h:939
 msgid "Disabled repository feature"
 msgstr ""
 
-#: ../include/svn_error_codes.h:933
+#: ../include/svn_error_codes.h:943
 msgid "Error running post-commit hook"
 msgstr ""
 
-#: ../include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:948
 msgid "Error running post-lock hook"
 msgstr ""
 
-#: ../include/svn_error_codes.h:943
+#: ../include/svn_error_codes.h:953
 msgid "Error running post-unlock hook"
 msgstr ""
 
-#: ../include/svn_error_codes.h:948
+#: ../include/svn_error_codes.h:958
 msgid "Repository upgrade is not supported"
 msgstr ""
 
-#: ../include/svn_error_codes.h:954
+#: ../include/svn_error_codes.h:964
 msgid "Bad URL passed to RA layer"
 msgstr ""
 
-#: ../include/svn_error_codes.h:958
+#: ../include/svn_error_codes.h:968
 msgid "Authorization failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:962
+#: ../include/svn_error_codes.h:972
 msgid "Unknown authorization method"
 msgstr ""
 
-#: ../include/svn_error_codes.h:966
+#: ../include/svn_error_codes.h:976
 msgid "Repository access method not implemented"
 msgstr ""
 
-#: ../include/svn_error_codes.h:974
+#: ../include/svn_error_codes.h:984
 msgid "Repository has no UUID"
 msgstr ""
 
-#: ../include/svn_error_codes.h:978
+#: ../include/svn_error_codes.h:988
 msgid "Unsupported RA plugin ABI version"
 msgstr ""
 
-#: ../include/svn_error_codes.h:988
+#: ../include/svn_error_codes.h:998
 msgid "Server can only replay from the root of a repository"
 msgstr ""
 
-#: ../include/svn_error_codes.h:993
+#: ../include/svn_error_codes.h:1003
 msgid "Repository UUID does not match expected UUID"
 msgstr ""
 
-#: ../include/svn_error_codes.h:998
+#: ../include/svn_error_codes.h:1008
 msgid "Repository root URL does not match expected root URL"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1013
 msgid "Session URL does not match expected session URL"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1008 ../libsvn_ra_svn/client.c:506
+#: ../include/svn_error_codes.h:1018 ../libsvn_ra_svn/client.c:506
 #, c-format
 msgid "Can't create tunnel"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1013
+#: ../include/svn_error_codes.h:1023
 msgid "Can't create session"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1019
+#: ../include/svn_error_codes.h:1029
 msgid "RA layer failed to init socket layer"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1023
+#: ../include/svn_error_codes.h:1033
 msgid "RA layer failed to create HTTP request"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1027
+#: ../include/svn_error_codes.h:1037
 msgid "RA layer request failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1031
+#: ../include/svn_error_codes.h:1041
 msgid "RA layer didn't receive requested OPTIONS info"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1035
+#: ../include/svn_error_codes.h:1045
 msgid "RA layer failed to fetch properties"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1039
+#: ../include/svn_error_codes.h:1049
 msgid "RA layer file already exists"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1053
+#: ../include/svn_error_codes.h:1063
 msgid "HTTP Path Not Found"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1057
+#: ../include/svn_error_codes.h:1067
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr ""
 
 #. If condition COND is not met, return a "malformed network data" error.
 #.
-#: ../include/svn_error_codes.h:1062 ../include/svn_error_codes.h:1570
+#: ../include/svn_error_codes.h:1072 ../include/svn_error_codes.h:1580
 #: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716
 #: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:3000
 msgid "Malformed network data"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1067
+#: ../include/svn_error_codes.h:1077
 msgid "Unable to extract data from response header"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1072
+#: ../include/svn_error_codes.h:1082
 msgid "Repository has been moved"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1077 ../libsvn_ra_serf/util.c:940
+#: ../include/svn_error_codes.h:1087 ../libsvn_ra_serf/util.c:940
 msgid "Connection timed out"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1092
 msgid "URL access forbidden for unknown reason"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1087
+#: ../include/svn_error_codes.h:1097
 msgid "The server state conflicts with the requested preconditions"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1092
+#: ../include/svn_error_codes.h:1102
 msgid "The URL doesn't allow the requested method"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1098 ../include/svn_error_codes.h:1574
+#: ../include/svn_error_codes.h:1108 ../include/svn_error_codes.h:1584
 msgid "Couldn't find a repository"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1112
 msgid "Couldn't open a repository"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1108
+#: ../include/svn_error_codes.h:1118
 msgid "Svndiff data has invalid header"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1112
+#: ../include/svn_error_codes.h:1122
 msgid "Svndiff data contains corrupt window"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1116
+#: ../include/svn_error_codes.h:1126
 msgid "Svndiff data contains backward-sliding source view"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1120
+#: ../include/svn_error_codes.h:1130
 msgid "Svndiff data contains invalid instruction"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1124
+#: ../include/svn_error_codes.h:1134
 msgid "Svndiff data ends unexpectedly"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1128
+#: ../include/svn_error_codes.h:1138
 msgid "Svndiff compressed data is invalid"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1134
+#: ../include/svn_error_codes.h:1144
 msgid "Apache has no path to an SVN filesystem"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1138
+#: ../include/svn_error_codes.h:1148
 msgid "Apache got a malformed URI"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1142
+#: ../include/svn_error_codes.h:1152
 msgid "Activity not found"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1146
+#: ../include/svn_error_codes.h:1156
 msgid "Baseline incorrect"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1150
+#: ../include/svn_error_codes.h:1160
 msgid "Input/output error"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1156
+#: ../include/svn_error_codes.h:1166
 msgid "A path under version control is needed for this operation"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1160
+#: ../include/svn_error_codes.h:1170
 msgid "Repository access is needed for this operation"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1164
+#: ../include/svn_error_codes.h:1174
 msgid "Bogus revision information given"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1168
+#: ../include/svn_error_codes.h:1178
 msgid "Attempting to commit to a URL more than once"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1172
+#: ../include/svn_error_codes.h:1182
 msgid "Operation does not apply to binary file"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1178
+#: ../include/svn_error_codes.h:1188
 msgid "Format of an svn:externals property was invalid"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1182
+#: ../include/svn_error_codes.h:1192
 msgid "Attempting restricted operation for modified resource"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1186
+#: ../include/svn_error_codes.h:1196
 msgid "Operation does not apply to directory"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1190 ../svnadmin/svnadmin.c:1827
+#: ../include/svn_error_codes.h:1200 ../svnadmin/svnadmin.c:1838
 #, c-format
 msgid "Revision range is not allowed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1194
+#: ../include/svn_error_codes.h:1204
 msgid "Inter-repository relocation not allowed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1198
+#: ../include/svn_error_codes.h:1208
 msgid "Author name cannot contain a newline"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1202
+#: ../include/svn_error_codes.h:1212
 msgid "Bad property name"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1207
+#: ../include/svn_error_codes.h:1217
 msgid "Two versioned resources are unrelated"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1212
+#: ../include/svn_error_codes.h:1222
 msgid "Path has no lock token"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1217
+#: ../include/svn_error_codes.h:1227
 msgid "Operation does not support multiple sources"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1222
+#: ../include/svn_error_codes.h:1232
 msgid "No versioned parent directories"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1227 ../include/svn_error_codes.h:1247
+#: ../include/svn_error_codes.h:1237 ../include/svn_error_codes.h:1257
 msgid "Working copy and merge source not ready for reintegration"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1232
+#: ../include/svn_error_codes.h:1242
 msgid "A file external cannot overwrite an existing versioned item"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1237
+#: ../include/svn_error_codes.h:1247
 msgid "Invalid path component strip count specified"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1252
 msgid "Detected a cycle while processing the operation"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1252
+#: ../include/svn_error_codes.h:1262
 msgid "Invalid mergeinfo detected in merge target"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1257
+#: ../include/svn_error_codes.h:1267
 msgid "Can't perform this operation without a valid lock token"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1262
+#: ../include/svn_error_codes.h:1272
 msgid "The operation is forbidden by the server"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1267
+#: ../include/svn_error_codes.h:1277
 msgid "The conflict resolution option is not applicable"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1273
+#: ../include/svn_error_codes.h:1283
 msgid "A problem occurred; see other errors for details"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1277
+#: ../include/svn_error_codes.h:1287
 msgid "Failure loading plugin"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1281
+#: ../include/svn_error_codes.h:1291
 msgid "Malformed file"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1285
+#: ../include/svn_error_codes.h:1295
 msgid "Incomplete data"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1289
+#: ../include/svn_error_codes.h:1299
 msgid "Incorrect parameters given"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1293
+#: ../include/svn_error_codes.h:1303
 msgid "Tried a versioning operation on an unversioned resource"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1297
+#: ../include/svn_error_codes.h:1307
 msgid "Test failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1301
+#: ../include/svn_error_codes.h:1311
 msgid "Trying to use an unsupported feature"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1305
+#: ../include/svn_error_codes.h:1315
 msgid "Unexpected or unknown property kind"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1309
+#: ../include/svn_error_codes.h:1319
 msgid "Illegal target for the requested operation"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1313
+#: ../include/svn_error_codes.h:1323
 msgid "MD5 checksum is missing"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1317
+#: ../include/svn_error_codes.h:1327
 msgid "Directory needs to be empty but is not"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1321
+#: ../include/svn_error_codes.h:1331
 msgid "Error calling external program"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1325
+#: ../include/svn_error_codes.h:1335
 msgid "Python exception has been set with the error"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1329
+#: ../include/svn_error_codes.h:1339
 msgid "A checksum mismatch occurred"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1333
+#: ../include/svn_error_codes.h:1343
 msgid "The operation was interrupted"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1337
+#: ../include/svn_error_codes.h:1347
 msgid "The specified diff option is not supported"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1341
+#: ../include/svn_error_codes.h:1351
 msgid "Property not found"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1355
 msgid "No auth file path available"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1350
+#: ../include/svn_error_codes.h:1360
 msgid "Incompatible library version"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1355
+#: ../include/svn_error_codes.h:1365
 msgid "Mergeinfo parse error"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1360
+#: ../include/svn_error_codes.h:1370
 msgid "Cease invocation of this API"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1365
+#: ../include/svn_error_codes.h:1375
 msgid "Error parsing revision number"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1370
+#: ../include/svn_error_codes.h:1380
 msgid "Iteration terminated before completion"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1375
+#: ../include/svn_error_codes.h:1385
 msgid "Unknown changelist"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1380
+#: ../include/svn_error_codes.h:1390
 msgid "Reserved directory name in command line arguments"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1385
+#: ../include/svn_error_codes.h:1395
 msgid "Inquiry about unknown capability"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1390
+#: ../include/svn_error_codes.h:1400
 msgid "Test skipped"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1395
+#: ../include/svn_error_codes.h:1405
 msgid "APR memcache library not available"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1400
+#: ../include/svn_error_codes.h:1410
 msgid "Couldn't perform atomic initialization"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1405
+#: ../include/svn_error_codes.h:1415
 msgid "SQLite error"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1410
+#: ../include/svn_error_codes.h:1420
 msgid "Attempted to write to readonly SQLite db"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1417
+#: ../include/svn_error_codes.h:1427
 msgid "Unsupported schema found in SQLite db"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1422
+#: ../include/svn_error_codes.h:1432
 msgid "The SQLite db is busy"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1427
+#: ../include/svn_error_codes.h:1437
 msgid ""
 "SQLite busy at transaction rollback; resetting all busy SQLite statements to "
 "allow rollback"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1433
+#: ../include/svn_error_codes.h:1443
 msgid "Constraint error in SQLite db"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1438
+#: ../include/svn_error_codes.h:1448
 msgid "Too many memcached servers configured"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1443
+#: ../include/svn_error_codes.h:1453
 msgid "Failed to parse version number string"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1448
+#: ../include/svn_error_codes.h:1458
 msgid "Atomic data storage is corrupt"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1453
+#: ../include/svn_error_codes.h:1463
 msgid "utf8proc library error"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1458
+#: ../include/svn_error_codes.h:1468
 msgid "Bad arguments to SQL operators GLOB or LIKE"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1463
+#: ../include/svn_error_codes.h:1473
 msgid "Packed data stream is corrupt"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1468
+#: ../include/svn_error_codes.h:1478
 msgid "Additional errors:"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1473
+#: ../include/svn_error_codes.h:1483
 msgid "Parser error: invalid input"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1478
+#: ../include/svn_error_codes.h:1488
 msgid "SQLite transaction rollback failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1483
+#: ../include/svn_error_codes.h:1493
 msgid "LZ4 compression failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1488
+#: ../include/svn_error_codes.h:1498
 msgid "LZ4 decompression failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1493
+#: ../include/svn_error_codes.h:1503
 msgid "Could not canonicalize path or URI"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1499
+#: ../include/svn_error_codes.h:1509
 msgid "Error parsing arguments"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1503
+#: ../include/svn_error_codes.h:1513
 msgid "Not enough arguments provided"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1507
+#: ../include/svn_error_codes.h:1517
 msgid "Mutually exclusive arguments specified"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1511
+#: ../include/svn_error_codes.h:1521
 msgid "Attempted command in administrative dir"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1515
+#: ../include/svn_error_codes.h:1525
 msgid "The log message file is under version control"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1519
+#: ../include/svn_error_codes.h:1529
 msgid "The log message is a pathname"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1523
+#: ../include/svn_error_codes.h:1533
 msgid "Committing in directory scheduled for addition"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1527
+#: ../include/svn_error_codes.h:1537
 msgid "No external editor available"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1531
+#: ../include/svn_error_codes.h:1541
 msgid "Something is wrong with the log message's contents"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1535
+#: ../include/svn_error_codes.h:1545
 msgid "A log message was given where none was necessary"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1539
+#: ../include/svn_error_codes.h:1549
 msgid "No external merge tool available"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1543
+#: ../include/svn_error_codes.h:1553
 msgid "Failed processing one or more externals definitions"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1548
+#: ../include/svn_error_codes.h:1558
 msgid "Repository verification failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1554
+#: ../include/svn_error_codes.h:1564
 msgid "Special code for wrapping server errors to report to client"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1558
+#: ../include/svn_error_codes.h:1568
 msgid "Unknown svn protocol command"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1562
+#: ../include/svn_error_codes.h:1572
 msgid "Network connection closed unexpectedly"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1566
+#: ../include/svn_error_codes.h:1576
 msgid "Network read/write error"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1578
+#: ../include/svn_error_codes.h:1588
 msgid "Client/server version mismatch"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1583
+#: ../include/svn_error_codes.h:1593
 msgid "Cannot negotiate authentication mechanism"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1588
+#: ../include/svn_error_codes.h:1598
 msgid "Editor drive was aborted"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1593
+#: ../include/svn_error_codes.h:1603
 msgid "Client request too long"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1598
+#: ../include/svn_error_codes.h:1608
 msgid "Server response too long"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1606
+#: ../include/svn_error_codes.h:1616
 msgid "Credential data unavailable"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1610
+#: ../include/svn_error_codes.h:1620
 msgid "No authentication provider available"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1614
+#: ../include/svn_error_codes.h:1624
 msgid "All authentication providers exhausted"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1618
+#: ../include/svn_error_codes.h:1628
 msgid "Credentials not saved"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1623 ../libsvn_subr/gpg_agent.c:512
+#: ../include/svn_error_codes.h:1633 ../libsvn_subr/gpg_agent.c:512
 msgid "Authentication failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1629
+#: ../include/svn_error_codes.h:1639
 msgid "Read access denied for root of edit"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1634
+#: ../include/svn_error_codes.h:1644
 msgid "Item is not readable"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1639
+#: ../include/svn_error_codes.h:1649
 msgid "Item is partially readable"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1643
+#: ../include/svn_error_codes.h:1653
 msgid "Invalid authz configuration"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1648
+#: ../include/svn_error_codes.h:1658
 msgid "Item is not writable"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1655
+#: ../include/svn_error_codes.h:1665
 msgid "Diff data source modified unexpectedly"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1660
+#: ../include/svn_error_codes.h:1670
 msgid "Diff data unexpected"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1667
+#: ../include/svn_error_codes.h:1677
 msgid "Initialization of SSPI library failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1673
+#: ../include/svn_error_codes.h:1683
 msgid "Server SSL certificate untrusted"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1678
+#: ../include/svn_error_codes.h:1688
 msgid "Initialization of the GSSAPI context failed"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1683
+#: ../include/svn_error_codes.h:1693
 msgid "While handling serf response:"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1688
+#: ../include/svn_error_codes.h:1698
 msgid "Can't read from stream"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1694
+#: ../include/svn_error_codes.h:1704
 msgid "Assertion failure"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1698
+#: ../include/svn_error_codes.h:1708
 msgid "No non-tracing links found in the error chain"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1706
+#: ../include/svn_error_codes.h:1716
 msgid "Unexpected end of ASN1 data"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1710
+#: ../include/svn_error_codes.h:1720
 msgid "Unexpected ASN1 tag"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1714
+#: ../include/svn_error_codes.h:1724
 msgid "Invalid ASN1 length"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1718
+#: ../include/svn_error_codes.h:1728
 msgid "ASN1 length mismatch"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1722
+#: ../include/svn_error_codes.h:1732
 msgid "Invalid ASN1 data"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1726
+#: ../include/svn_error_codes.h:1736
 msgid "Unavailable X509 feature"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1730
+#: ../include/svn_error_codes.h:1740
 msgid "Invalid PEM certificate"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1734
+#: ../include/svn_error_codes.h:1744
 msgid "Invalid certificate format"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1738
+#: ../include/svn_error_codes.h:1748
 msgid "Invalid certificate version"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1742
+#: ../include/svn_error_codes.h:1752
 msgid "Invalid certificate serial number"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1746
+#: ../include/svn_error_codes.h:1756
 msgid "Found invalid algorithm in certificate"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1750
+#: ../include/svn_error_codes.h:1760
 msgid "Found invalid name in certificate"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1754
+#: ../include/svn_error_codes.h:1764
 msgid "Found invalid date in certificate"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1758
+#: ../include/svn_error_codes.h:1768
 msgid "Found invalid public key in certificate"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1762
+#: ../include/svn_error_codes.h:1772
 msgid "Found invalid signature in certificate"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1766
+#: ../include/svn_error_codes.h:1776
 msgid "Found invalid extensions in certificate"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1770
+#: ../include/svn_error_codes.h:1780
 msgid "Unknown certificate version"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1774
+#: ../include/svn_error_codes.h:1784
 msgid "Certificate uses unknown public key algorithm"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1778
+#: ../include/svn_error_codes.h:1788
 msgid "Certificate signature mismatch"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1782
-msgid "Certficate verification failed"
+#: ../include/svn_error_codes.h:1792
+msgid "Certificate verification failed"
 msgstr ""
 
 #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:296
@@ -1506,10 +1514,11 @@ msgstr ""
 #: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3252
 #: ../libsvn_client/export.c:1389 ../libsvn_client/import.c:861
 #: ../libsvn_client/patch.c:3750 ../libsvn_client/relocate.c:155
-#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:152
-#: ../libsvn_client/status.c:444 ../libsvn_client/switch.c:471
-#: ../libsvn_client/update.c:749 ../libsvn_client/upgrade.c:111
-#: ../svn/shelf-cmd.c:1023 ../svn/util.c:992 ../svnbench/util.c:76
+#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:140
+#: ../libsvn_client/shelf2.c:1128 ../libsvn_client/status.c:445
+#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:749
+#: ../libsvn_client/upgrade.c:111 ../svn/shelf-cmd.c:1030
+#: ../svn/shelf2-cmd.c:1030 ../svn/util.c:992 ../svnbench/util.c:76
 #, c-format
 msgid "'%s' is not a local path"
 msgstr ""
@@ -3661,7 +3670,7 @@ msgstr ""
 msgid "Path '%s' is not a directory"
 msgstr ""
 
-#: ../libsvn_client/copy.c:1130 ../libsvn_client/merge.c:10270
+#: ../libsvn_client/copy.c:1130 ../libsvn_client/merge.c:10279
 #: ../svnlook/svnlook.c:1445
 #, c-format
 msgid "Path '%s' does not exist"
@@ -3765,78 +3774,78 @@ msgstr ""
 msgid "Non-recursive relocation not supported"
 msgstr ""
 
-#: ../libsvn_client/diff.c:69
+#: ../libsvn_client/diff.c:70
 #, c-format
 msgid "Path '%s' must be an immediate child of the directory '%s'"
 msgstr ""
 
-#: ../libsvn_client/diff.c:292
+#: ../libsvn_client/diff.c:293
 #, c-format
 msgid "%s\t(revision %ld)"
 msgstr ""
 
-#: ../libsvn_client/diff.c:294
+#: ../libsvn_client/diff.c:295
 #, c-format
 msgid "%s\t(nonexistent)"
 msgstr ""
 
 #. SVN_INVALID_REVNUM
-#: ../libsvn_client/diff.c:296
+#: ../libsvn_client/diff.c:297
 #, c-format
 msgid "%s\t(working copy)"
 msgstr ""
 
-#: ../libsvn_client/diff.c:978
+#: ../libsvn_client/diff.c:979
 #, c-format
 msgid "Cannot display: file marked as a binary type.%s"
 msgstr ""
 
-#: ../libsvn_client/diff.c:1474 ../libsvn_client/merge.c:7344
-#: ../libsvn_client/merge.c:10672
+#: ../libsvn_client/diff.c:1475 ../libsvn_client/merge.c:7351
+#: ../libsvn_client/merge.c:10681
 msgid "Not all required revisions are specified"
 msgstr ""
 
-#: ../libsvn_client/diff.c:1488
+#: ../libsvn_client/diff.c:1489
 msgid ""
 "At least one revision must be something other than BASE or WORKING when "
 "diffing a URL"
 msgstr ""
 
-#: ../libsvn_client/diff.c:1525
+#: ../libsvn_client/diff.c:1526
 #, c-format
 msgid "Diff target '%s' was not found in the repository at revision '%ld'"
 msgstr ""
 
-#: ../libsvn_client/diff.c:1530
+#: ../libsvn_client/diff.c:1531
 #, c-format
 msgid ""
 "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
 msgstr ""
 
-#: ../libsvn_client/diff.c:1717
+#: ../libsvn_client/diff.c:1718
 #, c-format
 msgid ""
 "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
 msgstr ""
 
-#: ../libsvn_client/diff.c:1722
+#: ../libsvn_client/diff.c:1723
 #, c-format
 msgid ""
 "Diff targets '%s' and '%s' were not found in the repository at revisions "
 "'%ld' and '%ld'"
 msgstr ""
 
-#: ../libsvn_client/diff.c:1821
+#: ../libsvn_client/diff.c:1822
 msgid "Sorry, svn_client_diff7 was called in a way that is not yet supported"
 msgstr ""
 
-#: ../libsvn_client/diff.c:1863
+#: ../libsvn_client/diff.c:1864
 msgid ""
 "A non-URL diff at this time must be either from a path's base to the same "
 "path's working version or between the working versions of two paths"
 msgstr ""
 
-#: ../libsvn_client/diff.c:2794 ../libsvn_client/diff.c:2857
+#: ../libsvn_client/diff.c:2795 ../libsvn_client/diff.c:2858
 msgid "Cannot ignore properties and show only properties at the same time"
 msgstr ""
 
@@ -3899,10 +3908,10 @@ msgstr ""
 msgid "'%s' already exists"
 msgstr ""
 
-#: ../libsvn_client/export.c:814 ../libsvn_client/repos_diff.c:997
+#: ../libsvn_client/export.c:814 ../libsvn_client/repos_diff.c:998
 #: ../libsvn_client/wc_editor.c:538 ../libsvn_fs_fs/dag.c:1107
 #: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229
-#: ../libsvn_ra_svn/client.c:1506 ../libsvn_wc/diff_editor.c:2109
+#: ../libsvn_ra_svn/client.c:1509 ../libsvn_wc/diff_editor.c:2109
 #: ../libsvn_wc/diff_editor.c:2195 ../libsvn_wc/externals.c:711
 #: ../libsvn_wc/update_editor.c:4239
 #, c-format
@@ -3987,7 +3996,7 @@ msgstr ""
 msgid "'%s' is a reserved name and cannot be imported"
 msgstr ""
 
-#: ../libsvn_client/info.c:399 ../libsvn_client/list.c:389
+#: ../libsvn_client/info.c:400 ../libsvn_client/list.c:389
 #: ../svnbench/null-info-cmd.c:148
 #, c-format
 msgid "URL '%s' non-existent in revision %ld"
@@ -4017,12 +4026,12 @@ msgid "'%s' is not locked"
 msgstr ""
 
 #: ../libsvn_client/locking_commands.c:529 ../libsvn_fs/fs-loader.c:1835
-#: ../libsvn_ra/ra_loader.c:1088
+#: ../libsvn_ra/ra_loader.c:1091
 msgid "Lock comment contains illegal characters"
 msgstr ""
 
-#: ../libsvn_client/log.c:134 ../libsvn_client/ra.c:532
-#: ../libsvn_client/ra.c:867
+#: ../libsvn_client/log.c:134 ../libsvn_client/ra.c:542
+#: ../libsvn_client/ra.c:877
 #, c-format
 msgid "'%s' has no URL"
 msgstr ""
@@ -4092,87 +4101,87 @@ msgid ""
 "unmerged revisions"
 msgstr ""
 
-#: ../libsvn_client/merge.c:6396
+#: ../libsvn_client/merge.c:6403
 #, c-format
 msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
 msgstr ""
 
-#: ../libsvn_client/merge.c:6547
+#: ../libsvn_client/merge.c:6554
 msgid ""
 "Merge tracking not allowed with missing subtrees; try restoring these items "
 "first:\n"
 msgstr ""
 
-#: ../libsvn_client/merge.c:7548
+#: ../libsvn_client/merge.c:7555
 #, c-format
 msgid ""
 "Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
 msgstr ""
 
-#: ../libsvn_client/merge.c:9856
+#: ../libsvn_client/merge.c:9865
 msgid "Use of two URLs is not compatible with mergeinfo modification"
 msgstr ""
 
-#: ../libsvn_client/merge.c:9863 ../libsvn_client/merge.c:10184
+#: ../libsvn_client/merge.c:9872 ../libsvn_client/merge.c:10193
 msgid ""
 "Merge from foreign repository is not compatible with mergeinfo modification"
 msgstr ""
 
-#: ../libsvn_client/merge.c:10277 ../libsvn_client/merge.c:10420
+#: ../libsvn_client/merge.c:10286 ../libsvn_client/merge.c:10429
 #, c-format
 msgid "Merge target '%s' does not exist in the working copy"
 msgstr ""
 
-#: ../libsvn_client/merge.c:10300
+#: ../libsvn_client/merge.c:10309
 msgid "Cannot determine revision of working copy"
 msgstr ""
 
-#: ../libsvn_client/merge.c:10306
+#: ../libsvn_client/merge.c:10315
 #, c-format
 msgid ""
 "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
 msgstr ""
 
-#: ../libsvn_client/merge.c:10321
+#: ../libsvn_client/merge.c:10330
 msgid "Cannot merge into a working copy with a switched subtree"
 msgstr ""
 
-#: ../libsvn_client/merge.c:10337
+#: ../libsvn_client/merge.c:10346
 msgid "Cannot merge into a working copy that has local modifications"
 msgstr ""
 
-#: ../libsvn_client/merge.c:10357 ../svn/merge-cmd.c:56
+#: ../libsvn_client/merge.c:10366 ../svn/merge-cmd.c:56
 #, c-format
 msgid ""
 "Invalid merge source '%s'; a working copy path can only be used with a "
 "repository revision (a number, a date, or head)"
 msgstr ""
 
-#: ../libsvn_client/merge.c:10675 ../svn/merge-cmd.c:123
+#: ../libsvn_client/merge.c:10684 ../svn/merge-cmd.c:123
 msgid "Merge sources must both be either paths or URLs"
 msgstr ""
 
-#: ../libsvn_client/merge.c:11445 ../libsvn_client/merge.c:11607
-#: ../libsvn_client/merge.c:12525
+#: ../libsvn_client/merge.c:11454 ../libsvn_client/merge.c:11616
+#: ../libsvn_client/merge.c:12534
 #, c-format
 msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
 msgstr ""
 
-#: ../libsvn_client/merge.c:11557
+#: ../libsvn_client/merge.c:11566
 #, c-format
 msgid ""
 "Neither the reintegrate source nor target can be the root of the repository"
 msgstr ""
 
-#: ../libsvn_client/merge.c:11567
+#: ../libsvn_client/merge.c:11576
 msgid "Reintegrate merge not possible"
 msgstr ""
 
-#: ../libsvn_client/merge.c:11637
+#: ../libsvn_client/merge.c:11646
 msgid "    Missing ranges: "
 msgstr ""
 
-#: ../libsvn_client/merge.c:11640
+#: ../libsvn_client/merge.c:11649
 #, c-format
 msgid ""
 "Reintegrate can only be used if revisions %ld through %ld were previously "
@@ -4180,37 +4189,37 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libsvn_client/merge.c:11699
+#: ../libsvn_client/merge.c:11708
 #, c-format
 msgid ""
 "Can't reintegrate into '%s' because it is locally added and therefore not "
 "related to the merge source"
 msgstr ""
 
-#: ../libsvn_client/merge.c:11987
+#: ../libsvn_client/merge.c:11996
 msgid "Cannot merge automatically while ignoring mergeinfo"
 msgstr ""
 
-#: ../libsvn_client/merge.c:12655
+#: ../libsvn_client/merge.c:12664
 #, c-format
 msgid ""
 "Can't perform automatic merge into '%s' because it is locally added and "
 "therefore not related to the merge source"
 msgstr ""
 
-#: ../libsvn_client/merge.c:12754
+#: ../libsvn_client/merge.c:12763
 msgid ""
 "The required merge is reintegrate-like, and the record-only option cannot be "
 "used with this kind of merge"
 msgstr ""
 
-#: ../libsvn_client/merge.c:12760
+#: ../libsvn_client/merge.c:12769
 msgid ""
 "The required merge is reintegrate-like, and the depth option cannot be used "
 "with this kind of merge"
 msgstr ""
 
-#: ../libsvn_client/merge.c:12766
+#: ../libsvn_client/merge.c:12775
 msgid ""
 "The required merge is reintegrate-like, and the force_delete option cannot "
 "be used with this kind of merge"
@@ -4249,9 +4258,9 @@ msgstr ""
 msgid "Can't add file at '%s'"
 msgstr ""
 
-#: ../libsvn_client/mtcc.c:538 ../libsvn_client/ra.c:708
+#: ../libsvn_client/mtcc.c:538 ../libsvn_client/ra.c:718
 #: ../libsvn_delta/branch_repos.c:91 ../libsvn_fs_base/lock.c:274
-#: ../libsvn_fs_fs/fs_fs.c:1506 ../libsvn_fs_fs/lock.c:759
+#: ../libsvn_fs_fs/fs_fs.c:1507 ../libsvn_fs_fs/lock.c:759
 #: ../libsvn_fs_fs/rev_file.c:177 ../libsvn_fs_fs/rev_file.c:189
 #: ../libsvn_fs_x/fs_x.c:724 ../libsvn_fs_x/lock.c:779
 #: ../libsvn_fs_x/rev_file.c:245 ../libsvn_repos/commit.c:193
@@ -4358,7 +4367,7 @@ msgstr ""
 #: ../libsvn_fs_base/tree.c:4117 ../libsvn_fs_fs/tree.c:3270
 #: ../libsvn_fs_fs/tree.c:3276 ../libsvn_fs_x/tree.c:2188
 #: ../libsvn_fs_x/tree.c:2194 ../libsvn_ra/compat.c:677
-#: ../libsvn_ra_local/ra_plugin.c:1290
+#: ../libsvn_ra_local/ra_plugin.c:1293
 #, c-format
 msgid "'%s' is not a file"
 msgstr ""
@@ -4431,17 +4440,17 @@ msgstr ""
 msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation"
 msgstr ""
 
-#: ../libsvn_client/ra.c:446
+#: ../libsvn_client/ra.c:447
 #, c-format
 msgid "Redirect cycle detected for URL '%s'"
 msgstr ""
 
-#: ../libsvn_client/ra.c:734 ../libsvn_ra/compat.c:397
+#: ../libsvn_client/ra.c:744 ../libsvn_ra/compat.c:397
 #, c-format
 msgid "Unable to find repository location for '%s' in revision %ld"
 msgstr ""
 
-#: ../libsvn_client/ra.c:746
+#: ../libsvn_client/ra.c:756
 #, c-format
 msgid ""
 "The location for '%s' for revision %ld does not exist in the repository or "
@@ -4458,7 +4467,7 @@ msgstr ""
 msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
 msgstr ""
 
-#: ../libsvn_client/repos_diff.c:930 ../libsvn_wc/externals.c:629
+#: ../libsvn_client/repos_diff.c:931 ../libsvn_wc/externals.c:629
 #, c-format
 msgid "Base checksum mismatch for '%s'"
 msgstr ""
@@ -4478,33 +4487,47 @@ msgstr ""
 msgid "Unrecognized revision type requested for '%s'"
 msgstr ""
 
-#: ../libsvn_client/shelf.c:58
+#: ../libsvn_client/shelf.c:59 ../libsvn_client/shelf2.c:59
 msgid "Shelf name cannot be the empty string"
 msgstr ""
 
-#: ../libsvn_client/shelf.c:86
+#: ../libsvn_client/shelf.c:87 ../libsvn_client/shelf2.c:87
 #, c-format
 msgid "Shelve: Bad encoded name '%s'"
 msgstr ""
 
-#: ../libsvn_client/shelf.c:591
+#: ../libsvn_client/shelf.c:592 ../libsvn_client/shelf2.c:1230
 #, c-format
 msgid "Shelf '%s' not found"
 msgstr ""
 
-#: ../libsvn_client/shelf.c:1226
+#: ../libsvn_client/shelf.c:1227 ../libsvn_client/shelf2.c:2077
 #, c-format
 msgid "Shelf '%s' version %d not found"
 msgstr ""
 
-#: ../libsvn_client/status.c:498 ../libsvn_client/status.c:680
+#. xgettext: the '.working', '.merge-left' and '.merge-right' strings
+#. are used to tag onto a file name in case of a merge conflict
+#: ../libsvn_client/shelf2.c:1408 ../libsvn_wc/wc_db_update_move.c:1627
+msgid ".working"
+msgstr ""
+
+#: ../libsvn_client/shelf2.c:1409
+msgid ".merge-left"
+msgstr ""
+
+#: ../libsvn_client/shelf2.c:1410
+msgid ".merge-right"
+msgstr ""
+
+#: ../libsvn_client/status.c:499 ../libsvn_client/status.c:681
 #: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542
 #: ../libsvn_wc/wc_db.c:13629 ../libsvn_wc/wc_db_wcroot.c:727
 #, c-format
 msgid "'%s' is not a working copy"
 msgstr ""
 
-#: ../libsvn_client/status.c:545
+#: ../libsvn_client/status.c:546
 #, c-format
 msgid "Entry '%s' has no URL"
 msgstr ""
@@ -5660,7 +5683,7 @@ msgstr ""
 msgid "Transaction is dead: '%s'"
 msgstr ""
 
-#: ../libsvn_fs_base/revs-txns.c:277 ../libsvn_fs_fs/fs_fs.c:2247
+#: ../libsvn_fs_base/revs-txns.c:277 ../libsvn_fs_fs/fs_fs.c:2248
 #: ../libsvn_fs_x/fs_x.c:1210
 #, c-format
 msgid "revprop '%s' has unexpected value in filesystem"
@@ -5860,99 +5883,109 @@ msgstr ""
 msgid "Can't store FSFS shared data"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs.c:625
+#: ../libsvn_fs_fs/fs.c:641
 msgid "Module for working with a plain file (FSFS) repository."
 msgstr ""
 
-#: ../libsvn_fs_fs/fs.c:688
+#: ../libsvn_fs_fs/fs.c:704
 #, c-format
 msgid "Unsupported FS loader version (%d) for fsfs"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:444
+#: ../libsvn_fs_fs/fs_fs.c:445
 #, c-format
 msgid ""
 "Found format '%d', only created by unreleased dev builds; see http://"
 "subversion.apache.org/docs/release-notes/1.7#revprop-packing"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:455
+#: ../libsvn_fs_fs/fs_fs.c:456
 #, c-format
 msgid "Expected FS format between '1' and '%d'; found format '%d'"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:507 ../libsvn_fs_x/fs_x.c:143
+#: ../libsvn_fs_fs/fs_fs.c:508 ../libsvn_fs_x/fs_x.c:143
 #, c-format
 msgid "Can't read first line of format file '%s'"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:564 ../libsvn_fs_x/fs_x.c:165
+#: ../libsvn_fs_fs/fs_fs.c:565 ../libsvn_fs_x/fs_x.c:165
 #, c-format
 msgid "'%s' contains invalid filesystem format option '%s'"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:574
+#: ../libsvn_fs_fs/fs_fs.c:575
 #, c-format
 msgid "'%s' specifies logical addressing for a non-sharded repository"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:657 ../libsvn_fs_x/fs_x.c:225
+#: ../libsvn_fs_fs/fs_fs.c:658 ../libsvn_fs_x/fs_x.c:225
 #, c-format
 msgid "%s is too small for fsfs.conf setting '%s'."
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:665 ../libsvn_fs_x/fs_x.c:233
+#: ../libsvn_fs_fs/fs_fs.c:666 ../libsvn_fs_x/fs_x.c:233
 #, c-format
 msgid "%s is too large for fsfs.conf setting '%s'."
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:676 ../libsvn_fs_x/fs_x.c:244
+#: ../libsvn_fs_fs/fs_fs.c:677 ../libsvn_fs_x/fs_x.c:244
 #, c-format
 msgid ""
 "%s is invalid for fsfs.conf setting '%s' because it is not a power of 2."
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:732
+#: ../libsvn_fs_fs/fs_fs.c:733
 #, c-format
 msgid "Invalid 'compression' value '%s' in the config"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:878
+#: ../libsvn_fs_fs/fs_fs.c:879
 msgid ""
 "The 'compression' and 'compression-level' config options are mutually "
 "exclusive"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:890
+#: ../libsvn_fs_fs/fs_fs.c:891
 msgid "Compression type 'lz4' requires filesystem format 8 or higher"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:1323
+#: ../libsvn_fs_fs/fs_fs.c:1324
 #, c-format
 msgid "'%s' is not a regular file. Please move it out of the way and try again"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:1491 ../libsvn_fs_x/fs_x.c:709
+#: ../libsvn_fs_fs/fs_fs.c:1492 ../libsvn_fs_x/fs_x.c:709
 #, c-format
 msgid "Invalid revision number '%ld'"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:1932
+#: ../libsvn_fs_fs/fs_fs.c:1933
 msgid "FSFS is not compatible with Subversion prior to 1.1"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:2071
+#: ../libsvn_fs_fs/fs_fs.c:2072
 #, c-format
 msgid "malformed node origin data in '%s'"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:2139
+#: ../libsvn_fs_fs/fs_fs.c:2140
 #, c-format
 msgid ""
 "Node origin for '%s' exists with a different value (%s) than what we were "
 "about to store (%s)"
 msgstr ""
 
+#: ../libsvn_fs_fs/fs_fs.c:2461
+#, c-format
+msgid ""
+"FSFS format (%d) too old for rep-sharing; please upgrade the filesystem."
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2469
+msgid "Filesystem does not allow rep-sharing."
+msgstr ""
+
 #: ../libsvn_fs_fs/hotcopy.c:107 ../libsvn_fs_x/hotcopy.c:108
 #: ../libsvn_subr/io.c:310
 #, c-format
@@ -6379,7 +6412,7 @@ msgstr ""
 msgid "Couldn't open rep-cache database '%s'"
 msgstr ""
 
-#: ../libsvn_fs_fs/rep-cache.c:281 ../libsvn_fs_fs/rep-cache.c:343
+#: ../libsvn_fs_fs/rep-cache.c:281 ../libsvn_fs_fs/rep-cache.c:342
 #: ../libsvn_fs_x/rep-cache.c:280 ../libsvn_fs_x/rep-cache.c:338
 msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n"
 msgstr ""
@@ -6862,18 +6895,18 @@ msgstr ""
 msgid "'%s' in revision %ld is an unrelated object"
 msgstr ""
 
-#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1314
+#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1317
 #, c-format
 msgid "Invalid peg revision %ld"
 msgstr ""
 
-#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1317
+#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1320
 #: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329
 #, c-format
 msgid "Invalid end revision %ld"
 msgstr ""
 
-#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1320
+#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1323
 msgid "Peg revision must precede end revision"
 msgstr ""
 
@@ -6882,59 +6915,59 @@ msgstr ""
 msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:291
+#: ../libsvn_ra/ra_loader.c:292
 #, c-format
 msgid "Illegal repository URL '%s'"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:329
+#: ../libsvn_ra/ra_loader.c:330
 #, c-format
 msgid "Invalid config: unknown HTTP library '%s'"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:373
+#: ../libsvn_ra/ra_loader.c:374
 #, c-format
 msgid "Unrecognized URL scheme for '%s'"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:397
+#: ../libsvn_ra/ra_loader.c:398
 #, c-format
 msgid "Unable to connect to a repository at URL '%s'"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:428
+#: ../libsvn_ra/ra_loader.c:431
 #, c-format
 msgid "Repository UUID '%s' doesn't match expected UUID '%s'"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:492
+#: ../libsvn_ra/ra_loader.c:495
 #, c-format
 msgid "'%s' isn't in the same repository as '%s'"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:516
+#: ../libsvn_ra/ra_loader.c:519
 #, c-format
 msgid "'%s' isn't a child of session URL '%s'"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:532 ../libsvn_ra_svn/client.c:2878
+#: ../libsvn_ra/ra_loader.c:535 ../libsvn_ra_svn/client.c:2881
 #, c-format
 msgid "'%s' isn't a child of repository root URL '%s'"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:576
+#: ../libsvn_ra/ra_loader.c:579
 #, c-format
 msgid ""
 "Specifying 'old_value_p' is not allowed when the '%s' capability is not "
 "advertised, and could indicate a bug in your client"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:1460
+#: ../libsvn_ra/ra_loader.c:1463
 #, c-format
 msgid "  - handles '%s' scheme\n"
 msgstr ""
 
-#: ../libsvn_ra/ra_loader.c:1553
+#: ../libsvn_ra/ra_loader.c:1556
 #, c-format
 msgid "Unrecognized URL scheme '%s'"
 msgstr ""
@@ -6978,24 +7011,24 @@ msgstr ""
 msgid "Module for accessing a repository on local disk."
 msgstr ""
 
-#: ../libsvn_ra_local/ra_plugin.c:685 ../libsvn_ra_serf/serf.c:824
+#: ../libsvn_ra_local/ra_plugin.c:688 ../libsvn_ra_serf/serf.c:828
 #, c-format
 msgid "URL '%s' is not a child of the session's repository root URL '%s'"
 msgstr ""
 
-#: ../libsvn_ra_local/ra_plugin.c:1285 ../libsvn_ra_local/ra_plugin.c:1740
+#: ../libsvn_ra_local/ra_plugin.c:1288 ../libsvn_ra_local/ra_plugin.c:1743
 #: ../libsvn_ra_serf/util.c:1862 ../svnserve/serve.c:3646
 #, c-format
 msgid "'%s' path not found"
 msgstr ""
 
-#: ../libsvn_ra_local/ra_plugin.c:1692 ../libsvn_ra_serf/options.c:774
-#: ../libsvn_ra_svn/client.c:3093
+#: ../libsvn_ra_local/ra_plugin.c:1695 ../libsvn_ra_serf/options.c:787
+#: ../libsvn_ra_svn/client.c:3096
 #, c-format
 msgid "Don't know anything about capability '%s'"
 msgstr ""
 
-#: ../libsvn_ra_local/ra_plugin.c:1946
+#: ../libsvn_ra_local/ra_plugin.c:1949
 #, c-format
 msgid "Unsupported RA loader version (%d) for ra_local"
 msgstr ""
@@ -7095,7 +7128,7 @@ msgstr ""
 msgid "'%s' is not locked in the repository"
 msgstr ""
 
-#: ../libsvn_ra_serf/log.c:574 ../libsvn_ra_svn/client.c:1946
+#: ../libsvn_ra_serf/log.c:574 ../libsvn_ra_svn/client.c:1949
 msgid "Server does not support custom revprops via log"
 msgstr ""
 
@@ -7147,26 +7180,26 @@ msgid ""
 "value"
 msgstr ""
 
-#: ../libsvn_ra_serf/options.c:574
+#: ../libsvn_ra_serf/options.c:577
 msgid "Location header not set on redirect response"
 msgstr ""
 
-#: ../libsvn_ra_serf/options.c:601 ../libsvn_ra_serf/util.c:1853
+#: ../libsvn_ra_serf/options.c:613 ../libsvn_ra_serf/util.c:1853
 #, c-format
 msgid "Repository moved permanently to '%s'"
 msgstr ""
 
-#: ../libsvn_ra_serf/options.c:602 ../libsvn_ra_serf/util.c:1854
+#: ../libsvn_ra_serf/options.c:614 ../libsvn_ra_serf/util.c:1854
 #, c-format
 msgid "Repository moved temporarily to '%s'"
 msgstr ""
 
-#: ../libsvn_ra_serf/options.c:757
+#: ../libsvn_ra_serf/options.c:770
 #, c-format
 msgid "Don't know how to handle '%s' for capability '%s'"
 msgstr ""
 
-#: ../libsvn_ra_serf/options.c:781
+#: ../libsvn_ra_serf/options.c:794
 #, c-format
 msgid "Attempt to fetch capability '%s' resulted in '%s'"
 msgstr ""
@@ -7235,21 +7268,21 @@ msgstr ""
 msgid "Could not resolve proxy server '%s'"
 msgstr ""
 
-#: ../libsvn_ra_serf/serf.c:607
+#: ../libsvn_ra_serf/serf.c:611
 #, c-format
 msgid "Connection to '%s' failed"
 msgstr ""
 
-#: ../libsvn_ra_serf/serf.c:1016
+#: ../libsvn_ra_serf/serf.c:1020
 msgid "The UUID property was not found on the resource or any of its parents"
 msgstr ""
 
-#: ../libsvn_ra_serf/serf.c:1095
+#: ../libsvn_ra_serf/serf.c:1099
 #, c-format
 msgid "Unsupported RA loader version (%d) for ra_serf"
 msgstr ""
 
-#: ../libsvn_ra_serf/serf.c:1109
+#: ../libsvn_ra_serf/serf.c:1113
 #, c-format
 msgid ""
 "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d "
@@ -7518,162 +7551,162 @@ msgstr ""
 msgid "Module for accessing a repository using the svn network protocol."
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:880
+#: ../libsvn_ra_svn/client.c:883
 #, c-format
 msgid "Invalid host '%s'"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1209
+#: ../libsvn_ra_svn/client.c:1212
 msgid "Server did not send repository root"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1285
+#: ../libsvn_ra_svn/client.c:1288
 #, c-format
 msgid ""
 "ra_svn does not support not specifying a log message with pre-1.5 servers; "
 "consider passing an empty one, or upgrading the server"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1308
+#: ../libsvn_ra_svn/client.c:1311
 msgid ""
 "Server doesn't support setting arbitrary revision properties during commit"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1410
+#: ../libsvn_ra_svn/client.c:1413
 msgid "Inherited proplist element not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1484
+#: ../libsvn_ra_svn/client.c:1487
 msgid "Non-string as part of file contents"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1592
+#: ../libsvn_ra_svn/client.c:1595
 msgid "Dirlist element not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1601
+#: ../libsvn_ra_svn/client.c:1604
 #, c-format
 msgid "Invalid directory entry name '%s'"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1686
+#: ../libsvn_ra_svn/client.c:1689
 msgid "Mergeinfo element is not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1934
+#: ../libsvn_ra_svn/client.c:1937
 msgid "Log entry not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:1981
+#: ../libsvn_ra_svn/client.c:1984
 msgid "Changed-path entry not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2148
+#: ../libsvn_ra_svn/client.c:2151
 msgid "'stat' not implemented"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2210
+#: ../libsvn_ra_svn/client.c:2213
 msgid "'get-locations' not implemented"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2227
+#: ../libsvn_ra_svn/client.c:2230
 msgid "Location entry not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2271
+#: ../libsvn_ra_svn/client.c:2274
 msgid "'get-location-segments' not implemented"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2288
+#: ../libsvn_ra_svn/client.c:2291
 msgid "Location segment entry not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2298
+#: ../libsvn_ra_svn/client.c:2301
 msgid "Expected valid revision range"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2371
+#: ../libsvn_ra_svn/client.c:2374
 msgid "'get-file-revs' not implemented"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2395
+#: ../libsvn_ra_svn/client.c:2398
 msgid "Revision entry not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2412 ../libsvn_ra_svn/client.c:2442
+#: ../libsvn_ra_svn/client.c:2415 ../libsvn_ra_svn/client.c:2445
 msgid "Text delta chunk not a string"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2454
+#: ../libsvn_ra_svn/client.c:2457
 msgid "The get-file-revs command didn't return any revisions"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2501
+#: ../libsvn_ra_svn/client.c:2504
 msgid "Server doesn't support the lock command"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2565
+#: ../libsvn_ra_svn/client.c:2568
 msgid "Server doesn't support the unlock command"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2664
+#: ../libsvn_ra_svn/client.c:2667
 msgid "Lock response not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2677
+#: ../libsvn_ra_svn/client.c:2680
 msgid "Unknown status for lock command"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2701
+#: ../libsvn_ra_svn/client.c:2704
 msgid "Didn't receive end marker for lock responses"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2792
+#: ../libsvn_ra_svn/client.c:2795
 msgid "Unlock response not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2805
+#: ../libsvn_ra_svn/client.c:2808
 msgid "Unknown status for unlock command"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2828
+#: ../libsvn_ra_svn/client.c:2831
 msgid "Didn't receive end marker for unlock responses"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2853 ../libsvn_ra_svn/client.c:2906
+#: ../libsvn_ra_svn/client.c:2856 ../libsvn_ra_svn/client.c:2909
 msgid "Server doesn't support the get-lock command"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2920
+#: ../libsvn_ra_svn/client.c:2923
 msgid "Lock element not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:2966
+#: ../libsvn_ra_svn/client.c:2969
 msgid "Server doesn't support the replay command"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:3000
+#: ../libsvn_ra_svn/client.c:3003
 msgid "Server doesn't support the replay-range command"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:3023
+#: ../libsvn_ra_svn/client.c:3026
 #, c-format
 msgid "Expected 'revprops', found '%s'"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:3041
+#: ../libsvn_ra_svn/client.c:3044
 msgid "Error while replaying commit"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:3118
+#: ../libsvn_ra_svn/client.c:3121
 msgid "'get-deleted-rev' not implemented"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:3236
+#: ../libsvn_ra_svn/client.c:3239
 msgid "List entry not a list"
 msgstr ""
 
-#: ../libsvn_ra_svn/client.c:3323
+#: ../libsvn_ra_svn/client.c:3326
 #, c-format
 msgid "Unsupported RA loader version (%d) for ra_svn"
 msgstr ""
@@ -7984,7 +8017,7 @@ msgid ""
 msgstr ""
 
 #: ../libsvn_repos/commit.c:1318 ../libsvn_repos/fs-wrap.c:120
-#: ../libsvn_repos/load-fs-vtable.c:1134
+#: ../libsvn_repos/load-fs-vtable.c:1145
 msgid "Commit succeeded, but post-commit hook failed"
 msgstr ""
 
@@ -8006,17 +8039,17 @@ msgid ""
 "and there was no source entry"
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:1068
+#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:1079
 #, c-format
 msgid "* Dumped revision %ld.\n"
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:1074
+#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:1085
 #, c-format
 msgid "* Verified revision %ld.\n"
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1122
+#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1133
 #, c-format
 msgid ""
 "\n"
@@ -8024,7 +8057,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1128
+#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1139
 #, c-format
 msgid ""
 "\n"
@@ -8032,36 +8065,36 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1141
+#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1152
 #, c-format
 msgid "     * editing path : %s ..."
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1147
+#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1158
 #, c-format
 msgid "     * deleting path : %s ..."
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1153
+#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1164
 #, c-format
 msgid "     * adding path : %s ..."
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1159
+#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1170
 #, c-format
 msgid "     * replacing path : %s ..."
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1168
+#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1179
 msgid " done.\n"
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1177
+#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1188
 #, c-format
 msgid "<<< Started new transaction, based on original revision %ld\n"
 msgstr ""
 
-#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1190
+#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1201
 #, c-format
 msgid " removing '\\r' from %s ..."
 msgstr ""
@@ -8307,32 +8340,32 @@ msgstr ""
 msgid "Path '%s' not found"
 msgstr ""
 
-#: ../libsvn_repos/load-fs-vtable.c:599 ../svnrdump/load_editor.c:492
+#: ../libsvn_repos/load-fs-vtable.c:607 ../svnrdump/load_editor.c:492
 #, c-format
 msgid "Relative source revision %ld is not available in current repository"
 msgstr ""
 
-#: ../libsvn_repos/load-fs-vtable.c:613
+#: ../libsvn_repos/load-fs-vtable.c:621
 #, c-format
 msgid ""
 "Copy source checksum mismatch on copy from '%s'@%ld\n"
 "to '%s' in rev based on r%ld"
 msgstr ""
 
-#: ../libsvn_repos/load-fs-vtable.c:669
+#: ../libsvn_repos/load-fs-vtable.c:677
 msgid "Malformed dumpstream: Revision 0 must not contain node records"
 msgstr ""
 
-#: ../libsvn_repos/load-fs-vtable.c:685
+#: ../libsvn_repos/load-fs-vtable.c:693
 #, c-format
 msgid "Unrecognized node-action on node '%s'"
 msgstr ""
 
-#: ../libsvn_repos/load-fs-vtable.c:854 ../svnrdump/load_editor.c:627
+#: ../libsvn_repos/load-fs-vtable.c:862 ../svnrdump/load_editor.c:628
 msgid "Invalid svn:mergeinfo value"
 msgstr ""
 
-#: ../libsvn_repos/load-fs-vtable.c:863
+#: ../libsvn_repos/load-fs-vtable.c:871
 msgid "Invalid svn:mergeinfo value; leaving unchanged"
 msgstr ""
 
@@ -8669,76 +8702,76 @@ msgid ""
 "     actual:  %s\n"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:779
+#: ../libsvn_subr/cmdline.c:780
 #, c-format
 msgid "Error initializing command line arguments"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:889
+#: ../libsvn_subr/cmdline.c:890
 #, c-format
 msgid "Ignoring unknown value '%s'; did you mean '%s'?"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:894
+#: ../libsvn_subr/cmdline.c:895
 #, c-format
 msgid "Ignoring unknown value '%s'"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:989
+#: ../libsvn_subr/cmdline.c:990
 msgid "Invalid syntax of argument of --config-option"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1016
+#: ../libsvn_subr/cmdline.c:1017
 #, c-format
 msgid "Unrecognized file in argument of %s"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1288
+#: ../libsvn_subr/cmdline.c:1289
 msgid ""
 "The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
 "time configuration option is empty or consists solely of whitespace. "
 "Expected a shell command."
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1295
+#: ../libsvn_subr/cmdline.c:1296
 msgid ""
 "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and "
 "no 'editor-cmd' run-time configuration option was found"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1320 ../libsvn_subr/cmdline.c:1404
+#: ../libsvn_subr/cmdline.c:1413 ../libsvn_subr/cmdline.c:1499
 #, c-format
 msgid "Can't get working directory"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1331 ../libsvn_subr/cmdline.c:1415
-#: ../libsvn_subr/cmdline.c:1440
+#: ../libsvn_subr/cmdline.c:1424 ../libsvn_subr/cmdline.c:1510
+#: ../libsvn_subr/cmdline.c:1535
 #, c-format
 msgid "Can't change working directory to '%s'"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1339 ../libsvn_subr/cmdline.c:1567
+#: ../libsvn_subr/cmdline.c:1434 ../libsvn_subr/cmdline.c:1665
 #, c-format
 msgid "Can't restore working directory"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1346 ../libsvn_subr/cmdline.c:1509
+#: ../libsvn_subr/cmdline.c:1441 ../libsvn_subr/cmdline.c:1607
 #, c-format
 msgid "system('%s') returned %d"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1540
+#: ../libsvn_subr/cmdline.c:1638
 msgid "Error normalizing edited contents to internal format"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1610
+#: ../libsvn_subr/cmdline.c:1708
 #, c-format
 msgid ""
 "Unknown value '%s' for %s.\n"
 "Supported values: %s"
 msgstr ""
 
-#: ../libsvn_subr/cmdline.c:1663
+#: ../libsvn_subr/cmdline.c:1761
 msgid "Caught signal"
 msgstr ""
 
@@ -9571,67 +9604,77 @@ msgstr ""
 msgid "Unable to make name in '%s'"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:109 ../libsvn_subr/mergeinfo.c:710
+#: ../libsvn_subr/mergeinfo.c:110 ../libsvn_subr/mergeinfo.c:738
 msgid "Pathname not terminated by ':'"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:515
+#: ../libsvn_subr/mergeinfo.c:480 ../libsvn_subr/mergeinfo.c:499
+#, c-format
+msgid "bad range {start=%ld,end=%ld,inheritable=%d}"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:543
 #, c-format
 msgid "Invalid character '%c' found in revision list"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:523
+#: ../libsvn_subr/mergeinfo.c:551
 #, c-format
 msgid "Invalid revision number '0' found in range list"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:534
+#: ../libsvn_subr/mergeinfo.c:562
 #, c-format
 msgid "Unable to parse reversed revision range '%ld-%ld'"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:539
+#: ../libsvn_subr/mergeinfo.c:567
 #, c-format
 msgid ""
 "Unable to parse revision range '%ld-%ld' with same start and end revisions"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:576 ../libsvn_subr/mergeinfo.c:583
+#: ../libsvn_subr/mergeinfo.c:604 ../libsvn_subr/mergeinfo.c:611
 #, c-format
 msgid "Invalid character '%c' found in range list"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:590
+#: ../libsvn_subr/mergeinfo.c:618
 msgid "Range list parsing ended before hitting newline"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:666
+#: ../libsvn_subr/mergeinfo.c:694
 #, c-format
 msgid ""
 "Unable to parse overlapping revision ranges '%s' and '%s' with different "
 "inheritance types"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:718
+#: ../libsvn_subr/mergeinfo.c:746
 #, c-format
 msgid "Mergeinfo for '%s' maps to an empty revision range"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:722
+#: ../libsvn_subr/mergeinfo.c:750
 #, c-format
 msgid "Could not find end of line in range list line in '%s'"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:786
+#: ../libsvn_subr/mergeinfo.c:814
 #, c-format
 msgid "Could not parse mergeinfo string '%s'"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:2418
+#: ../libsvn_subr/mergeinfo.c:829
+#, c-format
+msgid "<bad rangelist [%d ranges]: %s>"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:2313
 msgid "NULL mergeinfo catalog\n"
 msgstr ""
 
-#: ../libsvn_subr/mergeinfo.c:2423
+#: ../libsvn_subr/mergeinfo.c:2318
 msgid "empty mergeinfo catalog\n"
 msgstr ""
 
@@ -9917,6 +9960,19 @@ msgstr ""
 msgid "Config error: invalid value '%s' for option '%s'"
 msgstr ""
 
+#: ../libsvn_subr/sorts.c:314
+#, c-format
+msgid ""
+"svn_sort__array_insert2: Attempted insert at index %d in array length %d"
+msgstr ""
+
+#: ../libsvn_subr/sorts.c:345
+#, c-format
+msgid ""
+"svn_sort__array_delete2: Attempted delete at index %d, %d elements, in array "
+"length %d"
+msgstr ""
+
 #: ../libsvn_subr/sqlite.c:235
 #, c-format
 msgid "sqlite[S%d]: %s, executing statement '%s'"
@@ -9987,19 +10043,19 @@ msgstr ""
 msgid "Can't read special file: File '%s' not found"
 msgstr ""
 
-#: ../libsvn_subr/sysinfo.c:1472
+#: ../libsvn_subr/sysinfo.c:1474
 msgid "Intel"
 msgstr ""
 
-#: ../libsvn_subr/sysinfo.c:1473
+#: ../libsvn_subr/sysinfo.c:1475
 msgid "Intel 64-bit"
 msgstr ""
 
-#: ../libsvn_subr/sysinfo.c:1474
+#: ../libsvn_subr/sysinfo.c:1476
 msgid "PowerPC"
 msgstr ""
 
-#: ../libsvn_subr/sysinfo.c:1475
+#: ../libsvn_subr/sysinfo.c:1477
 msgid "PowerPC 64-bit"
 msgstr ""
 
@@ -10148,7 +10204,7 @@ msgstr ""
 
 #: ../libsvn_subr/version.c:146
 msgid ""
-"Copyright (C) 2019 The Apache Software Foundation.\n"
+"Copyright (C) 2020 The Apache Software Foundation.\n"
 "This software consists of contributions made by many people;\n"
 "see the NOTICE file for more information.\n"
 "Subversion is open source software, see http://subversion.apache.org/\n"
@@ -11386,10 +11442,6 @@ msgstr ""
 msgid "'%s' already in conflict"
 msgstr ""
 
-#: ../libsvn_wc/wc_db_update_move.c:1627
-msgid ".working"
-msgstr ""
-
 #: ../libsvn_wc/wc_db_update_move.c:2190
 #, c-format
 msgid ""
@@ -12370,241 +12422,241 @@ msgid ""
 "svn-viewspec.py format 1 does not support the 'switched' state found at '%s'"
 msgstr ""
 
-#: ../svn/info-cmd.c:471
+#: ../svn/info-cmd.c:473
 #, c-format
 msgid "'%s' is not a valid value for --show-item"
 msgstr ""
 
-#: ../svn/info-cmd.c:479
+#: ../svn/info-cmd.c:481
 #, c-format
 msgid "'%s' is not a valid value for --show-item; did you mean '%s'?"
 msgstr ""
 
-#: ../svn/info-cmd.c:489
+#: ../svn/info-cmd.c:491
 #, c-format
 msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?"
 msgstr ""
 
-#: ../svn/info-cmd.c:500
+#: ../svn/info-cmd.c:502
 #, c-format
 msgid ""
 "'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?"
 msgstr ""
 
-#: ../svn/info-cmd.c:524
+#: ../svn/info-cmd.c:526
 msgid "Resource is not under version control."
 msgstr ""
 
-#: ../svn/info-cmd.c:716 ../svnadmin/svnadmin.c:2385
-#: ../svnadmin/svnadmin.c:2621
+#: ../svn/info-cmd.c:718 ../svnadmin/svnadmin.c:2396
+#: ../svnadmin/svnadmin.c:2632
 #, c-format
 msgid "Path: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:723
+#: ../svn/info-cmd.c:725
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:727
+#: ../svn/info-cmd.c:729
 #, c-format
 msgid "Working Copy Root Path: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:733
+#: ../svn/info-cmd.c:735
 #, c-format
 msgid "URL: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:736
+#: ../svn/info-cmd.c:738
 #, c-format
 msgid "Relative URL: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:740
+#: ../svn/info-cmd.c:742
 #, c-format
 msgid "Repository Root: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:744
+#: ../svn/info-cmd.c:746
 #, c-format
 msgid "Repository UUID: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:748
+#: ../svn/info-cmd.c:750
 #, c-format
 msgid "Revision: %ld\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:753
+#: ../svn/info-cmd.c:755
 #, c-format
 msgid "Node Kind: file\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:757
+#: ../svn/info-cmd.c:759
 #, c-format
 msgid "Node Kind: directory\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:761
+#: ../svn/info-cmd.c:763
 #, c-format
 msgid "Node Kind: none\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:766
+#: ../svn/info-cmd.c:768
 #, c-format
 msgid "Node Kind: unknown\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:776
+#: ../svn/info-cmd.c:778
 #, c-format
 msgid "Size in Repository: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:785
+#: ../svn/info-cmd.c:787
 #, c-format
 msgid "Schedule: normal\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:789
+#: ../svn/info-cmd.c:791
 #, c-format
 msgid "Schedule: add\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:793
+#: ../svn/info-cmd.c:795
 #, c-format
 msgid "Schedule: delete\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:797
+#: ../svn/info-cmd.c:799
 #, c-format
 msgid "Schedule: replace\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:813
+#: ../svn/info-cmd.c:815
 #, c-format
 msgid "Depth: empty\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:817
+#: ../svn/info-cmd.c:819
 #, c-format
 msgid "Depth: files\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:821
+#: ../svn/info-cmd.c:823
 #, c-format
 msgid "Depth: immediates\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:825
+#: ../svn/info-cmd.c:827
 #, c-format
 msgid "Depth: exclude\n"
 msgstr ""
 
 #. Other depths should never happen here.
-#: ../svn/info-cmd.c:836
+#: ../svn/info-cmd.c:838
 #, c-format
 msgid "Depth: INVALID\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:840
+#: ../svn/info-cmd.c:842
 #, c-format
 msgid "Copied From URL: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:844
+#: ../svn/info-cmd.c:846
 #, c-format
 msgid "Copied From Rev: %ld\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:847
+#: ../svn/info-cmd.c:849
 #, c-format
 msgid "Moved From: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:854
+#: ../svn/info-cmd.c:856
 #, c-format
 msgid "Moved To: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:862
+#: ../svn/info-cmd.c:864
 #, c-format
 msgid "Last Changed Author: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:866
+#: ../svn/info-cmd.c:868
 #, c-format
 msgid "Last Changed Rev: %ld\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:871
+#: ../svn/info-cmd.c:873
 msgid "Last Changed Date"
 msgstr ""
 
-#: ../svn/info-cmd.c:877
+#: ../svn/info-cmd.c:879
 msgid "Text Last Updated"
 msgstr ""
 
-#: ../svn/info-cmd.c:880
+#: ../svn/info-cmd.c:882
 #, c-format
 msgid "Checksum: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:914
+#: ../svn/info-cmd.c:916
 #, c-format
 msgid "Conflict Previous Base File: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:922
+#: ../svn/info-cmd.c:924
 #, c-format
 msgid "Conflict Previous Working File: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:930
+#: ../svn/info-cmd.c:932
 #, c-format
 msgid "Conflict Current Base File: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:966
+#: ../svn/info-cmd.c:968
 msgid "Tree conflict"
 msgstr ""
 
-#: ../svn/info-cmd.c:970
+#: ../svn/info-cmd.c:972
 #, c-format
 msgid "Conflicted Properties: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:996
+#: ../svn/info-cmd.c:998
 msgid "Conflict Details"
 msgstr ""
 
-#: ../svn/info-cmd.c:1017
+#: ../svn/info-cmd.c:1019
 msgid "Source  left"
 msgstr ""
 
-#: ../svn/info-cmd.c:1026
+#: ../svn/info-cmd.c:1028
 msgid "Source right"
 msgstr ""
 
-#: ../svn/info-cmd.c:1035
+#: ../svn/info-cmd.c:1037
 #, c-format
 msgid "Lock Token: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:1039
+#: ../svn/info-cmd.c:1041
 #, c-format
 msgid "Lock Owner: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:1044
+#: ../svn/info-cmd.c:1046
 msgid "Lock Created"
 msgstr ""
 
-#: ../svn/info-cmd.c:1048
+#: ../svn/info-cmd.c:1050
 msgid "Lock Expires"
 msgstr ""
 
-#: ../svn/info-cmd.c:1056
+#: ../svn/info-cmd.c:1058
 #, c-format
 msgid ""
 "Lock Comment (%i line):\n"
@@ -12615,43 +12667,43 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svn/info-cmd.c:1065
+#: ../svn/info-cmd.c:1067
 #, c-format
 msgid "Changelist: %s\n"
 msgstr ""
 
-#: ../svn/info-cmd.c:1171
+#: ../svn/info-cmd.c:1173
 #, c-format
 msgid "can't show in-repository size of working copy file '%s'"
 msgstr ""
 
-#: ../svn/info-cmd.c:1275
+#: ../svn/info-cmd.c:1284
 msgid "--show-item is not valid in --xml mode"
 msgstr ""
 
-#: ../svn/info-cmd.c:1279
+#: ../svn/info-cmd.c:1288
 msgid "--no-newline is not valid in --xml mode"
 msgstr ""
 
-#: ../svn/info-cmd.c:1283 ../svn/list-cmd.c:356
+#: ../svn/info-cmd.c:1292 ../svn/list-cmd.c:356
 msgid "--human-readable is not valid in --xml mode"
 msgstr ""
 
-#: ../svn/info-cmd.c:1298 ../svn/info-cmd.c:1318 ../svn/list-cmd.c:369
+#: ../svn/info-cmd.c:1307 ../svn/info-cmd.c:1327 ../svn/list-cmd.c:369
 msgid "--incremental is only valid in --xml mode"
 msgstr ""
 
-#: ../svn/info-cmd.c:1305
+#: ../svn/info-cmd.c:1314
 msgid ""
 "--no-newline is only available for single-target, non-recursive info "
 "operations"
 msgstr ""
 
-#: ../svn/info-cmd.c:1322
+#: ../svn/info-cmd.c:1331
 msgid "--no-newline' is only valid with --show-item"
 msgstr ""
 
-#: ../svn/info-cmd.c:1395 ../svnbench/null-info-cmd.c:283
+#: ../svn/info-cmd.c:1404 ../svnbench/null-info-cmd.c:283
 msgid "Could not display info for all targets because some targets don't exist"
 msgstr ""
 
@@ -12688,7 +12740,7 @@ msgstr ""
 msgid "One or more locks could not be obtained"
 msgstr ""
 
-#: ../svn/log-cmd.c:111 ../svn/svn.c:1180 ../svn/svn.c:1252 ../svn/svn.c:1318
+#: ../svn/log-cmd.c:111 ../svn/svn.c:1089 ../svn/svn.c:1161 ../svn/svn.c:1227
 msgid "\n"
 msgstr ""
 
@@ -12744,37 +12796,33 @@ msgid "'diff' option is not supported in XML mode"
 msgstr ""
 
 #: ../svn/log-cmd.c:738
-msgid "'quiet' and 'diff' options are mutually exclusive"
-msgstr ""
-
-#: ../svn/log-cmd.c:742
 msgid "'diff-cmd' option requires 'diff' option"
 msgstr ""
 
-#: ../svn/log-cmd.c:746
+#: ../svn/log-cmd.c:742
 msgid "'internal-diff' option requires 'diff' option"
 msgstr ""
 
-#: ../svn/log-cmd.c:750
+#: ../svn/log-cmd.c:746
 msgid "'extensions' option requires 'diff' option"
 msgstr ""
 
-#: ../svn/log-cmd.c:755
+#: ../svn/log-cmd.c:751
 msgid "'depth' option requires 'diff' option"
 msgstr ""
 
-#: ../svn/log-cmd.c:771 ../svnbench/null-log-cmd.c:158
+#: ../svn/log-cmd.c:767 ../svnbench/null-log-cmd.c:158
 msgid "-c and -r are mutually exclusive"
 msgstr ""
 
-#: ../svn/log-cmd.c:803
+#: ../svn/log-cmd.c:799
 #, c-format
 msgid ""
 "Only relative paths can be specified after a URL for 'svn log', but '%s' is "
 "not a relative path"
 msgstr ""
 
-#: ../svn/log-cmd.c:850
+#: ../svn/log-cmd.c:846
 #, c-format
 msgid "cannot assign with 'with-revprop' option (drop the '=')"
 msgstr ""
@@ -12802,7 +12850,7 @@ msgid "Second revision required"
 msgstr ""
 
 #: ../svn/merge-cmd.c:368 ../svn/merge-cmd.c:395 ../svn/mergeinfo-cmd.c:361
-#: ../svnadmin/svnadmin.c:2589 ../svnlook/svnlook.c:2086
+#: ../svnadmin/svnadmin.c:2600 ../svnlook/svnlook.c:2086
 #: ../svnlook/svnlook.c:2280 ../svnlook/svnlook.c:2384
 #: ../svnlook/svnlook.c:2419
 msgid "Too many arguments given"
@@ -13251,7 +13299,7 @@ msgstr ""
 msgid "Transmitting file data "
 msgstr ""
 
-#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2566 ../svnbench/notify.c:749
+#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2577 ../svnbench/notify.c:749
 #, c-format
 msgid "'%s' locked by user '%s'.\n"
 msgstr ""
@@ -13598,153 +13646,377 @@ msgstr ""
 msgid "Try 'svn revert --depth infinity' instead?"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:56
+#: ../svn/shelf-cmd.c:58 ../svn/shelf2-cmd.c:58
 #, c-format
 msgid "Shelf '%s': no versions found"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:144
+#: ../svn/shelf-cmd.c:146 ../svn/shelf2-cmd.c:146
 msgid "All targets must be in the same WC"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:164
+#: ../svn/shelf-cmd.c:166 ../svn/shelf2-cmd.c:166
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svn/shelf-cmd.c:169
+#: ../svn/shelf-cmd.c:171 ../svn/shelf2-cmd.c:171
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svn/shelf-cmd.c:174
+#: ../svn/shelf-cmd.c:176 ../svn/shelf2-cmd.c:176
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svn/shelf-cmd.c:233
+#: ../svn/shelf-cmd.c:235 ../svn/shelf2-cmd.c:235
 #, c-format
 msgid "version %d"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:236
+#: ../svn/shelf-cmd.c:238 ../svn/shelf2-cmd.c:238
 #, c-format
 msgid "version %d of %d"
 msgid_plural "version %d of %d"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svn/shelf-cmd.c:242
+#: ../svn/shelf-cmd.c:244 ../svn/shelf2-cmd.c:244
 #, c-format
 msgid "%d path changed"
 msgid_plural "%d paths changed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svn/shelf-cmd.c:258
+#: ../svn/shelf-cmd.c:260 ../svn/shelf2-cmd.c:260
 #, c-format
 msgid " %.50s\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:351
+#: ../svn/shelf-cmd.c:353 ../svn/shelf2-cmd.c:353
 msgid "No shelves found"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:467
+#: ../svn/shelf-cmd.c:469 ../svn/shelf2-cmd.c:469
 #, c-format
 msgid "--- Save a new version of '%s' in WC root '%s'\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:468
+#: ../svn/shelf-cmd.c:470 ../svn/shelf2-cmd.c:470
 #, c-format
 msgid "--- Shelve '%s' in WC root '%s'\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:483
+#: ../svn/shelf-cmd.c:485 ../svn/shelf2-cmd.c:485
 #, c-format
 msgid "--- Saving...\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:484
+#: ../svn/shelf-cmd.c:486 ../svn/shelf2-cmd.c:486
 #, c-format
 msgid "--- Shelving...\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:496
+#: ../svn/shelf-cmd.c:498 ../svn/shelf2-cmd.c:498
 #, c-format
 msgid "%d path could not be shelved"
 msgid_plural "%d paths could not be shelved"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svn/shelf-cmd.c:506
+#: ../svn/shelf-cmd.c:508 ../svn/shelf2-cmd.c:508
 #, c-format
 msgid "No local modifications could be saved"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:507
+#: ../svn/shelf-cmd.c:509 ../svn/shelf2-cmd.c:509
 #, c-format
 msgid "No local modifications could be shelved"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:611
+#: ../svn/shelf-cmd.c:613 ../svn/shelf2-cmd.c:613
 #, c-format
 msgid "Shelved path '%s' already has status '%c' in the working copy"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:664
+#: ../svn/shelf-cmd.c:666 ../svn/shelf2-cmd.c:666
 #, c-format
 msgid "--- Unshelve '%s' in WC root '%s'\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:672
+#: ../svn/shelf-cmd.c:674 ../svn/shelf2-cmd.c:674
 msgid ""
 "Cannot unshelve/restore, as at least one shelved path would conflict with a "
 "local modification or other status in the working copy"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:690
+#: ../svn/shelf-cmd.c:692 ../svn/shelf2-cmd.c:692
 #, c-format
 msgid "restored '%s' version %d and deleted %d newer version\n"
 msgid_plural "restored '%s' version %d and deleted %d newer versions\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svn/shelf-cmd.c:696
+#: ../svn/shelf-cmd.c:698 ../svn/shelf2-cmd.c:698
 #, c-format
 msgid "restored '%s' version %d (the newest version)\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:797
+#: ../svn/shelf-cmd.c:799 ../svn/shelf2-cmd.c:799
 #, c-format
 msgid "deleted '%s'\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:897
+#: ../svn/shelf-cmd.c:904 ../svn/shelf2-cmd.c:904
 #, c-format
 msgid "saved '%s' version %d\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:901
+#: ../svn/shelf-cmd.c:908 ../svn/shelf2-cmd.c:908
 #, c-format
 msgid "shelved '%s' version %d\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:932
+#: ../svn/shelf-cmd.c:939 ../svn/shelf2-cmd.c:939
 #, c-format
 msgid "unshelving the youngest shelf, '%s'\n"
 msgstr ""
 
-#: ../svn/shelf-cmd.c:942 ../svn/shelf-cmd.c:1127 ../svnadmin/svnadmin.c:783
+#: ../svn/shelf-cmd.c:949 ../svn/shelf-cmd.c:1134 ../svn/shelf2-cmd.c:949
+#: ../svn/shelf2-cmd.c:1134 ../svnadmin/svnadmin.c:794
 msgid "Too many arguments"
 msgstr ""
 
+#: ../svn/shelf-cmd.c:1246 ../svn/shelf2-cmd.c:1222
+msgid ""
+"Show shelved changes as a diff.\n"
+"usage: x-shelf-diff SHELF [VERSION]\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1249 ../svn/shelf2-cmd.c:1225
+msgid ""
+"  Show the changes in SHELF:VERSION (default: latest) as a diff.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1251 ../svn/shelf2-cmd.c:1227
+msgid ""
+"  See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n"
+"  'svn diff'.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1254 ../svn/shelf-cmd.c:1267 ../svn/shelf-cmd.c:1280
+#: ../svn/shelf-cmd.c:1292 ../svn/shelf-cmd.c:1304 ../svn/shelf-cmd.c:1319
+#: ../svn/shelf-cmd.c:1353 ../svn/shelf-cmd.c:1386 ../svn/shelf2-cmd.c:1230
+#: ../svn/shelf2-cmd.c:1243 ../svn/shelf2-cmd.c:1256 ../svn/shelf2-cmd.c:1268
+#: ../svn/shelf2-cmd.c:1280 ../svn/shelf2-cmd.c:1295 ../svn/shelf2-cmd.c:1329
+#: ../svn/shelf2-cmd.c:1362
+msgid ""
+"  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+"  in the next release, and there is no promise of backward compatibility.\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1261 ../svn/shelf2-cmd.c:1237
+msgid ""
+"Delete a shelf.\n"
+"usage: x-shelf-drop SHELF [PATH ...]\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1264 ../svn/shelf2-cmd.c:1240
+msgid ""
+"  Delete the shelves named SHELF from the working copies containing PATH\n"
+"  (default PATH is '.')\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1273 ../svn/shelf2-cmd.c:1249
+msgid ""
+"List shelves.\n"
+"usage: x-shelf-list [PATH ...]\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1276 ../svn/shelf2-cmd.c:1252
+msgid ""
+"  List shelves for each working copy containing PATH (default is '.')\n"
+"  Include the first line of any log message and some details about the\n"
+"  contents of the shelf, unless '-q' is given.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1287 ../svn/shelf2-cmd.c:1263
+msgid ""
+"List which shelf affects each path.\n"
+"usage: x-shelf-list-by-paths [PATH...]\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1290 ../svn/shelf2-cmd.c:1266
+msgid ""
+"  List which shelf most recently affects each path below the given PATHs.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1298 ../svn/shelf2-cmd.c:1274
+msgid ""
+"Show the versions of a shelf.\n"
+"usage: x-shelf-log SHELF [PATH...]\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1301 ../svn/shelf2-cmd.c:1277
+msgid ""
+"  Show all versions of SHELF for each working copy containing PATH (the\n"
+"  default PATH is '.').\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1311 ../svn/shelf2-cmd.c:1287
+msgid ""
+"Copy local changes onto a new version of a shelf.\n"
+"usage: x-shelf-save SHELF [PATH...]\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1314 ../svn/shelf2-cmd.c:1290
+msgid ""
+"  Save local changes in the given PATHs as a new version of SHELF.\n"
+"  The shelf's log message can be set with -m, -F, etc.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1317 ../svn/shelf2-cmd.c:1293
+msgid ""
+"  The same as 'svn shelve --keep-local'.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1329 ../svn/shelf2-cmd.c:1305
+msgid ""
+"Move local changes onto a shelf.\n"
+"usage: x-shelve [--keep-local] SHELF [PATH...]\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1332 ../svn/shelf2-cmd.c:1308
+msgid ""
+"  Save the local changes in the given PATHs to a new or existing SHELF.\n"
+"  Revert those changes from the WC unless '--keep-local' is given.\n"
+"  The shelf's log message can be set with -m, -F, etc.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1336 ../svn/shelf2-cmd.c:1312
+msgid ""
+"  'svn shelve --keep-local' is the same as 'svn shelf-save'.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1338 ../svn/shelf2-cmd.c:1314
+msgid ""
+"  The kinds of change you can shelve are committable changes to files and\n"
+"  properties, except the following kinds which are not yet supported:\n"
+"     * copies and moves\n"
+"     * mkdir and rmdir\n"
+"  Uncommittable states such as conflicts, unversioned and missing cannot\n"
+"  be shelved.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1345 ../svn/shelf2-cmd.c:1321
+msgid ""
+"  To bring back shelved changes, use 'svn unshelve SHELF'.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1347 ../svn/shelf2-cmd.c:1323
+msgid ""
+"  Shelves are currently stored under <WC>/.svn/experimental/shelves/ .\n"
+"  (In Subversion 1.10, shelves were stored under <WC>/.svn/shelves/ as\n"
+"  patch files. To recover a shelf created by 1.10, either use a 1.10\n"
+"  client to find and unshelve it, or find the patch file and use any\n"
+"  1.10 or later 'svn patch' to apply it.)\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1362 ../svn/shelf2-cmd.c:1338
+msgid ""
+"Copy shelved changes back into the WC.\n"
+"usage: x-unshelve [--drop] [SHELF [VERSION]]\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1365 ../svn/shelf2-cmd.c:1341
+msgid ""
+"  Apply the changes stored in SHELF to the working copy.\n"
+"  SHELF defaults to the newest shelf.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1368 ../svn/shelf2-cmd.c:1344
+msgid ""
+"  Apply the newest version of the shelf, by default. If VERSION is\n"
+"  specified, apply that version and discard all versions newer than that.\n"
+"  In any case, retain the unshelved version and versions older than that\n"
+"  (unless --drop is specified).\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1373 ../svn/shelf2-cmd.c:1349
+msgid ""
+"  With --drop, delete the entire shelf (like 'svn shelf-drop') after\n"
+"  successfully unshelving with no conflicts.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1376 ../svn/shelf2-cmd.c:1352
+msgid ""
+"  The working files involved should be in a clean, unmodified state\n"
+"  before using this command. To roll back to an older version of the\n"
+"  shelf, first ensure any current working changes are removed, such as\n"
+"  by shelving or reverting them, and then unshelve the desired version.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1381 ../svn/shelf2-cmd.c:1357
+msgid ""
+"  Unshelve normally refuses to apply any changes if any path involved is\n"
+"  already modified (or has any other abnormal status) in the WC. With\n"
+"  --force, it does not check and may error out and/or produce partial or\n"
+"  unexpected results.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1392
+msgid ""
+"Copy local modifications from one WC to another.\n"
+"usage: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1395
+msgid ""
+"  The source and destination WC paths may be in the same WC or in different  "
+"WCs.\n"
+"\n"
+msgstr ""
+
+#: ../svn/shelf-cmd.c:1398
+msgid ""
+"  This feature is EXPERIMENTAL. This command is likely to change\n"
+"  in the next release, and there is no promise of backward compatibility.\n"
+msgstr ""
+
 #: ../svn/status-cmd.c:97
 #, c-format
 msgid "  Text conflicts: %u\n"
@@ -13786,16 +14058,16 @@ msgstr ""
 msgid "moved to %s"
 msgstr ""
 
-#: ../svn/svn.c:161
+#: ../svn/svn.c:74
 msgid "force operation to run"
 msgstr ""
 
-#: ../svn/svn.c:163
+#: ../svn/svn.c:76
 msgid "force validity of log message source"
 msgstr ""
 
-#: ../svn/svn.c:164 ../svn/svn.c:165 ../svnadmin/svnadmin.c:171
-#: ../svnadmin/svnadmin.c:174 ../svnbench/svnbench.c:83
+#: ../svn/svn.c:77 ../svn/svn.c:78 ../svnadmin/svnadmin.c:172
+#: ../svnadmin/svnadmin.c:175 ../svnbench/svnbench.c:83
 #: ../svnbench/svnbench.c:84 ../svndumpfilter/svndumpfilter.c:945
 #: ../svndumpfilter/svndumpfilter.c:948 ../svnfsfs/svnfsfs.c:89
 #: ../svnfsfs/svnfsfs.c:92 ../svnlook/svnlook.c:115 ../svnlook/svnlook.c:127
@@ -13803,27 +14075,27 @@ msgstr ""
 msgid "show help on a subcommand"
 msgstr ""
 
-#: ../svn/svn.c:166
+#: ../svn/svn.c:79
 msgid "specify log message ARG"
 msgstr ""
 
-#: ../svn/svn.c:167 ../svnbench/svnbench.c:85
+#: ../svn/svn.c:80 ../svnbench/svnbench.c:85
 msgid "print nothing, or only summary information"
 msgstr ""
 
-#: ../svn/svn.c:168 ../svnbench/svnbench.c:86
+#: ../svn/svn.c:81 ../svnbench/svnbench.c:86
 msgid "descend recursively, same as --depth=infinity"
 msgstr ""
 
-#: ../svn/svn.c:169
+#: ../svn/svn.c:82
 msgid "obsolete"
 msgstr ""
 
-#: ../svn/svn.c:170
+#: ../svn/svn.c:83
 msgid "show human-readable output"
 msgstr ""
 
-#: ../svn/svn.c:172 ../svnbench/svnbench.c:89
+#: ../svn/svn.c:85 ../svnbench/svnbench.c:89
 msgid ""
 "the change made by revision ARG (like -r ARG-1:ARG)\n"
 "                             If ARG is negative this is like -r ARG:ARG-1\n"
@@ -13832,7 +14104,7 @@ msgid ""
 "                             ARG1:ARG2, where ARG1 is inclusive"
 msgstr ""
 
-#: ../svn/svn.c:180 ../svnbench/svnbench.c:97
+#: ../svn/svn.c:93 ../svnbench/svnbench.c:97
 msgid ""
 "ARG (some commands also take ARG1:ARG2 range)\n"
 "                             A revision argument can be one of:\n"
@@ -13845,19 +14117,19 @@ msgid ""
 "                                'PREV'       revision just before COMMITTED"
 msgstr ""
 
-#: ../svn/svn.c:195
+#: ../svn/svn.c:108
 msgid "read log message from file ARG"
 msgstr ""
 
-#: ../svn/svn.c:197
+#: ../svn/svn.c:110
 msgid "give output suitable for concatenation"
 msgstr ""
 
-#: ../svn/svn.c:199
+#: ../svn/svn.c:112
 msgid "treat value as being in charset encoding ARG"
 msgstr ""
 
-#: ../svn/svn.c:200 ../svnadmin/svnadmin.c:177 ../svnbench/svnbench.c:112
+#: ../svn/svn.c:113 ../svnadmin/svnadmin.c:178 ../svnbench/svnbench.c:112
 #: ../svndumpfilter/svndumpfilter.c:951 ../svnfsfs/svnfsfs.c:95
 #: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:142
 #: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:287
@@ -13865,29 +14137,29 @@ msgstr ""
 msgid "show program version information"
 msgstr ""
 
-#: ../svn/svn.c:201 ../svnbench/svnbench.c:113
+#: ../svn/svn.c:114 ../svnbench/svnbench.c:113
 msgid "print extra information"
 msgstr ""
 
-#: ../svn/svn.c:202
+#: ../svn/svn.c:115
 msgid "display update information"
 msgstr ""
 
-#: ../svn/svn.c:203 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:124
+#: ../svn/svn.c:116 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:124
 msgid "specify a username ARG"
 msgstr ""
 
-#: ../svn/svn.c:205
+#: ../svn/svn.c:118
 msgid ""
 "specify a password ARG (caution: on many operating\n"
 "                             systems, other users will be able to see this)"
 msgstr ""
 
-#: ../svn/svn.c:210 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:128
+#: ../svn/svn.c:123 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:128
 msgid "read password from stdin"
 msgstr ""
 
-#: ../svn/svn.c:212
+#: ../svn/svn.c:125
 msgid ""
 "Specify differencing options for external diff or\n"
 "                             internal diff or blame. Default: '-u'. Options "
@@ -13907,52 +14179,52 @@ msgid ""
 "                               -p, --show-c-function: Show C function name"
 msgstr ""
 
-#: ../svn/svn.c:232 ../svnbench/svnbench.c:119
+#: ../svn/svn.c:145 ../svnbench/svnbench.c:119
 msgid "pass contents of file ARG as additional args"
 msgstr ""
 
-#: ../svn/svn.c:234 ../svnbench/svnbench.c:121
+#: ../svn/svn.c:147 ../svnbench/svnbench.c:121
 msgid ""
 "limit operation by depth ARG ('empty', 'files',\n"
 "                             'immediates', or 'infinity')"
 msgstr ""
 
-#: ../svn/svn.c:238
+#: ../svn/svn.c:151
 msgid ""
 "set new working copy depth to ARG ('exclude',\n"
 "                             'empty', 'files', 'immediates', or 'infinity')"
 msgstr ""
 
-#: ../svn/svn.c:241 ../svnlook/svnlook.c:182
+#: ../svn/svn.c:154 ../svnlook/svnlook.c:182
 msgid "output in XML"
 msgstr ""
 
-#: ../svn/svn.c:242
+#: ../svn/svn.c:155
 msgid "DEPRECATED"
 msgstr ""
 
-#: ../svn/svn.c:244 ../svnbench/svnbench.c:126
+#: ../svn/svn.c:157 ../svnbench/svnbench.c:126
 msgid "do not cross copies while traversing history"
 msgstr ""
 
-#: ../svn/svn.c:246
+#: ../svn/svn.c:159
 msgid ""
 "disregard default and svn:ignore and\n"
 "                             svn:global-ignores property ignores"
 msgstr ""
 
-#: ../svn/svn.c:250 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:138
+#: ../svn/svn.c:163 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:138
 #: ../svnsync/svnsync.c:203
 msgid "do not cache authentication tokens"
 msgstr ""
 
-#: ../svn/svn.c:252 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:152
+#: ../svn/svn.c:165 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:152
 msgid ""
 "deprecated; same as\n"
 "                             --trust-server-cert-failures=unknown-ca"
 msgstr ""
 
-#: ../svn/svn.c:256 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:156
+#: ../svn/svn.c:169 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:156
 msgid ""
 "with --non-interactive, accept SSL server\n"
 "                             certificates with failures; ARG is comma-"
@@ -13965,64 +14237,64 @@ msgid ""
 "                             separately classified certificate errors)."
 msgstr ""
 
-#: ../svn/svn.c:270 ../svnrdump/svnrdump.c:130 ../svnsync/svnsync.c:195
+#: ../svn/svn.c:183 ../svnrdump/svnrdump.c:130 ../svnsync/svnsync.c:195
 msgid ""
 "do no interactive prompting (default is to prompt\n"
 "                             only if standard input is a terminal device)"
 msgstr ""
 
-#: ../svn/svn.c:274 ../svnrdump/svnrdump.c:134 ../svnsync/svnsync.c:199
+#: ../svn/svn.c:187 ../svnrdump/svnrdump.c:134 ../svnsync/svnsync.c:199
 msgid ""
 "do interactive prompting even if standard input\n"
 "                             is not a terminal device"
 msgstr ""
 
-#: ../svn/svn.c:278
+#: ../svn/svn.c:191
 msgid "try operation but make no changes"
 msgstr ""
 
-#: ../svn/svn.c:280
+#: ../svn/svn.c:193
 msgid "disable merge tracking; diff nodes as if related"
 msgstr ""
 
-#: ../svn/svn.c:282
+#: ../svn/svn.c:195
 msgid "ignore externals definitions"
 msgstr ""
 
-#: ../svn/svn.c:283
+#: ../svn/svn.c:196
 msgid "use ARG as merge command"
 msgstr ""
 
-#: ../svn/svn.c:284
+#: ../svn/svn.c:197
 msgid "use ARG as external editor"
 msgstr ""
 
-#: ../svn/svn.c:286
+#: ../svn/svn.c:199
 msgid "merge only mergeinfo differences"
 msgstr ""
 
-#: ../svn/svn.c:287
+#: ../svn/svn.c:200
 msgid "use ARG as the older target"
 msgstr ""
 
-#: ../svn/svn.c:288
+#: ../svn/svn.c:201
 msgid "use ARG as the newer target"
 msgstr ""
 
-#: ../svn/svn.c:290
+#: ../svn/svn.c:203
 msgid "operate on a revision property (use with -r)"
 msgstr ""
 
-#: ../svn/svn.c:291
+#: ../svn/svn.c:204
 msgid "relocate via URL-rewriting"
 msgstr ""
 
-#: ../svn/svn.c:293 ../svnadmin/svnadmin.c:224 ../svnbench/svnbench.c:150
+#: ../svn/svn.c:206 ../svnadmin/svnadmin.c:225 ../svnbench/svnbench.c:150
 #: ../svnrdump/svnrdump.c:122 ../svnsync/svnsync.c:253
 msgid "read user configuration files from directory ARG"
 msgstr ""
 
-#: ../svn/svn.c:295 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:144
+#: ../svn/svn.c:208 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:144
 #: ../svnsync/svnsync.c:255
 msgid ""
 "set user configuration option in the format:\n"
@@ -14031,15 +14303,15 @@ msgid ""
 "                                 servers:global:http-library=serf"
 msgstr ""
 
-#: ../svn/svn.c:302
+#: ../svn/svn.c:215
 msgid "enable automatic properties"
 msgstr ""
 
-#: ../svn/svn.c:303
+#: ../svn/svn.c:216
 msgid "disable automatic properties"
 msgstr ""
 
-#: ../svn/svn.c:305
+#: ../svn/svn.c:218
 msgid ""
 "use a different EOL marker than the standard\n"
 "                             system marker for files with the svn:eol-style\n"
@@ -14047,55 +14319,55 @@ msgid ""
 "                             ARG may be one of 'LF', 'CR', 'CRLF'"
 msgstr ""
 
-#: ../svn/svn.c:312 ../svnbench/svnbench.c:159
+#: ../svn/svn.c:225 ../svnbench/svnbench.c:159
 msgid "maximum number of log entries"
 msgstr ""
 
-#: ../svn/svn.c:313
+#: ../svn/svn.c:226
 msgid "don't unlock the targets"
 msgstr ""
 
-#: ../svn/svn.c:314
+#: ../svn/svn.c:227
 msgid "remove changelist association"
 msgstr ""
 
-#: ../svn/svn.c:316
+#: ../svn/svn.c:229
 msgid "operate only on members of changelist ARG"
 msgstr ""
 
-#: ../svn/svn.c:318
+#: ../svn/svn.c:231
 msgid "don't delete changelists after commit"
 msgstr ""
 
-#: ../svn/svn.c:319
+#: ../svn/svn.c:232
 msgid "keep path in working copy"
 msgstr ""
 
-#: ../svn/svn.c:321 ../svnbench/svnbench.c:161
+#: ../svn/svn.c:234 ../svnbench/svnbench.c:161
 msgid "retrieve all revision properties"
 msgstr ""
 
-#: ../svn/svn.c:323 ../svnbench/svnbench.c:163
+#: ../svn/svn.c:236 ../svnbench/svnbench.c:163
 msgid "retrieve no revision properties"
 msgstr ""
 
-#: ../svn/svn.c:325 ../svnbench/svnbench.c:165
+#: ../svn/svn.c:238 ../svnbench/svnbench.c:165
 msgid ""
 "set revision property ARG in new revision\n"
 "                             using the name[=value] format"
 msgstr ""
 
-#: ../svn/svn.c:328
+#: ../svn/svn.c:241
 msgid "make intermediate directories"
 msgstr ""
 
-#: ../svn/svn.c:330 ../svnbench/svnbench.c:169
+#: ../svn/svn.c:243 ../svnbench/svnbench.c:169
 msgid ""
 "use/display additional information from merge\n"
 "                             history"
 msgstr ""
 
-#: ../svn/svn.c:334
+#: ../svn/svn.c:247
 msgid ""
 "specify automatic conflict resolution action\n"
 "                             ('postpone', 'working', 'base', 'mine-"
@@ -14105,17 +14377,17 @@ msgid ""
 "                             'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l', 'r')"
 msgstr ""
 
-#: ../svn/svn.c:345
+#: ../svn/svn.c:258
 msgid ""
 "specify which collection of revisions to display\n"
 "                             ('merged', 'eligible')"
 msgstr ""
 
-#: ../svn/svn.c:349
+#: ../svn/svn.c:262
 msgid "deprecated"
 msgstr ""
 
-#: ../svn/svn.c:351
+#: ../svn/svn.c:264
 msgid ""
 "number of leading path components to strip from\n"
 "                             paths parsed from the patch file. --strip 0\n"
@@ -14129,89 +14401,89 @@ msgid ""
 "component."
 msgstr ""
 
-#: ../svn/svn.c:367
+#: ../svn/svn.c:280
 msgid "don't expand keywords"
 msgstr ""
 
-#: ../svn/svn.c:369
+#: ../svn/svn.c:282
 msgid "apply the unidiff in reverse"
 msgstr ""
 
-#: ../svn/svn.c:371
+#: ../svn/svn.c:284
 msgid "ignore whitespace during pattern matching"
 msgstr ""
 
-#: ../svn/svn.c:372
+#: ../svn/svn.c:285
 msgid "produce diff output"
 msgstr ""
 
 #. maps to show_diff
 #. diff options
-#: ../svn/svn.c:374 ../svnlook/svnlook.c:139
+#: ../svn/svn.c:287 ../svnlook/svnlook.c:139
 msgid "use ARG as diff command"
 msgstr ""
 
-#: ../svn/svn.c:376
+#: ../svn/svn.c:289
 msgid "override diff-cmd specified in config file"
 msgstr ""
 
-#: ../svn/svn.c:378 ../svnlook/svnlook.c:133
+#: ../svn/svn.c:291 ../svnlook/svnlook.c:133
 msgid "do not print differences for added files"
 msgstr ""
 
-#: ../svn/svn.c:380 ../svnlook/svnlook.c:136
+#: ../svn/svn.c:293 ../svnlook/svnlook.c:136
 msgid "do not print differences for deleted files"
 msgstr ""
 
-#: ../svn/svn.c:382
+#: ../svn/svn.c:295
 msgid "don't diff copied or moved files with their source"
 msgstr ""
 
-#: ../svn/svn.c:384
+#: ../svn/svn.c:297
 msgid "diff unrelated nodes as delete and add"
 msgstr ""
 
-#: ../svn/svn.c:385
+#: ../svn/svn.c:298
 msgid "show a summary of the results"
 msgstr ""
 
-#: ../svn/svn.c:387
+#: ../svn/svn.c:300
 msgid "use git's extended diff format"
 msgstr ""
 
-#: ../svn/svn.c:389 ../svnlook/svnlook.c:142
+#: ../svn/svn.c:302 ../svnlook/svnlook.c:142
 msgid "ignore properties during the operation"
 msgstr ""
 
-#: ../svn/svn.c:391 ../svnlook/svnlook.c:145
+#: ../svn/svn.c:304 ../svnlook/svnlook.c:145
 msgid "show only properties during the operation"
 msgstr ""
 
-#: ../svn/svn.c:393
+#: ../svn/svn.c:306
 msgid ""
 "generate diff suitable for generic third-party\n"
 "                             patch tools; currently the same as\n"
 "                             --show-copies-as-adds --ignore-properties"
 msgstr ""
 
-#: ../svn/svn.c:401
+#: ../svn/svn.c:314
 msgid ""
 "Allow operation on mixed-revision working copy.\n"
 "                             Use of this option is not recommended!\n"
 "                             Please run 'svn update' instead."
 msgstr ""
 
-#: ../svn/svn.c:407
+#: ../svn/svn.c:320
 msgid ""
 "also operate on externals defined by\n"
 "                             svn:externals properties"
 msgstr ""
 
-#: ../svn/svn.c:411
+#: ../svn/svn.c:324
 msgid "retrieve properties set on parents of the target"
 msgstr ""
 
-#: ../svn/svn.c:413
+#: ../svn/svn.c:326
 msgid ""
 "use ARG as search pattern (glob syntax, case-\n"
 "                             and accent-insensitive, may require quotation "
@@ -14219,41 +14491,41 @@ msgid ""
 "                             to prevent shell expansion)"
 msgstr ""
 
-#: ../svn/svn.c:419
+#: ../svn/svn.c:332
 msgid "combine ARG with the previous search pattern"
 msgstr ""
 
-#: ../svn/svn.c:421
+#: ../svn/svn.c:334
 msgid "show revision log message, author and date"
 msgstr ""
 
-#: ../svn/svn.c:423
+#: ../svn/svn.c:336
 msgid "remove unversioned items"
 msgstr ""
 
-#: ../svn/svn.c:424
+#: ../svn/svn.c:337
 msgid "remove ignored items"
 msgstr ""
 
-#: ../svn/svn.c:426
+#: ../svn/svn.c:339
 msgid "reverting an added item will remove it from disk"
 msgstr ""
 
-#: ../svn/svn.c:427 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140
+#: ../svn/svn.c:340 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140
 msgid "do not output the trailing newline"
 msgstr ""
 
-#: ../svn/svn.c:428
+#: ../svn/svn.c:341
 msgid "show cached passwords"
 msgstr ""
 
-#: ../svn/svn.c:430
+#: ../svn/svn.c:343
 msgid ""
 "pin externals with no explicit revision to their\n"
 "                             current revision (recommended when tagging)"
 msgstr ""
 
-#: ../svn/svn.c:434
+#: ../svn/svn.c:347
 msgid ""
 "print only the item identified by ARG:\n"
 "                                'kind'       node kind of TARGET\n"
@@ -14281,10 +14553,11 @@ msgid ""
 "                                'wc-root'    root of TARGET's working copy\n"
 "                                'schedule'   "
 "'normal','add','delete','replace'\n"
-"                                'depth'      checkout depth of TARGET in WC"
+"                                'depth'      checkout depth of TARGET in WC\n"
+"                                'changelist' changelist of TARGET in WC"
 msgstr ""
 
-#: ../svn/svn.c:477
+#: ../svn/svn.c:392
 msgid ""
 "Local additions are merged with incoming additions\n"
 "                             instead of causing a tree conflict. Use of "
@@ -14294,28 +14567,28 @@ msgid ""
 "                             resolve tree conflicts instead."
 msgstr ""
 
-#: ../svn/svn.c:486
+#: ../svn/svn.c:401
 msgid "remove unreferenced pristines from .svn directory"
 msgstr ""
 
-#: ../svn/svn.c:489
+#: ../svn/svn.c:404
 msgid "drop shelf after successful unshelve"
 msgstr ""
 
-#: ../svn/svn.c:492
+#: ../svn/svn.c:407
 msgid ""
 "print the working copy layout, formatted according\n"
 "                             to ARG: 'classic' or 'svn11'"
 msgstr ""
 
-#: ../svn/svn.c:544
+#: ../svn/svn.c:452
 msgid ""
 "Put new files and directories under version control.\n"
 "usage: add PATH...\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:547
+#: ../svn/svn.c:455
 msgid ""
 "  Schedule unversioned PATHs for addition, so they will become versioned "
 "and\n"
@@ -14325,7 +14598,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:551
+#: ../svn/svn.c:459
 msgid ""
 "  The 'svn add' command is only necessary for files and directories that "
 "are\n"
@@ -14334,7 +14607,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:555
+#: ../svn/svn.c:463
 msgid ""
 "  The effects of 'svn add' can be undone with 'svn revert' before the "
 "addition\n"
@@ -14345,33 +14618,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:560
+#: ../svn/svn.c:468
 msgid ""
 "  With --force, add all the unversioned paths found in PATHs and ignore the\n"
 "  rest; otherwise, error out if any specified paths are already versioned.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:563
+#: ../svn/svn.c:471
 msgid ""
 "  The selection of items to add may be influenced by the 'ignores' feature.\n"
 "  Properties may be attached to the items as configured by the 'auto-props'\n"
 "  feature.\n"
 msgstr ""
 
-#: ../svn/svn.c:569
+#: ../svn/svn.c:477
 msgid "add intermediate parents"
 msgstr ""
 
-#: ../svn/svn.c:570 ../svn/svn.c:718
+#: ../svn/svn.c:478 ../svn/svn.c:627
 msgid "obsolete; same as --depth=empty"
 msgstr ""
 
-#: ../svn/svn.c:571
+#: ../svn/svn.c:479
 msgid "ignore already versioned paths"
 msgstr ""
 
-#: ../svn/svn.c:574
+#: ../svn/svn.c:482
 msgid ""
 "Manage cached authentication credentials.\n"
 "usage: 1. svn auth [PATTERN ...]\n"
@@ -14379,7 +14652,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:578
+#: ../svn/svn.c:486
 msgid ""
 "  With no arguments, list all cached authentication credentials.\n"
 "  Authentication credentials include usernames, passwords,\n"
@@ -14391,7 +14664,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:585
+#: ../svn/svn.c:493
 msgid ""
 "  If more than one pattern is specified credentials are considered only if "
 "they\n"
@@ -14406,11 +14679,11 @@ msgid ""
 "  expand them.\n"
 msgstr ""
 
-#: ../svn/svn.c:596
+#: ../svn/svn.c:504
 msgid "remove matching authentication credentials"
 msgstr ""
 
-#: ../svn/svn.c:601
+#: ../svn/svn.c:509
 msgid ""
 "Show when each line of a file was last (or\n"
 "next) changed.\n"
@@ -14418,14 +14691,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:605
+#: ../svn/svn.c:513
 msgid ""
 "  Annotate each line of a file with the revision number and author of the\n"
 "  last change (or optionally the next change) to that line.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:608 ../svnbench/svnbench.c:222
+#: ../svn/svn.c:516 ../svnbench/svnbench.c:222
 msgid ""
 "  With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n"
 "  annotate each line that is present in revision N of the file, with\n"
@@ -14434,7 +14707,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:613 ../svnbench/svnbench.c:227
+#: ../svn/svn.c:521 ../svnbench/svnbench.c:227
 msgid ""
 "  With a reverse revision range '-r M:N' where M > N,\n"
 "  annotate each line that is present in revision N of the file, with\n"
@@ -14443,52 +14716,53 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:618 ../svnbench/svnbench.c:232
+#: ../svn/svn.c:526 ../svnbench/svnbench.c:232
 msgid ""
 "  If specified, REV determines in which revision the target is first\n"
 "  looked up.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:621 ../svnbench/svnbench.c:235
+#: ../svn/svn.c:529 ../svnbench/svnbench.c:235
 msgid "  Write the annotated result to standard output.\n"
 msgstr ""
 
-#: ../svn/svn.c:626
+#: ../svn/svn.c:534
 msgid ""
 "Output the content of specified files or URLs.\n"
 "usage: cat TARGET[@REV]...\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:629
+#: ../svn/svn.c:537
 msgid ""
 "  If specified, REV determines in which revision the target is first\n"
 "  looked up.\n"
 msgstr ""
 
-#: ../svn/svn.c:635
+#: ../svn/svn.c:543
 msgid ""
-"Associate (or dissociate) changelist CLNAME with the named files.\n"
+"Associate (or dissociate) changelist CLNAME with the named\n"
+"files.\n"
 "usage: 1. changelist CLNAME PATH...\n"
 "       2. changelist --remove PATH...\n"
 msgstr ""
 
-#: ../svn/svn.c:642
+#: ../svn/svn.c:551
 msgid ""
 "Check out a working copy from a repository.\n"
 "usage: checkout URL[@REV]... [PATH]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:645
+#: ../svn/svn.c:554
 msgid ""
 "  If specified, REV determines in which revision the URL is first\n"
 "  looked up.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:648
+#: ../svn/svn.c:557
 msgid ""
 "  If PATH is omitted, the basename of the URL will be used as\n"
 "  the destination. If multiple URLs are given each will be checked\n"
@@ -14497,7 +14771,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:653
+#: ../svn/svn.c:562
 msgid ""
 "  If --force is used, unversioned obstructing paths in the working\n"
 "  copy destination do not automatically cause the check out to fail.\n"
@@ -14512,22 +14786,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:664
+#: ../svn/svn.c:573
 msgid ""
 "  See also 'svn help update' for a list of possible characters\n"
 "  reporting the action taken.\n"
 msgstr ""
 
-#: ../svn/svn.c:668 ../svn/svn.c:801 ../svn/svn.c:825 ../svn/svn.c:849
-#: ../svn/svn.c:1378 ../svn/svn.c:1922 ../svn/svn.c:1986
+#: ../svn/svn.c:577 ../svn/svn.c:710 ../svn/svn.c:734 ../svn/svn.c:758
+#: ../svn/svn.c:1287 ../svn/svn.c:1829 ../svn/svn.c:1893
 msgid "obsolete; same as --depth=files"
 msgstr ""
 
-#: ../svn/svn.c:671
+#: ../svn/svn.c:580
 msgid ""
-"Either recover from an interrupted operation that left the working copy "
-"locked,\n"
-"or remove unwanted files.\n"
+"Either recover from an interrupted operation that left the working\n"
+"copy locked, or remove unwanted files.\n"
 "usage: 1. cleanup [WCPATH...]\n"
 "       2. cleanup --remove-unversioned [WCPATH...]\n"
 "          cleanup --remove-ignored [WCPATH...]\n"
@@ -14535,7 +14808,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:678
+#: ../svn/svn.c:587
 msgid ""
 "  1. When none of the options --remove-unversioned, --remove-ignored, and\n"
 "    --vacuum-pristines is specified, remove all write locks (shown as 'L' "
@@ -14547,7 +14820,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:684
+#: ../svn/svn.c:593
 msgid ""
 "    WARNING: There is no mechanism that will protect write locks still\n"
 "             being used by other Subversion clients. Running this command\n"
@@ -14556,7 +14829,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:689
+#: ../svn/svn.c:598
 msgid ""
 "  2. If the --remove-unversioned option or the --remove-ignored option\n"
 "    is given, remove any unversioned or ignored items within WCPATH.\n"
@@ -14565,7 +14838,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:694
+#: ../svn/svn.c:603
 msgid ""
 "  3. If the --vacuum-pristines option is given, remove pristine copies of\n"
 "    files which are stored inside the .svn directory and which are no "
@@ -14573,46 +14846,46 @@ msgid ""
 "    referenced by any file in the working copy.\n"
 msgstr ""
 
-#: ../svn/svn.c:700
+#: ../svn/svn.c:609
 msgid "deprecated and ignored"
 msgstr ""
 
-#: ../svn/svn.c:703
+#: ../svn/svn.c:612
 msgid ""
 "Send changes from your working copy to the repository.\n"
 "usage: commit [PATH...]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:706
+#: ../svn/svn.c:615
 msgid ""
 "  A log message must be provided, but it can be empty.  If it is not\n"
 "  given by a --message or --file option, an editor will be started.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:709
+#: ../svn/svn.c:618
 msgid ""
 "  If any targets are (or contain) locked items, those will be\n"
 "  unlocked after a successful commit, unless --no-unlock is given.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:712
+#: ../svn/svn.c:621
 msgid ""
 "  If --include-externals is given, also commit file and directory\n"
 "  externals reached by recursion. Do not commit externals with a\n"
 "  fixed revision.\n"
 msgstr ""
 
-#: ../svn/svn.c:721
+#: ../svn/svn.c:630
 msgid ""
 "Copy files and directories in a working copy or repository.\n"
 "usage: copy SRC[@REV]... DST\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:724
+#: ../svn/svn.c:633
 msgid ""
 "  SRC and DST can each be either a working copy (WC) path or URL:\n"
 "    WC  -> WC:   copy and schedule for addition (with history)\n"
@@ -14625,7 +14898,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:733
+#: ../svn/svn.c:642
 msgid ""
 "  WARNING: For compatibility with previous versions of Subversion,\n"
 "  copies performed using two working copy paths (WC -> WC) will not\n"
@@ -14634,7 +14907,7 @@ msgid ""
 "  to the destination.\n"
 msgstr ""
 
-#: ../svn/svn.c:743
+#: ../svn/svn.c:652
 msgid ""
 "Remove files and directories from version control.\n"
 "usage: 1. delete PATH...\n"
@@ -14642,7 +14915,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:747
+#: ../svn/svn.c:656
 msgid ""
 "  1. Each item specified by a PATH is scheduled for deletion upon\n"
 "    the next commit.  Files, and directories that have not been\n"
@@ -14653,13 +14926,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:754
+#: ../svn/svn.c:663
 msgid ""
 "  2. Each item specified by a URL is deleted from the repository\n"
 "    via an immediate commit.\n"
 msgstr ""
 
-#: ../svn/svn.c:760
+#: ../svn/svn.c:669
 msgid ""
 "Display local changes or differences between two revisions or paths.\n"
 "usage: 1. diff\n"
@@ -14673,13 +14946,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:769
+#: ../svn/svn.c:678
 msgid ""
 "  1. Use just 'svn diff' to display local modifications in a working copy.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:771
+#: ../svn/svn.c:680
 msgid ""
 "  2. Display the changes made to TARGETs as they are seen in REV between\n"
 "     two revisions.  TARGETs may be all working copy paths or all URLs.\n"
@@ -14690,7 +14963,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:778
+#: ../svn/svn.c:687
 msgid ""
 "  3. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
 "     NEW-TGT as it was seen in NEWREV.  PATHs, if given, are relative to\n"
@@ -14704,7 +14977,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:787
+#: ../svn/svn.c:696
 msgid ""
 "     Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n"
 "     targets. Revisions cannot be specified for unversioned targets.\n"
@@ -14713,7 +14986,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:792
+#: ../svn/svn.c:701
 msgid ""
 "  4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
 "  5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-"
@@ -14722,7 +14995,7 @@ msgid ""
 "URL[@NEWREV]'\n"
 msgstr ""
 
-#: ../svn/svn.c:804
+#: ../svn/svn.c:713
 msgid ""
 "Create an unversioned copy of a tree.\n"
 "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -14730,7 +15003,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:808
+#: ../svn/svn.c:717
 msgid ""
 "  1. Exports a clean directory tree from the repository specified by\n"
 "     URL, at revision REV if it is given, otherwise at HEAD, into\n"
@@ -14739,7 +15012,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:813
+#: ../svn/svn.c:722
 msgid ""
 "  2. Exports a clean directory tree from the working copy specified by\n"
 "     PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
@@ -14750,30 +15023,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:820 ../svnbench/svnbench.c:246
+#: ../svn/svn.c:729 ../svnbench/svnbench.c:246
 msgid ""
 "  If specified, PEGREV determines in which revision the target is first\n"
 "  looked up.\n"
 msgstr ""
 
-#: ../svn/svn.c:828 ../svnbench/svnbench.c:212
+#: ../svn/svn.c:737 ../svnbench/svnbench.c:212
 msgid ""
 "Describe the usage of this program or its subcommands.\n"
 "usage: help [SUBCOMMAND...]\n"
 msgstr ""
 
-#: ../svn/svn.c:832
+#: ../svn/svn.c:741
 msgid "also show experimental subcommands and options"
 msgstr ""
 
-#: ../svn/svn.c:836
+#: ../svn/svn.c:745
 msgid ""
 "Commit an unversioned file or tree into the repository.\n"
 "usage: import [PATH] URL\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:839
+#: ../svn/svn.c:748
 msgid ""
 "  Recursively commit a copy of PATH to URL.\n"
 "  If PATH is omitted '.' is assumed.\n"
@@ -14784,14 +15057,14 @@ msgid ""
 "  if --force is specified.\n"
 msgstr ""
 
-#: ../svn/svn.c:852
+#: ../svn/svn.c:761
 msgid ""
 "Display information about a local or remote item.\n"
 "usage: info [TARGET[@REV]...]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:855
+#: ../svn/svn.c:764
 msgid ""
 "  Print information about each TARGET (default: '.').\n"
 "  TARGET may be either a working-copy path or a URL.  If specified, REV\n"
@@ -14800,20 +15073,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:860
+#: ../svn/svn.c:769
 msgid ""
 "  With --show-item, print only the value of one item of information\n"
 "  about TARGET.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:863
+#: ../svn/svn.c:772
 msgid ""
 "  EXPERIMENTAL:\n"
 "  With --x-viewspec, print the working copy layout.\n"
 msgstr ""
 
-#: ../svn/svn.c:869
+#: ../svn/svn.c:778
 msgid ""
 "show file sizes with base-2 unit suffixes\n"
 "                             (Byte, Kilobyte, Megabyte, Gigabyte, Terabyte\n"
@@ -14821,14 +15094,14 @@ msgid ""
 "                             to three or less"
 msgstr ""
 
-#: ../svn/svn.c:880
+#: ../svn/svn.c:789
 msgid ""
 "List directory entries in the repository.\n"
 "usage: list [TARGET[@REV]...]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:883 ../svnbench/svnbench.c:255
+#: ../svn/svn.c:792 ../svnbench/svnbench.c:255
 msgid ""
 "  List each TARGET file and the contents of each TARGET directory as\n"
 "  they exist in the repository.  If TARGET is a working copy path, the\n"
@@ -14837,14 +15110,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:888 ../svnbench/svnbench.c:260
+#: ../svn/svn.c:797 ../svnbench/svnbench.c:260
 msgid ""
 "  The default TARGET is '.', meaning the repository URL of the current\n"
 "  working directory.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:893
+#: ../svn/svn.c:802
 msgid ""
 "  Multiple --search patterns may be specified and the output will be\n"
 "  reduced to those paths whose last segment - i.e. the file or directory\n"
@@ -14853,7 +15126,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:900
+#: ../svn/svn.c:809
 msgid ""
 "  Multiple --search patterns may be specified and the output will be\n"
 "  reduced to those paths whose last segment - i.e. the file or directory\n"
@@ -14861,13 +15134,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:906
+#: ../svn/svn.c:815
 msgid ""
 "  With --verbose, the following fields will be shown for each item:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:908 ../svnbench/svnbench.c:265
+#: ../svn/svn.c:817 ../svnbench/svnbench.c:265
 msgid ""
 "    Revision number of the last commit\n"
 "    Author of the last commit\n"
@@ -14876,7 +15149,7 @@ msgid ""
 "    Date and time of the last commit\n"
 msgstr ""
 
-#: ../svn/svn.c:916
+#: ../svn/svn.c:825
 msgid ""
 "with --verbose, show file sizes with base-2\n"
 "                             unit suffixes (Byte, Kilobyte, Megabyte,\n"
@@ -14884,7 +15157,7 @@ msgid ""
 "                             the number of digits to three or less"
 msgstr ""
 
-#: ../svn/svn.c:925
+#: ../svn/svn.c:834
 msgid ""
 "Lock working copy paths or URLs in the repository, so that\n"
 "no other user can commit changes to them.\n"
@@ -14892,27 +15165,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:929
+#: ../svn/svn.c:838
 msgid "  Use --force to steal a lock from another user or working copy.\n"
 msgstr ""
 
-#: ../svn/svn.c:932
+#: ../svn/svn.c:841
 msgid "read lock comment from file ARG"
 msgstr ""
 
-#: ../svn/svn.c:933
+#: ../svn/svn.c:842
 msgid "specify lock comment ARG"
 msgstr ""
 
-#: ../svn/svn.c:934
+#: ../svn/svn.c:843
 msgid "force validity of lock comment source"
 msgstr ""
 
-#: ../svn/svn.c:935
+#: ../svn/svn.c:844
 msgid "steal locks"
 msgstr ""
 
-#: ../svn/svn.c:938
+#: ../svn/svn.c:847
 msgid ""
 "Show the log messages for a set of revision(s) and/or path(s).\n"
 "usage: 1. log [PATH][@REV]\n"
@@ -14920,7 +15193,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:942
+#: ../svn/svn.c:851
 msgid ""
 "  1. Print the log messages for the URL corresponding to PATH\n"
 "     (default: '.'). If specified, REV is the revision in which the\n"
@@ -14930,7 +15203,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:948
+#: ../svn/svn.c:857
 msgid ""
 "  2. Print the log messages for the PATHs (default: '.') under URL.\n"
 "     If specified, REV is the revision in which the URL is first\n"
@@ -14940,7 +15213,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:954 ../svnbench/svnbench.c:290
+#: ../svn/svn.c:863 ../svnbench/svnbench.c:290
 msgid ""
 "  Multiple '-c' or '-r' options may be specified (but not a\n"
 "  combination of '-c' and '-r' options), and mixing of forward and\n"
@@ -14948,7 +15221,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:958
+#: ../svn/svn.c:867
 msgid ""
 "  With -v, also print all affected paths with each log message.\n"
 "  Each changed path is preceded with a symbol describing the change:\n"
@@ -14964,14 +15237,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:970
+#: ../svn/svn.c:879
 msgid ""
 "  With -q, don't print the log message body itself (note that this is\n"
 "  compatible with -v).\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:973
+#: ../svn/svn.c:882
 msgid ""
 "  Each log message is printed just once, even if more than one of the\n"
 "  affected paths for that revision were explicitly requested.  Logs\n"
@@ -14980,14 +15253,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:978
+#: ../svn/svn.c:887
 msgid ""
 "  The --depth option is only valid in combination with the --diff option\n"
 "  and limits the scope of the displayed diff to the specified depth.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:981
+#: ../svn/svn.c:890
 msgid ""
 "  If the --search option is used, log messages are displayed only if the\n"
 "  provided search pattern matches any of the author, date, log message\n"
@@ -15008,13 +15281,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:998
+#: ../svn/svn.c:907
 msgid ""
 "  Examples:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1000
+#: ../svn/svn.c:909
 msgid ""
 "    Show the latest 5 log messages for the current working copy\n"
 "    directory and display paths changed in each commit:\n"
@@ -15022,14 +15295,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1004
+#: ../svn/svn.c:913
 msgid ""
 "    Show the log for bar.c as of revision 42:\n"
 "      svn log bar.c@42\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1007
+#: ../svn/svn.c:916
 msgid ""
 "    Show log messages and diffs for each commit to foo.c:\n"
 "      svn log --diff http://www.example.com/repo/project/foo.c\n"
@@ -15038,7 +15311,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1012
+#: ../svn/svn.c:921
 msgid ""
 "    Show log messages for the children foo.c and bar.c of the directory\n"
 "    '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n"
@@ -15046,7 +15319,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1016
+#: ../svn/svn.c:925
 msgid ""
 "    Show the log messages for any incoming changes to foo.c during the\n"
 "    next 'svn update':\n"
@@ -15054,7 +15327,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1020
+#: ../svn/svn.c:929
 msgid ""
 "    Show the log message for the revision in which /branches/foo\n"
 "    was created:\n"
@@ -15062,7 +15335,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1024
+#: ../svn/svn.c:933
 msgid ""
 "    Show all log messages for commits between the tags ^/tags/2.0 and\n"
 "    ^/tags/3.0; assuming that tag 2.0 was created in revision 100:\n"
@@ -15070,7 +15343,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1028
+#: ../svn/svn.c:937
 msgid ""
 "    If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -"
 "v'\n"
@@ -15079,26 +15352,26 @@ msgid ""
 "       A /trunk/bar.c (from /trunk/foo.c:21)\n"
 msgstr ""
 
-#: ../svn/svn.c:1037 ../svnbench/svnbench.c:305
+#: ../svn/svn.c:946 ../svnbench/svnbench.c:305
 msgid "retrieve revision property ARG"
 msgstr ""
 
-#: ../svn/svn.c:1038 ../svnbench/svnbench.c:306
+#: ../svn/svn.c:947 ../svnbench/svnbench.c:306
 msgid "the change made in revision ARG"
 msgstr ""
 
-#: ../svn/svn.c:1039
+#: ../svn/svn.c:948
 msgid "also print all affected paths"
 msgstr ""
 
-#: ../svn/svn.c:1040
+#: ../svn/svn.c:949
 msgid "do not print the log message"
 msgstr ""
 
 #. For this large section, let's keep it unindented for easier
 #. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw'
 #. * (with quotes and newlines removed).
-#: ../svn/svn.c:1046
+#: ../svn/svn.c:955
 msgid ""
 "Merge changes into a working copy.\n"
 "usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n"
@@ -15110,20 +15383,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1054
+#: ../svn/svn.c:963
 msgid ""
 "  1. This form, with one source path and no revision range, is called\n"
 "     a 'complete' merge:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1057
+#: ../svn/svn.c:966
 msgid ""
 "       svn merge SOURCE[@REV] [TARGET_WCPATH]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1059
+#: ../svn/svn.c:968
 msgid ""
 "     The complete merge is used for the 'sync' and 'reintegrate' merges\n"
 "     in the 'feature branch' pattern described below. It finds all the\n"
@@ -15133,7 +15406,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1065
+#: ../svn/svn.c:974
 msgid ""
 "     SOURCE specifies the branch from where the changes will be pulled, and\n"
 "     TARGET_WCPATH specifies a working copy of the target branch to which\n"
@@ -15144,7 +15417,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1072
+#: ../svn/svn.c:981
 msgid ""
 "     SOURCE is usually a URL. The optional '@REV' specifies both the peg\n"
 "     revision of the URL and the latest revision that will be considered\n"
@@ -15155,20 +15428,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1079
+#: ../svn/svn.c:988
 msgid ""
 "     TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
 "     assumed. There are some special cases:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1082
+#: ../svn/svn.c:991
 msgid ""
 "       - If SOURCE is a URL:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1084
+#: ../svn/svn.c:993
 msgid ""
 "           - If the basename of the URL and the basename of '.' are the\n"
 "             same, then the differences are applied to '.'. Otherwise,\n"
@@ -15178,13 +15451,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1090
+#: ../svn/svn.c:999
 msgid ""
 "       - If SOURCE is a working copy path:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1092
+#: ../svn/svn.c:1001
 msgid ""
 "           - If the source is a file, then differences are applied to that\n"
 "             file (useful for reverse-merging earlier changes). Otherwise,\n"
@@ -15192,20 +15465,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1096
+#: ../svn/svn.c:1005
 msgid ""
 "     In normal usage the working copy should be up to date, at a single\n"
 "     revision, with no local modifications and no switched subtrees.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1099
+#: ../svn/svn.c:1008
 msgid ""
 "       - The 'Feature Branch' Merging Pattern -\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1101
+#: ../svn/svn.c:1010
 msgid ""
 "     In this commonly used work flow, known also as the 'development\n"
 "     branch' pattern, a developer creates a branch and commits a series of\n"
@@ -15217,7 +15490,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1109
+#: ../svn/svn.c:1018
 msgid ""
 "         parent --+----------o------o-o-------------o--\n"
 "                   \\            \\           \\      /\n"
@@ -15227,7 +15500,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1115
+#: ../svn/svn.c:1024
 msgid ""
 "     A merge from the parent branch to the feature branch is called a\n"
 "     'sync' or 'catch-up' merge, and a merge from the feature branch to the\n"
@@ -15235,7 +15508,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1119
+#: ../svn/svn.c:1028
 msgid ""
 "       - Sync Merge Example -\n"
 "                                 ............\n"
@@ -15249,7 +15522,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1129
+#: ../svn/svn.c:1038
 msgid ""
 "     Subversion will locate all the changes on 'trunk' that have not yet\n"
 "     been merged into the 'feature' branch. In this case that is a single\n"
@@ -15262,20 +15535,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1137
+#: ../svn/svn.c:1046
 msgid ""
 "     To perform this sync merge, have a clean working copy of the feature\n"
 "     branch and run the following command in its top-level directory:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1140
+#: ../svn/svn.c:1049
 msgid ""
 "         svn merge ^/trunk\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1142
+#: ../svn/svn.c:1051
 msgid ""
 "     Note that the merge is now only in your local working copy and still\n"
 "     needs to be committed to the repository so that it can be seen by\n"
@@ -15284,13 +15557,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1147
+#: ../svn/svn.c:1056
 msgid ""
 "       - Reintegrate Merge Example -\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1149
+#: ../svn/svn.c:1058
 msgid ""
 "     The feature branch was last synced with trunk up to revision X. So the\n"
 "     difference between trunk@X and feature@HEAD contains the complete set\n"
@@ -15299,7 +15572,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1154
+#: ../svn/svn.c:1063
 msgid ""
 "                    rW                   rX\n"
 "         trunk ------+--------------------L------------------o\n"
@@ -15310,7 +15583,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1161
+#: ../svn/svn.c:1070
 msgid ""
 "     In the diagram above, L marks the left side (trunk@X) and R marks the\n"
 "     right side (feature@HEAD) of the merge. The difference between the\n"
@@ -15318,20 +15591,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1165
+#: ../svn/svn.c:1074
 msgid ""
 "     To perform the merge, have a clean working copy of trunk and run the\n"
 "     following command in its top-level directory:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1168
+#: ../svn/svn.c:1077
 msgid ""
 "         svn merge ^/feature\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1170
+#: ../svn/svn.c:1079
 msgid ""
 "     To prevent unnecessary merge conflicts, a reintegrate merge requires\n"
 "     that TARGET_WCPATH is not a mixed-revision working copy, has no local\n"
@@ -15339,7 +15612,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1174
+#: ../svn/svn.c:1083
 msgid ""
 "     A reintegrate merge also requires that the source branch is coherently\n"
 "     synced with the target -- in the above example, this means that all\n"
@@ -15349,19 +15622,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1181
+#: ../svn/svn.c:1090
 msgid ""
 "  2. This form is called a 'cherry-pick' merge:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1183
+#: ../svn/svn.c:1092
 msgid ""
 "       svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1185
+#: ../svn/svn.c:1094
 msgid ""
 "     A cherry-pick merge is used to merge specific revisions (or revision\n"
 "     ranges) from one branch to another. By default, this uses merge\n"
@@ -15371,7 +15644,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1191
+#: ../svn/svn.c:1100
 msgid ""
 "     SOURCE is usually a URL. The optional '@REV' specifies only the peg\n"
 "     revision of the URL and does not affect the merge range; if REV is not\n"
@@ -15381,7 +15654,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1197 ../svn/svn.c:1268
+#: ../svn/svn.c:1106 ../svn/svn.c:1177
 msgid ""
 "     TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
 "     assumed. The special cases noted above in the 'complete' merge form\n"
@@ -15389,7 +15662,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1201
+#: ../svn/svn.c:1110
 msgid ""
 "     The revision ranges to be merged are specified by the '-r' and/or '-c'\n"
 "     options. '-r N:M' refers to the difference in the history of the\n"
@@ -15399,7 +15672,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1207
+#: ../svn/svn.c:1116
 msgid ""
 "     If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n"
 "     range were already merged, changes made in those revisions are not\n"
@@ -15408,7 +15681,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1212
+#: ../svn/svn.c:1121
 msgid ""
 "     A 'reverse range' can be used to undo changes. For example, when\n"
 "     source and target refer to the same branch, a previously committed\n"
@@ -15419,27 +15692,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1219
+#: ../svn/svn.c:1128
 msgid ""
 "     Multiple '-c' and/or '-r' options may be specified and mixing of\n"
 "     forward and reverse ranges is allowed.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1222
+#: ../svn/svn.c:1131
 msgid ""
 "       - Cherry-pick Merge Example -\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1224
+#: ../svn/svn.c:1133
 msgid ""
 "     A bug has been fixed on trunk in revision 50. This fix needs to\n"
 "     be merged from trunk onto the release branch.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1227
+#: ../svn/svn.c:1136
 msgid ""
 "            1.x-release  +-----------------------o-----\n"
 "                        /                        ^\n"
@@ -15450,7 +15723,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1234
+#: ../svn/svn.c:1143
 msgid ""
 "     In the above diagram, L marks the left side (trunk@49) and R marks the\n"
 "     right side (trunk@50) of the merge. The difference between the left\n"
@@ -15458,7 +15731,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1238
+#: ../svn/svn.c:1147
 msgid ""
 "     Note that the difference between revision 49 and 50 is exactly those\n"
 "     changes that were committed in revision 50, not including changes\n"
@@ -15466,7 +15739,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1242
+#: ../svn/svn.c:1151
 msgid ""
 "     To perform the merge, have a clean working copy of the release branch\n"
 "     and run the following command in its top-level directory; remember\n"
@@ -15474,37 +15747,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1246
+#: ../svn/svn.c:1155
 msgid ""
 "         svn merge -c50 ^/trunk\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1248
+#: ../svn/svn.c:1157
 msgid ""
 "     You can also cherry-pick several revisions and/or revision ranges:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1250
+#: ../svn/svn.c:1159
 msgid ""
 "         svn merge -c50,54,60 -r65:68 ^/trunk\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1253
+#: ../svn/svn.c:1162
 msgid ""
 "  3. This form is called a '2-URL merge':\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1255
+#: ../svn/svn.c:1164
 msgid ""
 "       svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1257
+#: ../svn/svn.c:1166
 msgid ""
 "     You should use this merge variant only if the other variants do not\n"
 "     apply to your situation, as this variant can be quite complex to\n"
@@ -15512,7 +15785,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1261
+#: ../svn/svn.c:1170
 msgid ""
 "     Two source URLs are specified, identifying two trees on the same\n"
 "     branch or on different branches. The trees are compared and the\n"
@@ -15523,20 +15796,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1272
+#: ../svn/svn.c:1181
 msgid ""
 "     SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n"
 "     in which case the merge source URL is derived from the working copy.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1275
+#: ../svn/svn.c:1184
 msgid ""
 "       - 2-URL Merge Example -\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1277
+#: ../svn/svn.c:1186
 msgid ""
 "     Two features have been developed on separate branches called 'foo' and\n"
 "     'bar'. It has since become clear that 'bar' should be combined with\n"
@@ -15544,7 +15817,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1281
+#: ../svn/svn.c:1190
 msgid ""
 "     Although both feature branches originate from trunk, they are not\n"
 "     directly related -- one is not a direct copy of the other. A 2-URL\n"
@@ -15552,7 +15825,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1285
+#: ../svn/svn.c:1194
 msgid ""
 "     The 'bar' branch has been synced with trunk up to revision 500.\n"
 "     (If this revision number is not known, it can be located using the\n"
@@ -15563,7 +15836,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1292
+#: ../svn/svn.c:1201
 msgid ""
 "                           foo  +-----------------------------------o\n"
 "                               /                                    ^\n"
@@ -15577,7 +15850,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1302
+#: ../svn/svn.c:1211
 msgid ""
 "     In the diagram above, L marks the left side (trunk@500) and R marks\n"
 "     the right side (bar@HEAD) of the merge. The difference between the\n"
@@ -15586,20 +15859,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1307
+#: ../svn/svn.c:1216
 msgid ""
 "     To perform the merge, have a clean working copy of the 'foo' branch\n"
 "     and run the following command in its top-level directory:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1310
+#: ../svn/svn.c:1219
 msgid ""
 "         svn merge ^/trunk@500 ^/bar\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1312
+#: ../svn/svn.c:1221
 msgid ""
 "     The exact changes applied by a 2-URL merge can be previewed with svn's\n"
 "     diff command, which is a good idea to verify if you do not have the\n"
@@ -15607,19 +15880,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1316
+#: ../svn/svn.c:1225
 msgid ""
 "         svn diff ^/trunk@500 ^/bar@HEAD\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1319
+#: ../svn/svn.c:1228
 msgid ""
 "  The following applies to all types of merges:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1321
+#: ../svn/svn.c:1230
 msgid ""
 "  To prevent unnecessary merge conflicts, svn merge requires that\n"
 "  TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n"
@@ -15628,7 +15901,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1326
+#: ../svn/svn.c:1235
 msgid ""
 "  If possible, you should have no local modifications in the merge's target\n"
 "  working copy prior to the merge, to keep things simpler. It will be\n"
@@ -15636,21 +15909,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1330
+#: ../svn/svn.c:1239
 msgid ""
 "  Switched sub-paths should also be avoided during merging, as they may\n"
 "  cause incomplete merges and create subtree mergeinfo.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1333
+#: ../svn/svn.c:1242
 msgid ""
 "  For each merged item a line will be printed with characters reporting the\n"
 "  action taken. These characters have the following meaning:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1336 ../svn/svn.c:1944
+#: ../svn/svn.c:1245 ../svn/svn.c:1851
 msgid ""
 "    A  Added\n"
 "    D  Deleted\n"
@@ -15662,7 +15935,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1344
+#: ../svn/svn.c:1253
 msgid ""
 "  Characters in the first column report about the item itself.\n"
 "  Characters in the second column report about properties of the item.\n"
@@ -15672,13 +15945,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1350
+#: ../svn/svn.c:1259
 msgid ""
 "    - Merge Tracking -\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1352
+#: ../svn/svn.c:1261
 msgid ""
 "  Subversion uses the svn:mergeinfo property to track merge history. This\n"
 "  property is considered at the start of a merge to determine what to merge\n"
@@ -15691,20 +15964,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1361
+#: ../svn/svn.c:1270
 msgid ""
 "  The --ignore-ancestry option prevents merge tracking and thus ignores\n"
 "  mergeinfo, neither considering it nor recording it.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1364
+#: ../svn/svn.c:1273
 msgid ""
 "    - Merging from foreign repositories -\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1366
+#: ../svn/svn.c:1275
 msgid ""
 "  Subversion does support merging from foreign repositories.\n"
 "  While all merge source URLs must point to the same repository, the merge\n"
@@ -15715,11 +15988,11 @@ msgid ""
 "  repositories.\n"
 msgstr ""
 
-#: ../svn/svn.c:1377
+#: ../svn/svn.c:1286
 msgid "force deletions even if deleted contents don't match"
 msgstr ""
 
-#: ../svn/svn.c:1382
+#: ../svn/svn.c:1291
 msgid ""
 "Display merge-related information.\n"
 "usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
@@ -15727,7 +16000,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1386
+#: ../svn/svn.c:1295
 msgid ""
 "  1. Summarize the history of merging between SOURCE and TARGET. The graph\n"
 "     shows, from left to right:\n"
@@ -15738,7 +16011,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1393
+#: ../svn/svn.c:1302
 msgid ""
 "  2. Print the revision numbers on SOURCE that have been merged to TARGET\n"
 "     (with --show-revs=merged), or that have not been merged to TARGET\n"
@@ -15747,7 +16020,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1398
+#: ../svn/svn.c:1307
 msgid ""
 "     If --revision (-r) is provided, filter the displayed information to\n"
 "     show only that which is associated with the revisions within the\n"
@@ -15756,7 +16029,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1403
+#: ../svn/svn.c:1312
 msgid ""
 "  SOURCE and TARGET are the source and target branch URLs, respectively.\n"
 "  (If a WC path is given, the corresponding base URL is used.) The default\n"
@@ -15766,11 +16039,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1409
+#: ../svn/svn.c:1318
 msgid "  The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"
 msgstr ""
 
-#: ../svn/svn.c:1415
+#: ../svn/svn.c:1324
 msgid ""
 "Create a new directory under version control.\n"
 "usage: 1. mkdir PATH...\n"
@@ -15778,40 +16051,40 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1419
+#: ../svn/svn.c:1328
 msgid ""
 "  Create version controlled directories.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1421
+#: ../svn/svn.c:1330
 msgid ""
 "  1. Each directory specified by a working copy PATH is created locally\n"
 "    and scheduled for addition upon the next commit.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1424
+#: ../svn/svn.c:1333
 msgid ""
 "  2. Each directory specified by a URL is created in the repository via\n"
 "    an immediate commit.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1427
+#: ../svn/svn.c:1336
 msgid ""
 "  In both cases, all the intermediate directories must already exist,\n"
 "  unless the --parents option is given.\n"
 msgstr ""
 
-#: ../svn/svn.c:1433
+#: ../svn/svn.c:1342
 msgid ""
 "Move (rename) an item in a working copy or repository.\n"
 "usage: move SRC... DST\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1436
+#: ../svn/svn.c:1345
 msgid ""
 "  SRC and DST can both be working copy (WC) paths or URLs:\n"
 "    WC  -> WC:  move an item in a working copy, as a local change to\n"
@@ -15824,7 +16097,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1445
+#: ../svn/svn.c:1354
 msgid ""
 "  SRC and DST of WC -> WC moves must be committed in the same revision.\n"
 "  Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n"
@@ -15834,21 +16107,21 @@ msgid ""
 "compatibility.\n"
 msgstr ""
 
-#: ../svn/svn.c:1456
+#: ../svn/svn.c:1365
 msgid ""
 "Apply a patch to a working copy.\n"
 "usage: patch PATCHFILE [WCPATH]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1459
+#: ../svn/svn.c:1368
 msgid ""
 "  Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n"
 "  If WCPATH is omitted, '.' is assumed.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1462
+#: ../svn/svn.c:1371
 msgid ""
 "  A unidiff patch suitable for application to a working copy can be\n"
 "  produced with the 'svn diff' command or third-party diffing tools.\n"
@@ -15857,7 +16130,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1467
+#: ../svn/svn.c:1376
 msgid ""
 "  Changes listed in the patch will either be applied or rejected.\n"
 "  If a change does not match at its exact line offset, it may be applied\n"
@@ -15870,14 +16143,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1476
+#: ../svn/svn.c:1385
 msgid ""
 "  For each patched file a line will be printed with characters reporting\n"
 "  the action taken. These characters have the following meaning:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1479
+#: ../svn/svn.c:1388
 msgid ""
 "    A  Added\n"
 "    D  Deleted\n"
@@ -15887,14 +16160,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1485
+#: ../svn/svn.c:1394
 msgid ""
 "  Changes applied with an offset or fuzz are reported on lines starting\n"
 "  with the '>' symbol. You should review such changes carefully.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1488
+#: ../svn/svn.c:1397
 msgid ""
 "  If the patch removes all content from a file, that file is scheduled\n"
 "  for deletion. If the patch creates a new file, that file is scheduled\n"
@@ -15903,7 +16176,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1493
+#: ../svn/svn.c:1402
 msgid ""
 "  Hint: If the patch file was created with Subversion, it will contain\n"
 "        the number of a revision N the patch will cleanly apply to\n"
@@ -15913,7 +16186,7 @@ msgid ""
 "        HEAD revision. This way, conflicts can be resolved interactively.\n"
 msgstr ""
 
-#: ../svn/svn.c:1504
+#: ../svn/svn.c:1413
 msgid ""
 "Remove a property from files, dirs, or revisions.\n"
 "usage: 1. propdel PROPNAME [PATH...]\n"
@@ -15921,7 +16194,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1508
+#: ../svn/svn.c:1417
 msgid ""
 "  1. Removes versioned props in working copy.\n"
 "  2. Removes unversioned remote prop on repos revision.\n"
@@ -15929,12 +16202,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1512 ../svn/svn.c:1525 ../svn/svn.c:1549 ../svn/svn.c:1569
+#: ../svn/svn.c:1421 ../svn/svn.c:1434 ../svn/svn.c:1458 ../svn/svn.c:1478
 msgid ""
 "  See 'svn help propset' for descriptions of the svn:* special properties.\n"
 msgstr ""
 
-#: ../svn/svn.c:1517
+#: ../svn/svn.c:1426
 msgid ""
 "Edit a property with an external editor.\n"
 "usage: 1. propedit PROPNAME TARGET...\n"
@@ -15942,7 +16215,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1521
+#: ../svn/svn.c:1430
 msgid ""
 "  1. Edits versioned prop in working copy or repository.\n"
 "  2. Edits unversioned remote prop on repos revision.\n"
@@ -15950,7 +16223,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1530
+#: ../svn/svn.c:1439
 msgid ""
 "Print the value of a property on files, dirs, or revisions.\n"
 "usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -15958,7 +16231,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1534
+#: ../svn/svn.c:1443
 msgid ""
 "  1. Prints versioned props. If specified, REV determines in which\n"
 "     revision the target is first looked up.\n"
@@ -15967,7 +16240,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1539
+#: ../svn/svn.c:1448
 msgid ""
 "  With --verbose, the target path and the property name are printed on\n"
 "  separate lines before each value, like 'svn proplist --verbose'.\n"
@@ -15976,7 +16249,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1544
+#: ../svn/svn.c:1453
 msgid ""
 "  By default, an extra newline is printed after the property value so that\n"
 "  the output looks pretty.  With a single TARGET, depth 'empty' and without\n"
@@ -15986,15 +16259,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1553 ../svn/svn.c:1573
+#: ../svn/svn.c:1462 ../svn/svn.c:1482
 msgid "print path, name and value on separate lines"
 msgstr ""
 
-#: ../svn/svn.c:1554
+#: ../svn/svn.c:1463
 msgid "(deprecated; use --no-newline)"
 msgstr ""
 
-#: ../svn/svn.c:1557
+#: ../svn/svn.c:1466
 msgid ""
 "List all properties on files, dirs, or revisions.\n"
 "usage: 1. proplist [TARGET[@REV]...]\n"
@@ -16002,7 +16275,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1561
+#: ../svn/svn.c:1470
 msgid ""
 "  1. Lists versioned props. If specified, REV determines in which\n"
 "     revision the target is first looked up.\n"
@@ -16011,7 +16284,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1566
+#: ../svn/svn.c:1475
 msgid ""
 "  With --verbose, the property values are printed as well, like 'svn "
 "propget\n"
@@ -16019,11 +16292,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1574
+#: ../svn/svn.c:1483
 msgid "don't print the path"
 msgstr ""
 
-#: ../svn/svn.c:1577
+#: ../svn/svn.c:1486
 msgid ""
 "Set the value of a property on files, dirs, or revisions.\n"
 "usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -16031,7 +16304,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1581
+#: ../svn/svn.c:1490
 msgid ""
 "  1. Changes a versioned file or directory property in a working copy.\n"
 "  2. Changes an unversioned property on a repository revision.\n"
@@ -16039,13 +16312,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1585
+#: ../svn/svn.c:1494
 msgid ""
 "  The value may be provided with the --file option instead of PROPVAL.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1587
+#: ../svn/svn.c:1496
 msgid ""
 "  Property names starting with 'svn:' are reserved.  Subversion recognizes\n"
 "  the following special versioned properties on a file:\n"
@@ -16060,7 +16333,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1598
+#: ../svn/svn.c:1507
 msgid ""
 "      Custom keywords can be defined with a format string separated from\n"
 "      the keyword name with '='. Valid format substitutions are:\n"
@@ -16083,7 +16356,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1616
+#: ../svn/svn.c:1525
 msgid ""
 "    svn:executable - If present, make the file executable.  Use\n"
 "      'svn propdel svn:executable PATH...' to clear.\n"
@@ -16099,7 +16372,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1628
+#: ../svn/svn.c:1537
 msgid ""
 "  Subversion recognizes the following special versioned properties on a\n"
 "  directory:\n"
@@ -16144,11 +16417,11 @@ msgid ""
 "      Lines starting with a '#' character are ignored.\n"
 msgstr ""
 
-#: ../svn/svn.c:1665
+#: ../svn/svn.c:1574
 msgid "read property value from file ARG"
 msgstr ""
 
-#: ../svn/svn.c:1668
+#: ../svn/svn.c:1577
 msgid ""
 "Relocate the working copy to point to a different repository root URL.\n"
 "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
@@ -16156,7 +16429,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1672
+#: ../svn/svn.c:1581
 msgid ""
 "  Rewrite working copy URL metadata to reflect a syntactic change only.\n"
 "  This is used when a repository's root URL changes (such as a scheme\n"
@@ -16165,7 +16438,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1677
+#: ../svn/svn.c:1586
 msgid ""
 "  1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n"
 "     copy's current and new URLs, respectively.  (You may specify the\n"
@@ -16174,13 +16447,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1682
+#: ../svn/svn.c:1591
 msgid ""
 "  2. TO-URL is the (complete) new repository URL to use for PATH.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1684
+#: ../svn/svn.c:1593
 msgid ""
 "  Examples:\n"
 "    svn relocate http:// svn:// project1 project2\n"
@@ -16188,21 +16461,21 @@ msgid ""
 "                 svn://svn.example.com/repo/project\n"
 msgstr ""
 
-#: ../svn/svn.c:1692
+#: ../svn/svn.c:1601
 msgid ""
 "Resolve conflicts on working copy files or directories.\n"
 "usage: resolve [PATH...]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1695
+#: ../svn/svn.c:1604
 msgid ""
 "  By default, perform interactive conflict resolution on PATH.\n"
 "  In this mode, the command is recursive by default (depth 'infinity').\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1698
+#: ../svn/svn.c:1607
 msgid ""
 "  The --accept=ARG option prevents interactive prompting and forces\n"
 "  conflicts on PATH to be resolved in the manner specified by ARG.\n"
@@ -16210,21 +16483,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1702
+#: ../svn/svn.c:1611
 msgid ""
 "  A conflicted path cannot be committed with 'svn commit' until it\n"
 "  has been marked as resolved with 'svn resolve'.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1705
+#: ../svn/svn.c:1614
 msgid ""
 "  Subversion knows three types of conflicts:\n"
 "  Text conflicts, Property conflicts, and Tree conflicts.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1708
+#: ../svn/svn.c:1617
 msgid ""
 "  Text conflicts occur when overlapping changes to file contents were\n"
 "  made. Text conflicts are usually resolved by editing the conflicted\n"
@@ -16236,7 +16509,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1716
+#: ../svn/svn.c:1625
 msgid ""
 "  Property conflicts are usually resolved by editing the value of the\n"
 "  conflicted property (either from the interactive prompt, or with\n"
@@ -16245,7 +16518,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1721
+#: ../svn/svn.c:1630
 msgid ""
 "  Tree conflicts occur when a change to the directory structure was\n"
 "  made, and when this change cannot be applied to the working copy\n"
@@ -16260,7 +16533,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1731
+#: ../svn/svn.c:1640
 msgid ""
 "  If a tree conflict cannot be resolved automatically, it is recommended\n"
 "  to figure out why the conflict occurred before attempting to resolve it.\n"
@@ -16276,21 +16549,21 @@ msgid ""
 "  copied, deleted, or moved.\n"
 msgstr ""
 
-#: ../svn/svn.c:1744
+#: ../svn/svn.c:1653
 msgid ""
 "specify automatic conflict resolution source\n"
 "                             ('base', 'working', 'mine-conflict',\n"
 "                             'theirs-conflict', 'mine-full', 'theirs-full')"
 msgstr ""
 
-#: ../svn/svn.c:1751
+#: ../svn/svn.c:1660
 msgid ""
 "Remove 'conflicted' state on working copy files or directories.\n"
 "usage: resolved PATH...\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1754
+#: ../svn/svn.c:1663
 msgid ""
 "  Note:  this subcommand does not semantically resolve conflicts or\n"
 "  remove conflict markers; it merely removes the conflict-related\n"
@@ -16298,35 +16571,35 @@ msgid ""
 "  deprecated in favor of running 'svn resolve --accept working'.\n"
 msgstr ""
 
-#: ../svn/svn.c:1762
+#: ../svn/svn.c:1671
 msgid ""
 "Restore pristine working copy state (undo local changes).\n"
 "usage: revert PATH...\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1765
+#: ../svn/svn.c:1674
 msgid ""
 "  Revert changes in the working copy at or within PATH, and remove\n"
 "  conflict markers as well, if any.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1768
+#: ../svn/svn.c:1677
 msgid ""
 "  This subcommand does not revert already committed changes.\n"
 "  For information about undoing already committed changes, search\n"
 "  the output of 'svn help merge' for 'undo'.\n"
 msgstr ""
 
-#: ../svn/svn.c:1776
+#: ../svn/svn.c:1685
 msgid ""
 "Print the status of working copy files and directories.\n"
 "usage: status [PATH...]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1779
+#: ../svn/svn.c:1688
 msgid ""
 "  With no args, print only locally modified items (no network access).\n"
 "  With -q, print only summary information about locally modified items.\n"
@@ -16335,7 +16608,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1784
+#: ../svn/svn.c:1693
 msgid ""
 "  The first seven columns in the output are each one character wide:\n"
 "    First column: Says if item was added, deleted, or otherwise changed\n"
@@ -16386,7 +16659,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1828
+#: ../svn/svn.c:1737
 msgid ""
 "  The out-of-date information appears in the ninth column (with -u):\n"
 "      '*' a newer revision exists on the server\n"
@@ -16394,7 +16667,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1832
+#: ../svn/svn.c:1741
 msgid ""
 "  Remaining fields are variable width and delimited by spaces:\n"
 "    The working revision (with -u or -v; '-' if the item is copied)\n"
@@ -16404,7 +16677,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1838
+#: ../svn/svn.c:1747
 msgid ""
 "  The presence of a question mark ('?') where a working revision, last\n"
 "  committed revision, or last committed author was expected indicates\n"
@@ -16414,7 +16687,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1844
+#: ../svn/svn.c:1753
 msgid ""
 "  Example output:\n"
 "    svn status wc\n"
@@ -16423,7 +16696,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1849
+#: ../svn/svn.c:1758
 msgid ""
 "    svn status -u wc\n"
 "     M             965   wc/bar.c\n"
@@ -16433,7 +16706,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1855
+#: ../svn/svn.c:1764
 msgid ""
 "    svn status --show-updates --verbose wc\n"
 "     M             965      938 kfogel       wc/bar.c\n"
@@ -16444,7 +16717,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1862
+#: ../svn/svn.c:1771
 msgid ""
 "    svn status\n"
 "     M      wc/bar.c\n"
@@ -16453,23 +16726,24 @@ msgid ""
 "    D       wc/qax.c\n"
 msgstr ""
 
-#: ../svn/svn.c:1870
+#: ../svn/svn.c:1779
 msgid "don't print unversioned items"
 msgstr ""
 
-#: ../svn/svn.c:1871
+#: ../svn/svn.c:1780
 msgid "obsolete; same as --depth=immediates"
 msgstr ""
 
-#: ../svn/svn.c:1874
+#: ../svn/svn.c:1783
 msgid ""
-"Update the working copy to a different URL within the same repository.\n"
+"Update the working copy to a different URL within the same\n"
+"repository.\n"
 "usage: 1. switch URL[@PEGREV] [PATH]\n"
 "       2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1878
+#: ../svn/svn.c:1788
 msgid ""
 "  1. Update the working copy to mirror a new URL within the repository.\n"
 "     This behavior is similar to 'svn update', and is the way to\n"
@@ -16479,7 +16753,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1884
+#: ../svn/svn.c:1794
 msgid ""
 "     If --force is used, unversioned obstructing paths in the working\n"
 "     copy do not automatically cause a failure if the switch attempts to\n"
@@ -16495,14 +16769,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1895
+#: ../svn/svn.c:1805
 msgid ""
 "     Use the --set-depth option to set a new working copy depth on the\n"
 "     targets of this operation.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1898
+#: ../svn/svn.c:1808
 msgid ""
 "     By default, Subversion will refuse to switch a working copy path to\n"
 "     a new URL with which it shares no common version control ancestry.\n"
@@ -16510,78 +16784,75 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1902
+#: ../svn/svn.c:1812
 msgid ""
 "  2. The '--relocate' option is deprecated. This syntax is equivalent to\n"
 "     'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1905
+#: ../svn/svn.c:1815
 msgid ""
 "  See also 'svn help update' for a list of possible characters\n"
 "  reporting the action taken.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1908
+#: ../svn/svn.c:1818
 msgid ""
 "  Examples:\n"
 "    svn switch ^/branches/1.x-release\n"
-"    svn switch --relocate http:// svn://\n"
-"    svn switch --relocate http://www.example.com/repo/project \\\n"
-"                          svn://svn.example.com/repo/project\n"
 msgstr ""
 
-#: ../svn/svn.c:1918
+#: ../svn/svn.c:1825
 msgid "allow switching to a node with no common ancestor"
 msgstr ""
 
-#: ../svn/svn.c:1920 ../svn/svn.c:1985
+#: ../svn/svn.c:1827 ../svn/svn.c:1892
 msgid "handle unversioned obstructions as changes"
 msgstr ""
 
-#: ../svn/svn.c:1921
+#: ../svn/svn.c:1828
 msgid "deprecated; use 'svn relocate'"
 msgstr ""
 
-#: ../svn/svn.c:1926
+#: ../svn/svn.c:1833
 msgid ""
 "Unlock working copy paths or URLs.\n"
 "usage: unlock TARGET...\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1929
+#: ../svn/svn.c:1836
 msgid "  Use --force to break a lock held by another user or working copy.\n"
 msgstr ""
 
-#: ../svn/svn.c:1932
+#: ../svn/svn.c:1839
 msgid "break locks"
 msgstr ""
 
-#: ../svn/svn.c:1935
+#: ../svn/svn.c:1842
 msgid ""
 "Bring changes from the repository into the working copy.\n"
 "usage: update [PATH...]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1938
+#: ../svn/svn.c:1845
 msgid ""
 "  If no revision is given, bring working copy up-to-date with HEAD rev.\n"
 "  Else synchronize working copy to revision given by -r.\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1941
+#: ../svn/svn.c:1848
 msgid ""
 "  For each updated item a line will be printed with characters reporting\n"
 "  the action taken. These characters have the following meaning:\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1952
+#: ../svn/svn.c:1859
 msgid ""
 "  Characters in the first column report about the item itself.\n"
 "  Characters in the second column report about properties of the item.\n"
@@ -16593,7 +16864,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1960
+#: ../svn/svn.c:1867
 msgid ""
 "  If --force is used, unversioned obstructing paths in the working\n"
 "  copy do not automatically cause a failure if the update attempts to\n"
@@ -16609,7 +16880,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1972
+#: ../svn/svn.c:1879
 msgid ""
 "  If the specified update target is missing from the working copy but its\n"
 "  immediate parent directory is present, checkout the target into its\n"
@@ -16619,456 +16890,237 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1978
+#: ../svn/svn.c:1885
 msgid ""
 "  Use the --set-depth option to set a new working copy depth on the\n"
 "  targets of this operation.\n"
 msgstr ""
 
-#: ../svn/svn.c:1989
+#: ../svn/svn.c:1896
 msgid ""
 "Upgrade the metadata storage format for a working copy.\n"
 "usage: upgrade [WCPATH...]\n"
 "\n"
 msgstr ""
 
-#: ../svn/svn.c:1992
+#: ../svn/svn.c:1899
 msgid "  Local modifications are preserved.\n"
 msgstr ""
 
-#: ../svn/svn.c:1997
-msgid ""
-"Show shelved changes as a diff.\n"
-"usage: x-shelf-diff SHELF [VERSION]\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2000
-msgid ""
-"  Show the changes in SHELF:VERSION (default: latest) as a diff.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2002
-msgid ""
-"  See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n"
-"  'svn diff'.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2005 ../svn/svn.c:2018 ../svn/svn.c:2031 ../svn/svn.c:2043
-#: ../svn/svn.c:2055 ../svn/svn.c:2070 ../svn/svn.c:2104 ../svn/svn.c:2137
-msgid ""
-"  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-"  in the next release, and there is no promise of backward compatibility.\n"
-msgstr ""
-
-#: ../svn/svn.c:2012
-msgid ""
-"Delete a shelf.\n"
-"usage: x-shelf-drop SHELF [PATH ...]\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2015
-msgid ""
-"  Delete the shelves named SHELF from the working copies containing PATH\n"
-"  (default PATH is '.')\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2024
-msgid ""
-"List shelves.\n"
-"usage: x-shelf-list [PATH ...]\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2027
-msgid ""
-"  List shelves for each working copy containing PATH (default is '.')\n"
-"  Include the first line of any log message and some details about the\n"
-"  contents of the shelf, unless '-q' is given.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2038
-msgid ""
-"List which shelf affects each path.\n"
-"usage: x-shelf-list-by-paths [PATH...]\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2041
-msgid ""
-"  List which shelf most recently affects each path below the given PATHs.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2049
-msgid ""
-"Show the versions of a shelf.\n"
-"usage: x-shelf-log SHELF [PATH...]\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2052
-msgid ""
-"  Show all versions of SHELF for each working copy containing PATH (the\n"
-"  default PATH is '.').\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2062
-msgid ""
-"Copy local changes onto a new version of a shelf.\n"
-"usage: x-shelf-save SHELF [PATH...]\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2065
-msgid ""
-"  Save local changes in the given PATHs as a new version of SHELF.\n"
-"  The shelf's log message can be set with -m, -F, etc.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2068
-msgid ""
-"  The same as 'svn shelve --keep-local'.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2080
-msgid ""
-"Move local changes onto a shelf.\n"
-"usage: x-shelve [--keep-local] SHELF [PATH...]\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2083
-msgid ""
-"  Save the local changes in the given PATHs to a new or existing SHELF.\n"
-"  Revert those changes from the WC unless '--keep-local' is given.\n"
-"  The shelf's log message can be set with -m, -F, etc.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2087
-msgid ""
-"  'svn shelve --keep-local' is the same as 'svn shelf-save'.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2089
-msgid ""
-"  The kinds of change you can shelve are committable changes to files and\n"
-"  properties, except the following kinds which are not yet supported:\n"
-"     * copies and moves\n"
-"     * mkdir and rmdir\n"
-"  Uncommittable states such as conflicts, unversioned and missing cannot\n"
-"  be shelved.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2096
-msgid ""
-"  To bring back shelved changes, use 'svn unshelve SHELF'.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2098
-msgid ""
-"  Shelves are currently stored under <WC>/.svn/experimental/shelves/ .\n"
-"  (In Subversion 1.10, shelves were stored under <WC>/.svn/shelves/ as\n"
-"  patch files. To recover a shelf created by 1.10, either use a 1.10\n"
-"  client to find and unshelve it, or find the patch file and use any\n"
-"  1.10 or later 'svn patch' to apply it.)\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2113
-msgid ""
-"Copy shelved changes back into the WC.\n"
-"usage: x-unshelve [--drop] [SHELF [VERSION]]\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2116
-msgid ""
-"  Apply the changes stored in SHELF to the working copy.\n"
-"  SHELF defaults to the newest shelf.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2119
-msgid ""
-"  Apply the newest version of the shelf, by default. If VERSION is\n"
-"  specified, apply that version and discard all versions newer than that.\n"
-"  In any case, retain the unshelved version and versions older than that\n"
-"  (unless --drop is specified).\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2124
-msgid ""
-"  With --drop, delete the entire shelf (like 'svn shelf-drop') after\n"
-"  successfully unshelving with no conflicts.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2127
-msgid ""
-"  The working files involved should be in a clean, unmodified state\n"
-"  before using this command. To roll back to an older version of the\n"
-"  shelf, first ensure any current working changes are removed, such as\n"
-"  by shelving or reverting them, and then unshelve the desired version.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2132
-msgid ""
-"  Unshelve normally refuses to apply any changes if any path involved is\n"
-"  already modified (or has any other abnormal status) in the WC. With\n"
-"  --force, it does not check and may error out and/or produce partial or\n"
-"  unexpected results.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2143
-msgid ""
-"Copy local modifications from one WC to another.\n"
-"usage: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2146
-msgid ""
-"  The source and destination WC paths may be in the same WC or in different  "
-"WCs.\n"
-"\n"
-msgstr ""
-
-#: ../svn/svn.c:2149
-msgid ""
-"  This feature is EXPERIMENTAL. This command is likely to change\n"
-"  in the next release, and there is no promise of backward compatibility.\n"
-msgstr ""
-
-#: ../svn/svn.c:2230
+#: ../svn/svn.c:1981
 #, c-format
 msgid "'%s' is not a valid --x-viewspec value"
 msgstr ""
 
-#: ../svn/svn.c:2343 ../svnbench/svnbench.c:474 ../svnlook/svnlook.c:2590
+#: ../svn/svn.c:2134 ../svnbench/svnbench.c:474 ../svnlook/svnlook.c:2590
 msgid "Non-numeric limit argument given"
 msgstr ""
 
-#: ../svn/svn.c:2348 ../svnbench/svnbench.c:479 ../svnlook/svnlook.c:2595
+#: ../svn/svn.c:2139 ../svnbench/svnbench.c:479 ../svnlook/svnlook.c:2595
 msgid "Argument to --limit must be positive"
 msgstr ""
 
-#: ../svn/svn.c:2368 ../svn/svn.c:2646
+#: ../svn/svn.c:2159 ../svn/svn.c:2437
 msgid "Can't specify -c with --old"
 msgstr ""
 
-#: ../svn/svn.c:2398 ../svnbench/svnbench.c:515
+#: ../svn/svn.c:2189 ../svnbench/svnbench.c:515
 #, c-format
 msgid "Negative number in range (%s) not supported with -c"
 msgstr ""
 
-#: ../svn/svn.c:2410 ../svnbench/svnbench.c:527
+#: ../svn/svn.c:2201 ../svnbench/svnbench.c:527
 #, c-format
 msgid "Non-numeric change argument (%s) given to -c"
 msgstr ""
 
-#: ../svn/svn.c:2417 ../svnbench/svnbench.c:534
+#: ../svn/svn.c:2208 ../svnbench/svnbench.c:534
 msgid "There is no change 0"
 msgstr ""
 
-#: ../svn/svn.c:2458 ../svnadmin/svnadmin.c:3008 ../svnbench/svnbench.c:576
+#: ../svn/svn.c:2249 ../svnadmin/svnadmin.c:3120 ../svnbench/svnbench.c:576
 #: ../svnfsfs/svnfsfs.c:303 ../svnrdump/svnrdump.c:865
 #: ../svnsync/svnsync.c:2146
 #, c-format
 msgid "Syntax error in revision argument '%s'"
 msgstr ""
 
-#: ../svn/svn.c:2524 ../svn/svn.c:2541 ../svnbench/svnbench.c:615
+#: ../svn/svn.c:2315 ../svn/svn.c:2332 ../svnbench/svnbench.c:615
 #, c-format
 msgid "Error converting depth from locale to UTF-8"
 msgstr ""
 
-#: ../svn/svn.c:2531 ../svnbench/svnbench.c:622
+#: ../svn/svn.c:2322 ../svnbench/svnbench.c:622
 #, c-format
 msgid ""
 "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
 msgstr ""
 
-#: ../svn/svn.c:2548
+#: ../svn/svn.c:2339
 #, c-format
 msgid ""
 "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or "
 "'infinity'"
 msgstr ""
 
-#: ../svn/svn.c:2684
+#: ../svn/svn.c:2475
 #, c-format
 msgid "Syntax error in native-eol argument '%s'"
 msgstr ""
 
-#: ../svn/svn.c:2705
+#: ../svn/svn.c:2496
 msgid "Changelist names must not be empty"
 msgstr ""
 
-#: ../svn/svn.c:2738
+#: ../svn/svn.c:2529
 #, c-format
 msgid "'%s' is not a valid --accept value"
 msgstr ""
 
-#: ../svn/svn.c:2746
+#: ../svn/svn.c:2537
 #, c-format
 msgid "'%s' is not a valid --show-revs value"
 msgstr ""
 
-#: ../svn/svn.c:2762
+#: ../svn/svn.c:2553
 #, c-format
 msgid "Invalid strip count '%s'"
 msgstr ""
 
-#: ../svn/svn.c:2768
+#: ../svn/svn.c:2559
 msgid "Argument to --strip must be positive"
 msgstr ""
 
-#: ../svn/svn.c:2867 ../svnmucc/svnmucc.c:666 ../svnrdump/svnrdump.c:944
+#: ../svn/svn.c:2658 ../svnmucc/svnmucc.c:666 ../svnrdump/svnrdump.c:944
 #: ../svnsync/svnsync.c:2204
 msgid "--non-interactive and --force-interactive are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:2920 ../svnbench/svnbench.c:756
+#: ../svn/svn.c:2711 ../svnbench/svnbench.c:756
 #: ../svndumpfilter/svndumpfilter.c:1429 ../svnlook/svnlook.c:2694
 #, c-format
 msgid "Subcommand argument required\n"
 msgstr ""
 
-#: ../svn/svn.c:2938 ../svnadmin/svnadmin.c:3234 ../svnbench/svnbench.c:774
+#: ../svn/svn.c:2729 ../svnadmin/svnadmin.c:3346 ../svnbench/svnbench.c:774
 #: ../svndumpfilter/svndumpfilter.c:1446 ../svnfsfs/svnfsfs.c:379
 #: ../svnlook/svnlook.c:2711 ../svnrdump/svnrdump.c:988
 #, c-format
 msgid "Unknown subcommand: '%s'\n"
 msgstr ""
 
-#: ../svn/svn.c:2947
+#: ../svn/svn.c:2738
 #, c-format
 msgid ""
 "Undo is done using either the 'svn revert' or the 'svn merge' command.\n"
 msgstr ""
 
-#: ../svn/svn.c:2983
+#: ../svn/svn.c:2774
 #, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
 "Type 'svn help %s' for usage.\n"
 msgstr ""
 
-#: ../svn/svn.c:2998 ../svnbench/svnbench.c:822
+#: ../svn/svn.c:2789 ../svnbench/svnbench.c:822
 msgid ""
 "Multiple revision arguments encountered; can't specify -c twice, or both -c "
 "and -r"
 msgstr ""
 
-#: ../svn/svn.c:3009
+#: ../svn/svn.c:2800
 msgid "--depth and --set-depth are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:3018 ../svnbench/svnbench.c:833
+#: ../svn/svn.c:2809 ../svnbench/svnbench.c:833
 msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:3027 ../svnbench/svnbench.c:842
+#: ../svn/svn.c:2818 ../svnbench/svnbench.c:842
 msgid "--with-revprop and --with-no-revprops are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:3057
+#: ../svn/svn.c:2848
 msgid "--message (-m) and --file (-F) are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:3070 ../svnbench/svnbench.c:855 ../svnmucc/svnmucc.c:678
+#: ../svn/svn.c:2861 ../svnbench/svnbench.c:855 ../svnmucc/svnmucc.c:678
 #: ../svnrdump/svnrdump.c:1047
 msgid "--trust-server-cert-failures requires --non-interactive"
 msgstr ""
 
-#: ../svn/svn.c:3078 ../svnbench/svnbench.c:863 ../svnmucc/svnmucc.c:686
+#: ../svn/svn.c:2869 ../svnbench/svnbench.c:863 ../svnmucc/svnmucc.c:686
 #: ../svnrdump/svnrdump.c:1054
 msgid "--password-from-stdin requires --non-interactive"
 msgstr ""
 
-#: ../svn/svn.c:3087
+#: ../svn/svn.c:2878
 msgid "--diff-cmd and --internal-diff are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:3129
+#: ../svn/svn.c:2920
 msgid "--relocate and --depth are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:3136
+#: ../svn/svn.c:2927
 msgid "--relocate and --non-recursive (-N) are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:3262
+#: ../svn/svn.c:3043
 msgid "Log message file is a versioned file; use '--force-log' to override"
 msgstr ""
 
-#: ../svn/svn.c:3269
+#: ../svn/svn.c:3050
 msgid "Lock comment file is a versioned file; use '--force-log' to override"
 msgstr ""
 
-#: ../svn/svn.c:3289
+#: ../svn/svn.c:3070
 msgid ""
 "The log message is a pathname (was -F intended?); use '--force-log' to "
 "override"
 msgstr ""
 
-#: ../svn/svn.c:3296
+#: ../svn/svn.c:3077
 msgid ""
 "The lock comment is a pathname (was -F intended?); use '--force-log' to "
 "override"
 msgstr ""
 
-#: ../svn/svn.c:3319
+#: ../svn/svn.c:3100
 msgid "--auto-props and --no-auto-props are mutually exclusive"
 msgstr ""
 
-#: ../svn/svn.c:3412 ../svn/svn.c:3419
+#: ../svn/svn.c:3193 ../svn/svn.c:3200
 #, c-format
 msgid "--accept=%s incompatible with --non-interactive"
 msgstr ""
 
-#: ../svn/svn.c:3468
+#: ../svn/svn.c:3249
 #, c-format
 msgid "Try 'svn help %s' for more information"
 msgstr ""
 
-#: ../svn/svn.c:3474 ../svnbench/svnbench.c:1006
+#: ../svn/svn.c:3255 ../svnbench/svnbench.c:1006
 msgid "Please see the 'svn upgrade' command"
 msgstr ""
 
-#: ../svn/svn.c:3480 ../svnmucc/svnmucc.c:971 ../svnrdump/svnrdump.c:1147
+#: ../svn/svn.c:3261 ../svnmucc/svnmucc.c:971 ../svnrdump/svnrdump.c:1147
 msgid ""
 "Authentication failed and interactive prompting is disabled; see the --force-"
 "interactive option"
 msgstr ""
 
-#: ../svn/svn.c:3485
+#: ../svn/svn.c:3266
 msgid ""
 "Reading file from standard input because of -F option; this can interfere "
 "with interactive prompting"
 msgstr ""
 
-#: ../svn/svn.c:3496 ../svnbench/svnbench.c:1014
+#: ../svn/svn.c:3277 ../svnbench/svnbench.c:1014
 msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)"
 msgstr ""
 
-#: ../svn/svn.c:3503
+#: ../svn/svn.c:3284
 msgid ""
 "Another process is blocking the working copy database, or the underlying "
 "filesystem does not support file locking; if the working copy is on a "
@@ -17076,7 +17128,7 @@ msgid ""
 "server"
 msgstr ""
 
-#: ../svn/svn.c:3516
+#: ../svn/svn.c:3297
 msgid ""
 "When using svn+ssh:// URLs, keep in mind that the --username and --password "
 "options are ignored because authentication is performed by SSH, not "
@@ -17227,121 +17279,121 @@ msgid ""
 "diff, merge, blame, and other operations will stop working on this file\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:180 ../svnfsfs/svnfsfs.c:101
+#: ../svnadmin/svnadmin.c:181 ../svnfsfs/svnfsfs.c:101
 #: ../svnrdump/svnrdump.c:114
 msgid "specify revision number ARG (or X:Y range)"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:183 ../svnlook/svnlook.c:173
+#: ../svnadmin/svnadmin.c:184 ../svnlook/svnlook.c:173
 msgid "specify transaction name ARG"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:186
+#: ../svnadmin/svnadmin.c:187
 msgid "dump or hotcopy incrementally"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:189
+#: ../svnadmin/svnadmin.c:190
 msgid "use deltas in dump output"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:192
+#: ../svnadmin/svnadmin.c:193
 msgid "bypass the repository hook system"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:195
+#: ../svnadmin/svnadmin.c:196
 msgid "bypass property validation logic"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:198
+#: ../svnadmin/svnadmin.c:199
 msgid "ignore revision datestamps found in the stream"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:201 ../svnfsfs/svnfsfs.c:98
+#: ../svnadmin/svnadmin.c:202 ../svnfsfs/svnfsfs.c:98
 msgid "no progress (only errors to stderr)"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:204
+#: ../svnadmin/svnadmin.c:205
 msgid "ignore any repos UUID found in the stream"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:207
+#: ../svnadmin/svnadmin.c:208
 msgid "set repos UUID to that found in stream, if any"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:210
+#: ../svnadmin/svnadmin.c:211
 msgid ""
 "type of repository:\n"
 "                             'fsfs' (default), 'bdb' or 'fsx'\n"
 "                             CAUTION: FSX is for EXPERIMENTAL use only!"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:215
+#: ../svnadmin/svnadmin.c:216
 msgid "load at specified directory in repository"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:218
+#: ../svnadmin/svnadmin.c:219
 msgid "disable fsync at transaction commit [Berkeley DB]"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:221
+#: ../svnadmin/svnadmin.c:222
 msgid "disable automatic log file removal [Berkeley DB]"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:227
+#: ../svnadmin/svnadmin.c:228
 msgid ""
 "remove redundant Berkeley DB log files\n"
 "                             from source repository [Berkeley DB]"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:231
+#: ../svnadmin/svnadmin.c:232
 msgid "call pre-commit hook before committing revisions"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:234
+#: ../svnadmin/svnadmin.c:235
 msgid "call post-commit hook after committing revisions"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:237
+#: ../svnadmin/svnadmin.c:238
 msgid "call hook before changing revision property"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:240
+#: ../svnadmin/svnadmin.c:241
 msgid "call hook after changing revision property"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:243
+#: ../svnadmin/svnadmin.c:244
 msgid ""
 "wait instead of exit if the repository is in\n"
 "                             use by another process"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:247 ../svnadmin/svnadmin.c:250
-#: ../svnadmin/svnadmin.c:253
+#: ../svnadmin/svnadmin.c:248 ../svnadmin/svnadmin.c:251
+#: ../svnadmin/svnadmin.c:254
 msgid "deprecated; see --compatible-version"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:256
+#: ../svnadmin/svnadmin.c:257
 msgid "continue verification after detecting a corruption"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:259 ../svnlook/svnlook.c:148
+#: ../svnadmin/svnadmin.c:260 ../svnlook/svnlook.c:148
 msgid ""
 "size of the extra in-memory cache in MB used to\n"
 "                             minimize redundant operations. Default: 16.\n"
 "                             [used for FSFS repositories only]"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:264
+#: ../svnadmin/svnadmin.c:265
 msgid ""
 "use repository format compatible with Subversion\n"
 "                             version ARG (\"1.5.5\", \"1.7\", etc.)"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:267 ../svnadmin/svnadmin.c:405
+#: ../svnadmin/svnadmin.c:268 ../svnadmin/svnadmin.c:416
 msgid "read repository paths from file ARG"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:270
+#: ../svnadmin/svnadmin.c:271
 msgid ""
 "report any names within the same directory or\n"
 "                             svn:mergeinfo property value that differ only\n"
@@ -17349,34 +17401,34 @@ msgid ""
 "                             identical"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:276
+#: ../svnadmin/svnadmin.c:277
 msgid ""
 "verify metadata only (ignored for BDB),\n"
 "                             checking against external corruption in\n"
 "                             Subversion 1.9+ format repositories.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:281
+#: ../svnadmin/svnadmin.c:282
 msgid ""
 "disable flushing to disk during the operation\n"
 "                             (faster, but unsafe on power off)"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:285
+#: ../svnadmin/svnadmin.c:286
 msgid ""
 "normalize property values found in the dumpstream\n"
 "                             (currently, only translates non-LF line endings)"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:289
+#: ../svnadmin/svnadmin.c:290
 msgid "filter out nodes with given prefix(es) from dump"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:292
+#: ../svnadmin/svnadmin.c:293
 msgid "filter out nodes without given prefix(es) from dump"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:295
+#: ../svnadmin/svnadmin.c:296
 msgid ""
 "treat the path prefixes as file glob patterns.\n"
 "                             Glob special characters are '*' '?' '[]' and "
@@ -17386,42 +17438,56 @@ msgid ""
 "foo."
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:310
+#: ../svnadmin/svnadmin.c:311
+msgid ""
+"usage: svnadmin build-repcache REPOS_PATH [-r LOWER[:UPPER]]\n"
+"\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:313
+msgid ""
+"Add missing entries to the representation cache for the repository\n"
+"at REPOS_PATH. Process data in revisions LOWER through UPPER.\n"
+"If no revision arguments are given, process all revisions. If only\n"
+"LOWER revision argument is given, process only that single revision.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:321
 msgid ""
 "usage: svnadmin crashtest REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:312
+#: ../svnadmin/svnadmin.c:323
 msgid ""
 "Open the repository at REPOS_PATH, then abort, thus simulating\n"
 "a process that crashes while holding an open repository handle.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:318
+#: ../svnadmin/svnadmin.c:329
 msgid ""
 "usage: svnadmin create REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:320
+#: ../svnadmin/svnadmin.c:331
 msgid "Create a new, empty repository at REPOS_PATH.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:329
+#: ../svnadmin/svnadmin.c:340
 msgid ""
 "usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n"
 "                   2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:332
+#: ../svnadmin/svnadmin.c:343
 msgid ""
 "1. Delete the property NAME on revision REVISION.\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:334 ../svnadmin/svnadmin.c:570
+#: ../svnadmin/svnadmin.c:345 ../svnadmin/svnadmin.c:581
 msgid ""
 "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n"
 "trigger the revision property-related hooks (for example, if you want\n"
@@ -17429,24 +17495,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:338
+#: ../svnadmin/svnadmin.c:349
 msgid ""
 "NOTE: Revision properties are not versioned, so this command will\n"
 "irreversibly destroy the previous value of the property.\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:341
+#: ../svnadmin/svnadmin.c:352
 msgid "2. Delete the property NAME on transaction TXN.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:347
+#: ../svnadmin/svnadmin.c:358
 msgid ""
 "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:349
+#: ../svnadmin/svnadmin.c:360
 msgid ""
 "Run over the requested revision range, performing predecessor delti-\n"
 "fication on the paths changed in those revisions.  Deltification in\n"
@@ -17455,13 +17521,13 @@ msgid ""
 "this will simply deltify the HEAD revision.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:358
+#: ../svnadmin/svnadmin.c:369
 msgid ""
 "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:360
+#: ../svnadmin/svnadmin.c:371
 msgid ""
 "Dump the contents of filesystem to stdout in a 'dumpfile'\n"
 "portable format, sending feedback to stderr.  Dump revisions\n"
@@ -17475,25 +17541,25 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:370
+#: ../svnadmin/svnadmin.c:381
 msgid ""
 "Using --exclude or --include gives results equivalent to authz-based\n"
 "path exclusions. In particular, when the source of a copy is\n"
 "excluded, the copy is transformed into an add (unlike in 'svndumpfilter').\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:376 ../svnadmin/svnadmin.c:388
+#: ../svnadmin/svnadmin.c:387 ../svnadmin/svnadmin.c:399
 #: ../svnrdump/svnrdump.c:94
 msgid "write to file ARG instead of stdout"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:379
+#: ../svnadmin/svnadmin.c:390
 msgid ""
 "usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:381
+#: ../svnadmin/svnadmin.c:392
 msgid ""
 "Dump the revision properties of filesystem to stdout in a 'dumpfile'\n"
 "portable format, sending feedback to stderr.  Dump revisions\n"
@@ -17502,21 +17568,21 @@ msgid ""
 "properties for that one revision.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:391
+#: ../svnadmin/svnadmin.c:402
 msgid ""
 "usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n"
 "               2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:394
+#: ../svnadmin/svnadmin.c:405
 msgid ""
 "1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
 "   Allows safe use of third-party backup tools on a live repository.\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:397
+#: ../svnadmin/svnadmin.c:408
 msgid ""
 "2. Like 1 except all repositories listed in FILE are locked. The file\n"
 "   format is repository paths separated by newlines.  Repositories are\n"
@@ -17526,24 +17592,24 @@ msgid ""
 "all later arguments to PROGRAM even if they begin with '-'.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:408
+#: ../svnadmin/svnadmin.c:419
 msgid ""
 "usage: svnadmin help [SUBCOMMAND...]\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:410 ../svnfsfs/svnfsfs.c:119 ../svnlook/svnlook.c:273
+#: ../svnadmin/svnadmin.c:421 ../svnfsfs/svnfsfs.c:119 ../svnlook/svnlook.c:273
 #: ../svnrdump/svnrdump.c:105 ../svnsync/svnsync.c:172
 msgid "Describe the usage of this program or its subcommands.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:415
+#: ../svnadmin/svnadmin.c:426
 msgid ""
 "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:417
+#: ../svnadmin/svnadmin.c:428
 msgid ""
 "Make a hot copy of a repository.\n"
 "If --incremental is passed, data which already exists at the destination\n"
@@ -17551,51 +17617,51 @@ msgid ""
 "repositories.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:424
+#: ../svnadmin/svnadmin.c:435
 msgid ""
 "usage: svnadmin info REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:426
+#: ../svnadmin/svnadmin.c:437
 msgid "Print information about the repository at REPOS_PATH.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:431
+#: ../svnadmin/svnadmin.c:442
 msgid ""
 "usage: svnadmin list-dblogs REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:433
+#: ../svnadmin/svnadmin.c:444
 msgid ""
 "List all Berkeley DB log files.\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:435
+#: ../svnadmin/svnadmin.c:446
 msgid ""
 "WARNING: Modifying or deleting logfiles which are still in use\n"
 "will cause your repository to be corrupted.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:441
+#: ../svnadmin/svnadmin.c:452
 msgid ""
 "usage: svnadmin list-unused-dblogs REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:443
+#: ../svnadmin/svnadmin.c:454
 msgid "List unused Berkeley DB log files.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:448
+#: ../svnadmin/svnadmin.c:459
 msgid ""
 "usage: svnadmin load REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:450
+#: ../svnadmin/svnadmin.c:461
 msgid ""
 "Read a 'dumpfile'-formatted stream from stdin, committing\n"
 "new revisions into the repository's filesystem.  If the repository\n"
@@ -17605,18 +17671,18 @@ msgid ""
 "in the dump stream whose revision numbers match the specified range.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:463 ../svnadmin/svnadmin.c:476
+#: ../svnadmin/svnadmin.c:474 ../svnadmin/svnadmin.c:487
 #: ../svnrdump/svnrdump.c:101
 msgid "read from file ARG instead of stdin"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:466
+#: ../svnadmin/svnadmin.c:477
 msgid ""
 "usage: svnadmin load-revprops REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:468
+#: ../svnadmin/svnadmin.c:479
 msgid ""
 "Read a 'dumpfile'-formatted stream from stdin, setting the revision\n"
 "properties in the repository's filesystem.  Revisions not found in the\n"
@@ -17625,64 +17691,64 @@ msgid ""
 "in the dump stream whose revision numbers match the specified range.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:479
+#: ../svnadmin/svnadmin.c:490
 msgid ""
 "usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:481
+#: ../svnadmin/svnadmin.c:492
 msgid ""
 "Lock PATH by USERNAME setting comments from COMMENT-FILE.\n"
 "If provided, use TOKEN as lock token.  Use --bypass-hooks to avoid\n"
 "triggering the pre-lock and post-lock hook scripts.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:488
+#: ../svnadmin/svnadmin.c:499
 msgid ""
 "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:490
+#: ../svnadmin/svnadmin.c:501
 msgid ""
 "Print descriptions of all locks on or under PATH-IN-REPOS (which,\n"
 "if not provided, is the root of the repository).\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:496
+#: ../svnadmin/svnadmin.c:507
 msgid ""
 "usage: svnadmin lstxns REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:498
+#: ../svnadmin/svnadmin.c:509
 msgid ""
 "Print the names of uncommitted transactions. With -rN skip the output\n"
 "of those that have a base revision more recent than rN.  Transactions\n"
 "with base revisions much older than HEAD are likely to have been\n"
-"abandonded and are candidates to be removed.\n"
+"abandoned and are candidates to be removed.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:507
+#: ../svnadmin/svnadmin.c:518
 msgid ""
 "usage: svnadmin pack REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:509
+#: ../svnadmin/svnadmin.c:520
 msgid ""
 "Possibly compact the repository into a more efficient storage model.\n"
 "This may not apply to all repositories, in which case, exit.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:515
+#: ../svnadmin/svnadmin.c:526
 msgid ""
 "usage: svnadmin recover REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:517
+#: ../svnadmin/svnadmin.c:528
 msgid ""
 "Run the recovery procedure on a repository.  Do this if you've\n"
 "been getting errors indicating that recovery ought to be run.\n"
@@ -17690,50 +17756,50 @@ msgid ""
 "exit if the repository is in use by another process.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:525
+#: ../svnadmin/svnadmin.c:536
 msgid ""
 "usage: svnadmin rev-size REPOS_PATH -r REVISION\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:527
+#: ../svnadmin/svnadmin.c:538
 msgid ""
 "Print the total size in bytes of the representation on disk of\n"
 "revision REVISION.\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:530
+#: ../svnadmin/svnadmin.c:541
 msgid "The size includes revision properties and excludes FSFS indexes.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:536
+#: ../svnadmin/svnadmin.c:547
 msgid ""
 "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:538
+#: ../svnadmin/svnadmin.c:549
 msgid "Unconditionally remove lock from each LOCKED_PATH.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:543
+#: ../svnadmin/svnadmin.c:554
 msgid ""
 "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:545
+#: ../svnadmin/svnadmin.c:556
 msgid "Delete the named transaction(s).\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:550
+#: ../svnadmin/svnadmin.c:561
 msgid ""
 "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:552
+#: ../svnadmin/svnadmin.c:563
 msgid ""
 "Set the log-message on revision REVISION to the contents of FILE.  Use\n"
 "--bypass-hooks to avoid triggering the revision-property-related hooks\n"
@@ -17744,76 +17810,76 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:559
+#: ../svnadmin/svnadmin.c:570
 msgid ""
 "NOTE: Revision properties are not versioned, so this command will\n"
 "overwrite the previous log message.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:565
+#: ../svnadmin/svnadmin.c:576
 msgid ""
 "usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
 "                   2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:568
+#: ../svnadmin/svnadmin.c:579
 msgid ""
 "1. Set the property NAME on revision REVISION to the contents of FILE.\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:574
+#: ../svnadmin/svnadmin.c:585
 msgid ""
 "NOTE: Revision properties are not versioned, so this command will\n"
 "overwrite the previous value of the property.\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:577
+#: ../svnadmin/svnadmin.c:588
 msgid "2. Set the property NAME on transaction TXN to the contents of FILE.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:583
+#: ../svnadmin/svnadmin.c:594
 msgid ""
 "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:585
+#: ../svnadmin/svnadmin.c:596
 msgid ""
 "Reset the repository UUID for the repository located at REPOS_PATH.  If\n"
 "NEW_UUID is provided, use that as the new repository UUID; otherwise,\n"
 "generate a brand new UUID for the repository.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:592
+#: ../svnadmin/svnadmin.c:603
 msgid ""
 "usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:594
+#: ../svnadmin/svnadmin.c:605
 msgid ""
 "Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n"
 "associated with the lock matches TOKEN.  Use --bypass-hooks to avoid\n"
 "triggering the pre-unlock and post-unlock hook scripts.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:601
+#: ../svnadmin/svnadmin.c:612
 msgid ""
 "usage: svnadmin upgrade REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:603
+#: ../svnadmin/svnadmin.c:614
 msgid ""
 "Upgrade the repository located at REPOS_PATH to the latest supported\n"
 "schema version.\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:606
+#: ../svnadmin/svnadmin.c:617
 msgid ""
 "This functionality is provided as a convenience for repository\n"
 "administrators who wish to make use of new Subversion functionality\n"
@@ -17824,164 +17890,164 @@ msgid ""
 "repository state as a dump and subsequent load would.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:617
+#: ../svnadmin/svnadmin.c:628
 msgid ""
 "usage: svnadmin verify REPOS_PATH\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:619
+#: ../svnadmin/svnadmin.c:630
 msgid "Verify the data stored in the repository.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:720 ../svnadmin/svnadmin.c:2911
+#: ../svnadmin/svnadmin.c:731 ../svnadmin/svnadmin.c:2922
 msgid "Invalid revision specifier"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:724
+#: ../svnadmin/svnadmin.c:735
 #, c-format
 msgid "Revisions must not be greater than the youngest revision (%ld)"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:751
+#: ../svnadmin/svnadmin.c:762
 #, c-format
 msgid "Path '%s' is not a local path"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:780
+#: ../svnadmin/svnadmin.c:791
 msgid "Not enough arguments"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:823
+#: ../svnadmin/svnadmin.c:834
 #, c-format
 msgid ""
 "Successfully opened repository '%s'.\n"
 "Will now crash to simulate a crashing server process.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:862
+#: ../svnadmin/svnadmin.c:873
 #, c-format
 msgid ""
 "%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s"
 "\" instead.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:903
+#: ../svnadmin/svnadmin.c:914
 msgid "Repositories compatible with 1.0.x must use --fs-type=bdb"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:911
+#: ../svnadmin/svnadmin.c:922
 #, c-format
 msgid "Repositories compatible with 1.8.x or earlier cannot use --fs-type=%s"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:956 ../svnadmin/svnadmin.c:1356
-#: ../svnadmin/svnadmin.c:1686
+#: ../svnadmin/svnadmin.c:967 ../svnadmin/svnadmin.c:1367
+#: ../svnadmin/svnadmin.c:1697 ../svnadmin/svnadmin.c:3022
 msgid "First revision cannot be higher than second"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:965
+#: ../svnadmin/svnadmin.c:976
 #, c-format
 msgid "Deltifying revision %ld..."
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:969 ../svnadmin/svnadmin.c:1100
-#: ../svnadmin/svnadmin.c:1115
+#: ../svnadmin/svnadmin.c:980 ../svnadmin/svnadmin.c:1111
+#: ../svnadmin/svnadmin.c:1126
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1018
+#: ../svnadmin/svnadmin.c:1029
 msgid "* Error verifying repository metadata.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1024
+#: ../svnadmin/svnadmin.c:1035
 #, c-format
 msgid "* Error verifying revision %ld.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1081
+#: ../svnadmin/svnadmin.c:1092
 msgid "* Verifying repository metadata ...\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1084
+#: ../svnadmin/svnadmin.c:1095
 #, c-format
 msgid "* Verifying metadata at revision %ld ...\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1094
+#: ../svnadmin/svnadmin.c:1105
 #, c-format
 msgid "Packing revisions in shard %s..."
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1109
+#: ../svnadmin/svnadmin.c:1120
 #, c-format
 msgid "Packing revprops in shard %s..."
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1184
+#: ../svnadmin/svnadmin.c:1195
 #, c-format
 msgid "<<< Skipped original revision %ld\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1200
+#: ../svnadmin/svnadmin.c:1211
 msgid ""
 "Repository lock acquired.\n"
 "Please wait; recovering the repository may take some time...\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1207
+#: ../svnadmin/svnadmin.c:1218
 msgid ""
 "Repository lock acquired.\n"
 "Please wait; upgrading the repository may take some time...\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1218
+#: ../svnadmin/svnadmin.c:1229
 #, c-format
 msgid "Packed revision properties in shard %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1229
+#: ../svnadmin/svnadmin.c:1240
 #, c-format
 msgid "Removed non-packed revision properties in shard %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1237
+#: ../svnadmin/svnadmin.c:1248
 #, c-format
 msgid "Bumped repository format to %ld\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1245
+#: ../svnadmin/svnadmin.c:1256
 #, c-format
 msgid "* Copied revision %ld.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1251
+#: ../svnadmin/svnadmin.c:1262
 #, c-format
 msgid "* Copied revisions from %ld to %ld.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1262
+#: ../svnadmin/svnadmin.c:1273
 #, c-format
 msgid ""
 "svnadmin: Warning - this repository is not sharded. Packing has no effect.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1269
+#: ../svnadmin/svnadmin.c:1280
 #, c-format
 msgid "Properties set on revision %ld.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1464
+#: ../svnadmin/svnadmin.c:1475
 #, c-format
 msgid "'--exclude' and '--include' options cannot be used simultaneously"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1568
+#: ../svnadmin/svnadmin.c:1579
 msgid "No program provided"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1608
+#: ../svnadmin/svnadmin.c:1619
 msgid ""
 "general usage: svnadmin SUBCOMMAND REPOS_PATH  [ARGS & OPTIONS ...]\n"
 "Subversion repository administration tool.\n"
@@ -17991,197 +18057,197 @@ msgid ""
 "Available subcommands:\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1616 ../svnlook/svnlook.c:2252
+#: ../svnadmin/svnadmin.c:1627 ../svnlook/svnlook.c:2252
 #: ../svnserve/svnserve.c:470
 msgid ""
 "The following repository back-end (FS) modules are available:\n"
 "\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1645
+#: ../svnadmin/svnadmin.c:1656
 #, c-format
 msgid "Invalid revision number (%ld) specified"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1655
+#: ../svnadmin/svnadmin.c:1666
 msgid "Non-numeric revision specified"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1737 ../svnadmin/svnadmin.c:1795
+#: ../svnadmin/svnadmin.c:1748 ../svnadmin/svnadmin.c:1806
 msgid ""
 "A property with invalid line ending found in dumpstream; consider using --"
 "normalize-props while loading."
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1744 ../svnadmin/svnadmin.c:1802
+#: ../svnadmin/svnadmin.c:1755 ../svnadmin/svnadmin.c:1813
 msgid ""
 "Invalid property value found in dumpstream; consider repairing the source or "
 "using --bypass-prop-validation while loading."
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1894 ../svnadmin/svnadmin.c:2794
+#: ../svnadmin/svnadmin.c:1905 ../svnadmin/svnadmin.c:2805
 msgid ""
 "Failed to get exclusive repository access; perhaps another process\n"
 "such as httpd, svnserve or svn has it open?"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1899 ../svnadmin/svnadmin.c:2799
+#: ../svnadmin/svnadmin.c:1910 ../svnadmin/svnadmin.c:2810
 #, c-format
 msgid "Waiting on repository lock; perhaps another process has it open?\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1907
+#: ../svnadmin/svnadmin.c:1918
 #, c-format
 msgid ""
 "\n"
 "Recovery completed.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:1914
+#: ../svnadmin/svnadmin.c:1925
 #, c-format
 msgid "The latest repos revision is %ld.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2026
+#: ../svnadmin/svnadmin.c:2037
 #, c-format
 msgid "Transaction '%s' removed.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2108 ../svnadmin/svnadmin.c:2222
-#: ../svnadmin/svnadmin.c:2844
+#: ../svnadmin/svnadmin.c:2119 ../svnadmin/svnadmin.c:2233
+#: ../svnadmin/svnadmin.c:2855
 #, c-format
 msgid "--revision (-r) and --transaction (-t) are mutually exclusive"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2114 ../svnadmin/svnadmin.c:2850
+#: ../svnadmin/svnadmin.c:2125 ../svnadmin/svnadmin.c:2861
 #, c-format
 msgid "Calling hooks is incompatible with --transaction (-t)"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2119 ../svnadmin/svnadmin.c:2164
-#: ../svnadmin/svnadmin.c:2855
+#: ../svnadmin/svnadmin.c:2130 ../svnadmin/svnadmin.c:2175
+#: ../svnadmin/svnadmin.c:2866
 #, c-format
 msgid "Missing revision"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2122 ../svnadmin/svnadmin.c:2167
-#: ../svnadmin/svnadmin.c:2858
+#: ../svnadmin/svnadmin.c:2133 ../svnadmin/svnadmin.c:2178
+#: ../svnadmin/svnadmin.c:2869
 #, c-format
 msgid "Only one revision allowed"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2286
+#: ../svnadmin/svnadmin.c:2297
 msgid ""
 "\n"
 "-----Summary of corrupt revisions-----\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2338
+#: ../svnadmin/svnadmin.c:2349
 #, c-format
 msgid "Failed to verify repository '%s'"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2390
+#: ../svnadmin/svnadmin.c:2401
 #, c-format
 msgid "UUID: %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2393
+#: ../svnadmin/svnadmin.c:2404
 #, c-format
 msgid "Revisions: %ld\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2399
+#: ../svnadmin/svnadmin.c:2410
 #, c-format
 msgid "Repository Format: %d\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2413
+#: ../svnadmin/svnadmin.c:2424
 #, c-format
 msgid "Compatible With Version: %d.%d.0\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2432
+#: ../svnadmin/svnadmin.c:2443
 #, c-format
 msgid "Repository Capability: %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2441
+#: ../svnadmin/svnadmin.c:2452
 #, c-format
 msgid "Filesystem Type: %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2443
+#: ../svnadmin/svnadmin.c:2454
 #, c-format
 msgid "Filesystem Format: %d\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2450
+#: ../svnadmin/svnadmin.c:2461
 #, c-format
 msgid "FSFS Sharded: yes\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2452
+#: ../svnadmin/svnadmin.c:2463
 #, c-format
 msgid "FSFS Sharded: no\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2455
+#: ../svnadmin/svnadmin.c:2466
 #, c-format
 msgid "FSFS Shard Size: %d\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2464
+#: ../svnadmin/svnadmin.c:2475
 #, c-format
 msgid "FSFS Shards Packed: %ld/%ld\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2469
+#: ../svnadmin/svnadmin.c:2480
 #, c-format
 msgid "FSFS Logical Addressing: yes\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2471
+#: ../svnadmin/svnadmin.c:2482
 #, c-format
 msgid "FSFS Logical Addressing: no\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2481
+#: ../svnadmin/svnadmin.c:2492
 #, c-format
 msgid "FSX Shard Size: %d\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2483
+#: ../svnadmin/svnadmin.c:2494
 #, c-format
 msgid "FSX Shards Packed: %ld/%ld\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2494
+#: ../svnadmin/svnadmin.c:2505
 #, c-format
 msgid "Configuration File: %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2622 ../svnlook/svnlook.c:2315
+#: ../svnadmin/svnadmin.c:2633 ../svnlook/svnlook.c:2315
 #, c-format
 msgid "UUID Token: %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2623 ../svnlook/svnlook.c:2316
+#: ../svnadmin/svnadmin.c:2634 ../svnlook/svnlook.c:2316
 #, c-format
 msgid "Owner: %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2624 ../svnlook/svnlook.c:2317
+#: ../svnadmin/svnadmin.c:2635 ../svnlook/svnlook.c:2317
 #, c-format
 msgid "Created: %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2625 ../svnlook/svnlook.c:2318
+#: ../svnadmin/svnadmin.c:2636 ../svnlook/svnlook.c:2318
 #, c-format
 msgid "Expires: %s\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2627
+#: ../svnadmin/svnadmin.c:2638
 #, c-format
 msgid ""
 "Comment (%i line):\n"
@@ -18194,92 +18260,110 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../svnadmin/svnadmin.c:2675
+#: ../svnadmin/svnadmin.c:2686
 msgid "No paths to unlock provided"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2693
+#: ../svnadmin/svnadmin.c:2704
 #, c-format
 msgid "Path '%s' isn't locked.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2707
+#: ../svnadmin/svnadmin.c:2718
 #, c-format
 msgid "Removed lock on '%s'.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2761
+#: ../svnadmin/svnadmin.c:2772
 #, c-format
 msgid "'%s' unlocked by user '%s'.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2809
+#: ../svnadmin/svnadmin.c:2820
 msgid ""
 "Upgrade of this repository's underlying versioned filesystem is not "
 "supported; consider dumping and loading the data elsewhere"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2816
+#: ../svnadmin/svnadmin.c:2827
 msgid ""
 "Upgrade of this repository is not supported; consider dumping and loading "
 "the data elsewhere"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2822
+#: ../svnadmin/svnadmin.c:2833
 #, c-format
 msgid ""
 "\n"
 "Upgrade completed.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2889
+#: ../svnadmin/svnadmin.c:2900
 #, c-format
 msgid ""
-"Revision size query is not implemented for the filesytem type found in '%s'"
+"Revision size query is not implemented for the filesystem type found in '%s'"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2920
+#: ../svnadmin/svnadmin.c:2931
 msgid "%12"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:2998 ../svnfsfs/svnfsfs.c:293
+#: ../svnadmin/svnadmin.c:2943
+#, c-format
+msgid "* Processed revision %ld.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2977
+#, c-format
+msgid ""
+"Building rep-cache is not implemented for the filesystem type found in '%s'"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2985
+#, c-format
+msgid ""
+"svnadmin: Warning - this repository has rep-sharing disabled. Building rep-"
+"cache has no effect.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:3110 ../svnfsfs/svnfsfs.c:293
 #: ../svnrdump/svnrdump.c:853
 msgid ""
 "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:3081
+#: ../svnadmin/svnadmin.c:3193
 #, c-format
 msgid "Cannot create pre-1.0-compatible repositories"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:3093
+#: ../svnadmin/svnadmin.c:3205
 #, c-format
 msgid "Cannot guarantee compatibility beyond the current running version (%s)"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:3217 ../svnfsfs/svnfsfs.c:362
+#: ../svnadmin/svnadmin.c:3329 ../svnfsfs/svnfsfs.c:362
 #, c-format
 msgid "subcommand argument required\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:3254 ../svnfsfs/svnfsfs.c:397
+#: ../svnadmin/svnadmin.c:3366 ../svnfsfs/svnfsfs.c:397
 msgid "Repository argument required"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:3262 ../svnfsfs/svnfsfs.c:405
+#: ../svnadmin/svnadmin.c:3374 ../svnfsfs/svnfsfs.c:405
 #, c-format
 msgid "'%s' is a URL when it should be a local path"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:3292
+#: ../svnadmin/svnadmin.c:3404
 #, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
 "Type 'svnadmin help %s' for usage.\n"
 msgstr ""
 
-#: ../svnadmin/svnadmin.c:3323
+#: ../svnadmin/svnadmin.c:3435
 msgid "Try 'svnadmin help' for more info"
 msgstr ""
 
@@ -19398,16 +19482,16 @@ msgstr ""
 msgid "Invalid revision number '%s'"
 msgstr ""
 
-#: ../svnrdump/load_editor.c:716
+#: ../svnrdump/load_editor.c:717
 msgid "This dumpstream reader requires a delta format dumpstream"
 msgstr ""
 
-#: ../svnrdump/load_editor.c:1367 ../svnsync/svnsync.c:358
+#: ../svnrdump/load_editor.c:1368 ../svnsync/svnsync.c:358
 #, c-format
 msgid "Failed to get lock on destination repos, currently held by '%s'\n"
 msgstr ""
 
-#: ../svnrdump/load_editor.c:1398
+#: ../svnrdump/load_editor.c:1399
 msgid ""
 "Target server does not support atomic revision property edits; consider "
 "upgrading it to 1.7."
diff --git a/subversion/po/sv.po b/subversion/po/sv.po
index 9d23834..0e25c0b 100644
--- a/subversion/po/sv.po
+++ b/subversion/po/sv.po
@@ -1556,7 +1556,7 @@ msgid "Certificate signature mismatch"
 msgstr "Certifikatssignaturen stämmer ej"
 
 #: ../include/svn_error_codes.h:1772
-msgid "Certficate verification failed"
+msgid "Certificate verification failed"
 msgstr "Certifikatskontrollen misslyckades"
 
 #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:296
@@ -19164,7 +19164,7 @@ msgid ""
 "Print the names of uncommitted transactions. With -rN skip the output\n"
 "of those that have a base revision more recent than rN.  Transactions\n"
 "with base revisions much older than HEAD are likely to have been\n"
-"abandonded and are candidates to be removed.\n"
+"abandoned and are candidates to be removed.\n"
 msgstr ""
 "Skriv namnen på oarkiverade transaktioner. Med -rN, hoppa över transaktioner\n"
 "med basrevision nyare än rN. Transaktioner med basrevisioner som är mycket\n"
diff --git a/subversion/svn/cl.h b/subversion/svn/cl.h
index 5e72985..955e3ea 100644
--- a/subversion/svn/cl.h
+++ b/subversion/svn/cl.h
@@ -288,6 +288,103 @@ typedef struct svn_cl__cmd_baton_t
 } svn_cl__cmd_baton_t;
 
 
+/* Add an identifier here for long options that don't have a short
+   option. Options that have both long and short options should just
+   use the short option letter as identifier.  */
+typedef enum svn_cl__longopt_t {
+  opt_auth_password = SVN_OPT_FIRST_LONGOPT_ID,
+  opt_auth_password_from_stdin,
+  opt_auth_username,
+  opt_autoprops,
+  opt_changelist,
+  opt_config_dir,
+  opt_config_options,
+  /* diff options */
+  opt_diff_cmd,
+  opt_internal_diff,
+  opt_no_diff_added,
+  opt_no_diff_deleted,
+  opt_show_copies_as_adds,
+  opt_notice_ancestry,
+  opt_summarize,
+  opt_use_git_diff_format,
+  opt_ignore_properties,
+  opt_properties_only,
+  opt_patch_compatible,
+  /* end of diff options */
+  opt_dry_run,
+  opt_editor_cmd,
+  opt_encoding,
+  opt_force_log,
+  opt_force,
+  opt_keep_changelists,
+  opt_ignore_ancestry,
+  opt_ignore_externals,
+  opt_incremental,
+  opt_merge_cmd,
+  opt_native_eol,
+  opt_new_cmd,
+  opt_no_auth_cache,
+  opt_no_autoprops,
+  opt_no_ignore,
+  opt_no_unlock,
+  opt_non_interactive,
+  opt_force_interactive,
+  opt_old_cmd,
+  opt_record_only,
+  opt_relocate,
+  opt_remove,
+  opt_revprop,
+  opt_stop_on_copy,
+  opt_strict,                   /* ### DEPRECATED */
+  opt_targets,
+  opt_depth,
+  opt_set_depth,
+  opt_version,
+  opt_xml,
+  opt_keep_local,
+  opt_with_revprop,
+  opt_with_all_revprops,
+  opt_with_no_revprops,
+  opt_parents,
+  opt_accept,
+  opt_show_revs,
+  opt_reintegrate,
+  opt_trust_server_cert,
+  opt_trust_server_cert_failures,
+  opt_strip,
+  opt_ignore_keywords,
+  opt_reverse_diff,
+  opt_ignore_whitespace,
+  opt_diff,
+  opt_allow_mixed_revisions,
+  opt_include_externals,
+  opt_show_inherited_props,
+  opt_search,
+  opt_search_and,
+  opt_mergeinfo_log,
+  opt_remove_unversioned,
+  opt_remove_ignored,
+  opt_remove_added,
+  opt_no_newline,
+  opt_show_passwords,
+  opt_pin_externals,
+  opt_show_item,
+  opt_adds_as_modification,
+  opt_vacuum_pristines,
+  opt_drop,
+  opt_viewspec,
+} svn_cl__longopt_t;
+
+/* Options for giving a log message.  (Some of these also have other uses.)
+ */
+#define SVN_CL__LOG_MSG_OPTIONS 'm', 'F', \
+                                opt_force_log, \
+                                opt_editor_cmd, \
+                                opt_encoding, \
+                                opt_with_revprop
+
+
 /* Declare all the command procedures */
 svn_opt_subcommand_t
   svn_cl__add,
@@ -322,15 +419,6 @@ svn_opt_subcommand_t
   svn_cl__revert,
   svn_cl__resolve,
   svn_cl__resolved,
-  svn_cl__shelf_diff,
-  svn_cl__shelf_drop,
-  svn_cl__shelf_list,
-  svn_cl__shelf_list_by_paths,
-  svn_cl__shelf_log,
-  svn_cl__shelf_save,
-  svn_cl__shelf_shelve,
-  svn_cl__shelf_unshelve,
-  svn_cl__wc_copy_mods,
   svn_cl__status,
   svn_cl__switch,
   svn_cl__unlock,
@@ -339,7 +427,7 @@ svn_opt_subcommand_t
 
 
 /* See definition in svn.c for documentation. */
-extern const svn_opt_subcommand_desc3_t svn_cl__cmd_table[];
+extern const svn_opt_subcommand_desc3_t *svn_cl__cmd_table;
 
 /* See definition in svn.c for documentation. */
 extern const int svn_cl__global_options[];
@@ -413,7 +501,7 @@ svn_error_t *
 svn_cl__print_conflict_stats(svn_cl__conflict_stats_t *conflict_stats,
                              apr_pool_t *scratch_pool);
 
-/* 
+/*
  * Interactively resolve the conflict a @a CONFLICT.
  * TODO: more docs
  */
@@ -430,7 +518,7 @@ svn_cl__resolve_conflict(svn_boolean_t *quit,
                          svn_client_ctx_t *ctx,
                          apr_pool_t *scratch_pool);
 
-/* 
+/*
  * Interactively resolve conflicts for all TARGETS.
  * TODO: more docs
  */
diff --git a/subversion/svn/conflict-callbacks.c b/subversion/svn/conflict-callbacks.c
index acd27e5..1c073e6 100644
--- a/subversion/svn/conflict-callbacks.c
+++ b/subversion/svn/conflict-callbacks.c
@@ -234,7 +234,7 @@ merge_prop_conflict(svn_stream_t *output,
     my_propval = svn_string_create_empty(pool);
   if (their_propval == NULL)
     their_propval = svn_string_create_empty(pool);
-    
+
   options->ignore_eol_style = TRUE;
   SVN_ERR(svn_diff_mem_string_diff3(&diff, base_propval,
                                     merged_propval ?
@@ -361,7 +361,7 @@ edit_prop_conflict(const svn_string_t **merged_propval,
       svn_stringbuf_t *buf;
 
       SVN_ERR(svn_stringbuf_from_file2(&buf, file_path, scratch_pool));
-      *merged_propval = svn_string_create_from_buf(buf, result_pool); 
+      *merged_propval = svn_string_create_from_buf(buf, result_pool);
     }
 
   return SVN_NO_ERROR;
@@ -900,7 +900,7 @@ handle_text_conflict(svn_boolean_t *resolved,
   const char *their_abspath;
   const char *merged_abspath = svn_client_conflict_get_local_abspath(conflict);
   apr_array_header_t *text_conflict_options;
-  svn_client_conflict_option_id_t option_id; 
+  svn_client_conflict_option_id_t option_id;
 
   option_id = svn_client_conflict_option_unspecified;
 
@@ -1559,11 +1559,11 @@ build_tree_conflict_options(
       /* Add move target choice options only if there are multiple
        * move targets to choose from. */
       if (strcmp(o->code, "d") == 0 &&
-          (*possible_moved_to_repos_relpaths == NULL || 
+          (*possible_moved_to_repos_relpaths == NULL ||
            (*possible_moved_to_repos_relpaths)->nelts <= 1))
         continue;
       if (strcmp(o->code, "w") == 0 &&
-          (*possible_moved_to_abspaths == NULL || 
+          (*possible_moved_to_abspaths == NULL ||
            (*possible_moved_to_abspaths)->nelts <= 1))
         continue;
 
@@ -1689,7 +1689,7 @@ find_conflict_option_with_repos_move_targets(
   apr_pool_t *iterpool = svn_pool_create(scratch_pool);
   int i;
   apr_array_header_t *possible_moved_to_repos_relpaths = NULL;
-  
+
   *option_with_move_targets = NULL;
 
   for (i = 0; i < options->nelts; i++)
@@ -1720,7 +1720,7 @@ find_conflict_option_with_working_copy_move_targets(
   apr_pool_t *iterpool = svn_pool_create(scratch_pool);
   int i;
   apr_array_header_t *possible_moved_to_abspaths = NULL;
-  
+
   *option_with_move_targets = NULL;
 
   for (i = 0; i < options->nelts; i++)
diff --git a/subversion/svn/info-cmd.c b/subversion/svn/info-cmd.c
index 369c4d9..44f830f 100644
--- a/subversion/svn/info-cmd.c
+++ b/subversion/svn/info-cmd.c
@@ -365,7 +365,8 @@ typedef enum
   /* Working copy information */
   info_item_wc_root,
   info_item_schedule,
-  info_item_depth
+  info_item_depth,
+  info_item_changelist
 } info_item_t;
 
 /* Mapping between option keywords and info_item_t. */
@@ -392,6 +393,7 @@ static const info_item_map_t info_item_map[] =
     { MAKE_STRING("wc-root"),             info_item_wc_root },
     { MAKE_STRING("schedule"),            info_item_schedule },
     { MAKE_STRING("depth"),               info_item_depth },
+    { MAKE_STRING("changelist"),          info_item_changelist },
   };
 #undef MAKE_STRING
 
@@ -1223,6 +1225,13 @@ print_info_item(void *baton,
                   target_path, pool));
       break;
 
+    case info_item_changelist:
+      SVN_ERR(print_info_item_string(
+                  ((info->wc_info && info->wc_info->changelist)
+                   ? info->wc_info->changelist : NULL),
+                  target_path, pool));
+      break;
+
     default:
       SVN_ERR_MALFUNCTION();
     }
diff --git a/subversion/svn/log-cmd.c b/subversion/svn/log-cmd.c
index 45e88f7..87c3728 100644
--- a/subversion/svn/log-cmd.c
+++ b/subversion/svn/log-cmd.c
@@ -733,10 +733,6 @@ svn_cl__log(apr_getopt_t *os,
                                   "XML mode"));
     }
 
-  if (opt_state->quiet && opt_state->show_diff)
-    return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
-                            _("'quiet' and 'diff' options are "
-                              "mutually exclusive"));
   if (opt_state->diff.diff_cmd && (! opt_state->show_diff))
     return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
                             _("'diff-cmd' option requires 'diff' "
diff --git a/subversion/svn/resolve-cmd.c b/subversion/svn/resolve-cmd.c
index bbf9ff5..efd176d 100644
--- a/subversion/svn/resolve-cmd.c
+++ b/subversion/svn/resolve-cmd.c
@@ -109,7 +109,7 @@ svn_cl__walk_conflicts(apr_array_header_t *targets,
       svn_client_conflict_t *conflict;
 
       svn_pool_clear(iterpool);
- 
+
       SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
 
       SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool));
diff --git a/subversion/svn/shelf-cmd.c b/subversion/svn/shelf-cmd.c
index 9066fb7..db0675b 100644
--- a/subversion/svn/shelf-cmd.c
+++ b/subversion/svn/shelf-cmd.c
@@ -34,11 +34,13 @@
 #include "svn_pools.h"
 #include "svn_utf.h"
 
+#include "shelf-cmd.h"
 #include "cl.h"
 
 #include "svn_private_config.h"
 #include "private/svn_sorts_private.h"
 #include "private/svn_client_private.h"
+#include "private/svn_client_shelf.h"
 
 
 /* Open the newest version of SHELF; error if no versions found. */
@@ -838,8 +840,13 @@ shelf_shelve(int *new_version,
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+svn_cl__shelf_shelve(apr_getopt_t *os,
+                     void *baton,
+                     apr_pool_t *pool);
+
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__shelf_save(apr_getopt_t *os,
                    void *baton,
                    apr_pool_t *pool)
@@ -852,7 +859,7 @@ svn_cl__shelf_save(apr_getopt_t *os,
 }
 
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__shelf_shelve(apr_getopt_t *os,
                      void *baton,
                      apr_pool_t *pool)
@@ -907,7 +914,7 @@ svn_cl__shelf_shelve(apr_getopt_t *os,
 }
 
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__shelf_unshelve(apr_getopt_t *os,
                        void *baton,
                        apr_pool_t *scratch_pool)
@@ -959,7 +966,7 @@ svn_cl__shelf_unshelve(apr_getopt_t *os,
 }
 
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__shelf_list(apr_getopt_t *os,
                    void *baton,
                    apr_pool_t *pool)
@@ -1083,7 +1090,7 @@ shelf_list_by_paths(apr_array_header_t *target_relpaths,
 }
 
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__shelf_list_by_paths(apr_getopt_t *os,
                             void *baton,
                             apr_pool_t *pool)
@@ -1103,7 +1110,7 @@ svn_cl__shelf_list_by_paths(apr_getopt_t *os,
 }
 
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__shelf_diff(apr_getopt_t *os,
                    void *baton,
                    apr_pool_t *pool)
@@ -1135,7 +1142,7 @@ svn_cl__shelf_diff(apr_getopt_t *os,
 }
 
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__shelf_drop(apr_getopt_t *os,
                    void *baton,
                    apr_pool_t *pool)
@@ -1173,7 +1180,7 @@ svn_cl__shelf_drop(apr_getopt_t *os,
 }
 
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__shelf_log(apr_getopt_t *os,
                   void *baton,
                   apr_pool_t *pool)
@@ -1211,7 +1218,7 @@ svn_cl__shelf_log(apr_getopt_t *os,
 /**************************************************************************/
 
 /* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
+static svn_error_t *
 svn_cl__wc_copy_mods(apr_getopt_t *os,
                      void *baton,
                      apr_pool_t *pool)
@@ -1231,3 +1238,168 @@ svn_cl__wc_copy_mods(apr_getopt_t *os,
 
   return SVN_NO_ERROR;
 }
+
+const svn_opt_subcommand_desc3_t
+svn_cl__cmd_table_shelf3[] =
+{
+  { "x-shelf-diff", svn_cl__shelf_diff, {0}, {N_(
+     "Show shelved changes as a diff.\n"
+     "usage: x-shelf-diff SHELF [VERSION]\n"
+     "\n"), N_(
+     "  Show the changes in SHELF:VERSION (default: latest) as a diff.\n"
+     "\n"), N_(
+     "  See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n"
+     "  'svn diff'.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {opt_summarize},
+  },
+
+  { "x-shelf-drop", svn_cl__shelf_drop, {0}, {N_(
+     "Delete a shelf.\n"
+     "usage: x-shelf-drop SHELF [PATH ...]\n"
+     "\n"), N_(
+     "  Delete the shelves named SHELF from the working copies containing PATH\n"
+     "  (default PATH is '.')\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+  },
+
+  { "x-shelf-list", svn_cl__shelf_list, {"x-shelves"}, {N_(
+     "List shelves.\n"
+     "usage: x-shelf-list [PATH ...]\n"
+     "\n"), N_(
+     "  List shelves for each working copy containing PATH (default is '.')\n"
+     "  Include the first line of any log message and some details about the\n"
+     "  contents of the shelf, unless '-q' is given.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {'q', 'v'}
+  },
+
+  { "x-shelf-list-by-paths", svn_cl__shelf_list_by_paths, {0}, {N_(
+     "List which shelf affects each path.\n"
+     "usage: x-shelf-list-by-paths [PATH...]\n"
+     "\n"), N_(
+     "  List which shelf most recently affects each path below the given PATHs.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+  },
+
+  { "x-shelf-log", svn_cl__shelf_log, {0}, {N_(
+     "Show the versions of a shelf.\n"
+     "usage: x-shelf-log SHELF [PATH...]\n"
+     "\n"), N_(
+     "  Show all versions of SHELF for each working copy containing PATH (the\n"
+     "  default PATH is '.').\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {'q', 'v'}
+  },
+
+  { "x-shelf-save", svn_cl__shelf_save, {0}, {N_(
+     "Copy local changes onto a new version of a shelf.\n"
+     "usage: x-shelf-save SHELF [PATH...]\n"
+     "\n"), N_(
+     "  Save local changes in the given PATHs as a new version of SHELF.\n"
+     "  The shelf's log message can be set with -m, -F, etc.\n"
+     "\n"), N_(
+     "  The same as 'svn shelve --keep-local'.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {'q', opt_dry_run,
+     opt_depth, opt_targets, opt_changelist,
+     SVN_CL__LOG_MSG_OPTIONS,
+    }
+  },
+
+  { "x-shelve", svn_cl__shelf_shelve, {0}, {N_(
+     "Move local changes onto a shelf.\n"
+     "usage: x-shelve [--keep-local] SHELF [PATH...]\n"
+     "\n"), N_(
+     "  Save the local changes in the given PATHs to a new or existing SHELF.\n"
+     "  Revert those changes from the WC unless '--keep-local' is given.\n"
+     "  The shelf's log message can be set with -m, -F, etc.\n"
+     "\n"), N_(
+     "  'svn shelve --keep-local' is the same as 'svn shelf-save'.\n"
+     "\n"), N_(
+     "  The kinds of change you can shelve are committable changes to files and\n"
+     "  properties, except the following kinds which are not yet supported:\n"
+     "     * copies and moves\n"
+     "     * mkdir and rmdir\n"
+     "  Uncommittable states such as conflicts, unversioned and missing cannot\n"
+     "  be shelved.\n"
+     "\n"), N_(
+     "  To bring back shelved changes, use 'svn unshelve SHELF'.\n"
+     "\n"), N_(
+     "  Shelves are currently stored under <WC>/.svn/experimental/shelves/ .\n"
+     "  (In Subversion 1.10, shelves were stored under <WC>/.svn/shelves/ as\n"
+     "  patch files. To recover a shelf created by 1.10, either use a 1.10\n"
+     "  client to find and unshelve it, or find the patch file and use any\n"
+     "  1.10 or later 'svn patch' to apply it.)\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {'q', opt_dry_run, opt_keep_local,
+     opt_depth, opt_targets, opt_changelist,
+     SVN_CL__LOG_MSG_OPTIONS,
+    } },
+
+  { "x-unshelve", svn_cl__shelf_unshelve, {0}, {N_(
+     "Copy shelved changes back into the WC.\n"
+     "usage: x-unshelve [--drop] [SHELF [VERSION]]\n"
+     "\n"), N_(
+     "  Apply the changes stored in SHELF to the working copy.\n"
+     "  SHELF defaults to the newest shelf.\n"
+     "\n"), N_(
+     "  Apply the newest version of the shelf, by default. If VERSION is\n"
+     "  specified, apply that version and discard all versions newer than that.\n"
+     "  In any case, retain the unshelved version and versions older than that\n"
+     "  (unless --drop is specified).\n"
+     "\n"), N_(
+     "  With --drop, delete the entire shelf (like 'svn shelf-drop') after\n"
+     "  successfully unshelving with no conflicts.\n"
+     "\n"), N_(
+     "  The working files involved should be in a clean, unmodified state\n"
+     "  before using this command. To roll back to an older version of the\n"
+     "  shelf, first ensure any current working changes are removed, such as\n"
+     "  by shelving or reverting them, and then unshelve the desired version.\n"
+     "\n"), N_(
+     "  Unshelve normally refuses to apply any changes if any path involved is\n"
+     "  already modified (or has any other abnormal status) in the WC. With\n"
+     "  --force, it does not check and may error out and/or produce partial or\n"
+     "  unexpected results.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {opt_drop, 'q', opt_dry_run, opt_force} },
+
+  { "x-wc-copy-mods", svn_cl__wc_copy_mods, {0}, {N_(
+     "Copy local modifications from one WC to another.\n"
+     "usage: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n"
+     "\n"), N_(
+     "  The source and destination WC paths may be in the same WC or in different"
+     "  WCs.\n"
+     "\n"), N_(
+     "  This feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+  },
+
+  { NULL, NULL, {0}, {NULL}, {0} }
+};
+
diff --git a/subversion/svn/shelf-cmd.h b/subversion/svn/shelf-cmd.h
new file mode 100644
index 0000000..c5f3cab
--- /dev/null
+++ b/subversion/svn/shelf-cmd.h
@@ -0,0 +1,49 @@
+/*
+ * shelf-cmd.h:  experimental shelving v3
+ *
+ * ====================================================================
+ *    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_SHELF_CMD_H
+#define SVN_SHELF_CMD_H
+
+/*** Includes. ***/
+#include <apr_getopt.h>
+
+#include "svn_opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+extern const svn_opt_subcommand_desc3_t svn_cl__cmd_table_shelf3[];
+/*extern const apr_getopt_option_t svn_cl__options_shelving3[];*/
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_SHELF_CMD_H */
diff --git a/subversion/svn/shelf2-cmd.c b/subversion/svn/shelf2-cmd.c
new file mode 100644
index 0000000..8305ce3
--- /dev/null
+++ b/subversion/svn/shelf2-cmd.c
@@ -0,0 +1,1369 @@
+/*
+ * shelf2-cmd.c -- Shelving commands.
+ *
+ * ====================================================================
+ *    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.
+ * ====================================================================
+ */
+
+/* We define this here to remove any further warnings about the usage of
+   experimental functions in this file. */
+#define SVN_EXPERIMENTAL
+
+#include "svn_client.h"
+#include "svn_error_codes.h"
+#include "svn_error.h"
+#include "svn_hash.h"
+#include "svn_path.h"
+#include "svn_props.h"
+#include "svn_pools.h"
+#include "svn_utf.h"
+
+#include "shelf2-cmd.h"
+#include "cl.h"
+
+#include "svn_private_config.h"
+#include "private/svn_sorts_private.h"
+#include "private/svn_client_private.h"
+#include "private/svn_client_shelf2.h"
+
+
+/* Open the newest version of SHELF; error if no versions found. */
+static svn_error_t *
+get_newest_version_existing(svn_client__shelf2_version_t **shelf_version_p,
+                            svn_client__shelf2_t *shelf,
+                            apr_pool_t *result_pool,
+                            apr_pool_t *scratch_pool)
+{
+  SVN_ERR(svn_client__shelf2_get_newest_version(shelf_version_p, shelf,
+                                              result_pool, scratch_pool));
+  if (!*shelf_version_p)
+    {
+      return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                               _("Shelf '%s': no versions found"),
+                               shelf->name);
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Fetch the next argument. */
+static svn_error_t *
+get_next_argument(const char **arg,
+                  apr_getopt_t *os,
+                  apr_pool_t *result_pool,
+                  apr_pool_t *scratch_pool)
+{
+  apr_array_header_t *args;
+
+  SVN_ERR(svn_opt_parse_num_args(&args, os, 1, scratch_pool));
+  SVN_ERR(svn_utf_cstring_to_utf8(arg,
+                                  APR_ARRAY_IDX(args, 0, const char *),
+                                  result_pool));
+  return SVN_NO_ERROR;
+}
+
+/* Parse the remaining arguments as paths relative to a WC.
+ *
+ * TARGETS are relative to current working directory.
+ *
+ * Set *targets_by_wcroot to a hash mapping (char *)wcroot_abspath to
+ * (apr_array_header_t *)array of relpaths relative to that WC root.
+ */
+static svn_error_t *
+targets_relative_to_wcs(apr_hash_t **targets_by_wcroot_p,
+                        apr_array_header_t *targets,
+                        svn_client_ctx_t *ctx,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool)
+{
+  apr_hash_t *targets_by_wcroot = apr_hash_make(result_pool);
+  int i;
+
+  /* Make each target relative to the WC root. */
+  for (i = 0; i < targets->nelts; i++)
+    {
+      const char *target = APR_ARRAY_IDX(targets, i, const char *);
+      const char *wcroot_abspath;
+      apr_array_header_t *paths;
+
+      SVN_ERR(svn_dirent_get_absolute(&target, target, result_pool));
+      SVN_ERR(svn_client_get_wc_root(&wcroot_abspath, target,
+                                     ctx, result_pool, scratch_pool));
+      paths = svn_hash_gets(targets_by_wcroot, wcroot_abspath);
+      if (! paths)
+        {
+          paths = apr_array_make(result_pool, 0, sizeof(char *));
+          svn_hash_sets(targets_by_wcroot, wcroot_abspath, paths);
+        }
+      target = svn_dirent_skip_ancestor(wcroot_abspath, target);
+
+      if (target)
+        APR_ARRAY_PUSH(paths, const char *) = target;
+    }
+  *targets_by_wcroot_p = targets_by_wcroot;
+  return SVN_NO_ERROR;
+}
+
+/* Return targets relative to a WC. Error if they refer to more than one WC. */
+static svn_error_t *
+targets_relative_to_a_wc(const char **wc_root_abspath_p,
+                         apr_array_header_t **paths_p,
+                         apr_getopt_t *os,
+                         const apr_array_header_t *known_targets,
+                         svn_client_ctx_t *ctx,
+                         apr_pool_t *result_pool,
+                         apr_pool_t *scratch_pool)
+{
+  apr_array_header_t *targets;
+  apr_hash_t *targets_by_wcroot;
+  apr_hash_index_t *hi;
+
+  SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
+                                                      known_targets,
+                                                      ctx, FALSE, result_pool));
+  svn_opt_push_implicit_dot_target(targets, result_pool);
+
+  SVN_ERR(targets_relative_to_wcs(&targets_by_wcroot, targets,
+                                  ctx, result_pool, scratch_pool));
+  if (apr_hash_count(targets_by_wcroot) != 1)
+    return svn_error_create(SVN_ERR_ILLEGAL_TARGET, NULL,
+                            _("All targets must be in the same WC"));
+
+  hi = apr_hash_first(scratch_pool, targets_by_wcroot);
+  *wc_root_abspath_p = apr_hash_this_key(hi);
+  *paths_p = apr_hash_this_val(hi);
+  return SVN_NO_ERROR;
+}
+
+/* Return a human-friendly description of DURATION.
+ */
+static char *
+friendly_age_str(apr_time_t mtime,
+                 apr_time_t time_now,
+                 apr_pool_t *result_pool)
+{
+  int minutes = (int)((time_now - mtime) / 1000000 / 60);
+  char *s;
+
+  if (minutes >= 60 * 24)
+    s = apr_psprintf(result_pool,
+                     Q_("%d day ago", "%d days ago",
+                        minutes / 60 / 24),
+                     minutes / 60 / 24);
+  else if (minutes >= 60)
+    s = apr_psprintf(result_pool,
+                     Q_("%d hour ago", "%d hours ago",
+                        minutes / 60),
+                     minutes / 60);
+  else
+    s = apr_psprintf(result_pool,
+                     Q_("%d minute ago", "%d minutes ago",
+                        minutes),
+                     minutes);
+  return s;
+}
+
+/* A comparison function for svn_sort__hash(), comparing the mtime of two
+   svn_client_shelf_info_t's. */
+static int
+compare_shelf_infos_by_mtime(const svn_sort__item_t *a,
+                             const svn_sort__item_t *b)
+{
+  svn_client__shelf2_info_t *a_val = a->value;
+  svn_client__shelf2_info_t *b_val = b->value;
+
+  return (a_val->mtime < b_val->mtime)
+    ? -1 : (a_val->mtime > b_val->mtime) ? 1 : 0;
+}
+
+/* Return a list of shelves sorted by their mtime, oldest first.
+ */
+static svn_error_t *
+list_sorted_by_date(apr_array_header_t **list,
+                    const char *local_abspath,
+                    svn_client_ctx_t *ctx,
+                    apr_pool_t *scratch_pool)
+{
+  apr_hash_t *shelf_infos;
+
+  SVN_ERR(svn_client__shelf2_list(&shelf_infos, local_abspath,
+                                ctx, scratch_pool, scratch_pool));
+  *list = svn_sort__hash(shelf_infos,
+                         compare_shelf_infos_by_mtime,
+                         scratch_pool);
+  return SVN_NO_ERROR;
+}
+
+/*  */
+static svn_error_t *
+stats(svn_client__shelf2_t *shelf,
+      int version,
+      svn_client__shelf2_version_t *shelf_version,
+      apr_time_t time_now,
+      svn_boolean_t with_logmsg,
+      apr_pool_t *scratch_pool)
+{
+  char *age_str;
+  char *version_str;
+  apr_hash_t *paths;
+  const char *paths_str = "";
+
+  if (! shelf_version)
+    {
+      return SVN_NO_ERROR;
+    }
+
+  age_str = friendly_age_str(shelf_version->mtime, time_now, scratch_pool);
+  if (version == shelf->max_version)
+    version_str = apr_psprintf(scratch_pool,
+                               _("version %d"), version);
+  else
+    version_str = apr_psprintf(scratch_pool,
+                               Q_("version %d of %d", "version %d of %d",
+                                  shelf->max_version),
+                               version, shelf->max_version);
+  SVN_ERR(svn_client__shelf2_paths_changed(&paths, shelf_version,
+                                         scratch_pool, scratch_pool));
+  paths_str = apr_psprintf(scratch_pool,
+                           Q_("%d path changed", "%d paths changed",
+                              apr_hash_count(paths)),
+                           apr_hash_count(paths));
+  SVN_ERR(svn_cmdline_printf(scratch_pool,
+                             "%-30s %s, %s, %s\n",
+                             shelf->name, version_str, age_str, paths_str));
+
+  if (with_logmsg)
+    {
+      char *log_message;
+
+      SVN_ERR(svn_client__shelf2_get_log_message(&log_message, shelf,
+                                               scratch_pool));
+      if (log_message)
+        {
+          SVN_ERR(svn_cmdline_printf(scratch_pool,
+                                     _(" %.50s\n"),
+                                     log_message));
+        }
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Display a list of shelves */
+static svn_error_t *
+shelves_list(const char *local_abspath,
+             svn_boolean_t quiet,
+             svn_client_ctx_t *ctx,
+             apr_pool_t *scratch_pool)
+{
+  apr_time_t time_now = apr_time_now();
+  apr_array_header_t *list;
+  int i;
+
+  SVN_ERR(list_sorted_by_date(&list,
+                              local_abspath, ctx, scratch_pool));
+
+  for (i = 0; i < list->nelts; i++)
+    {
+      const svn_sort__item_t *item = &APR_ARRAY_IDX(list, i, svn_sort__item_t);
+      const char *name = item->key;
+      svn_client__shelf2_t *shelf;
+      svn_client__shelf2_version_t *shelf_version;
+
+      SVN_ERR(svn_client__shelf2_open_existing(&shelf, name, local_abspath,
+                                             ctx, scratch_pool));
+      SVN_ERR(svn_client__shelf2_get_newest_version(&shelf_version, shelf,
+                                                  scratch_pool, scratch_pool));
+      if (quiet)
+        SVN_ERR(svn_cmdline_printf(scratch_pool, "%s\n", shelf->name));
+      else if (!shelf_version)
+        SVN_ERR(svn_cmdline_printf(scratch_pool, "%-30s no versions\n",
+                                   shelf->name));
+      else
+        SVN_ERR(stats(shelf, shelf->max_version, shelf_version, time_now,
+                      TRUE /*with_logmsg*/, scratch_pool));
+      SVN_ERR(svn_client__shelf2_close(shelf, scratch_pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Print info about each checkpoint of the shelf named NAME.
+ */
+static svn_error_t *
+shelf_log(const char *name,
+          const char *local_abspath,
+          svn_client_ctx_t *ctx,
+          apr_pool_t *scratch_pool)
+{
+  apr_time_t time_now = apr_time_now();
+  svn_client__shelf2_t *shelf;
+  apr_array_header_t *versions;
+  int i;
+
+  SVN_ERR(svn_client__shelf2_open_existing(&shelf, name, local_abspath,
+                                         ctx, scratch_pool));
+  SVN_ERR(svn_client__shelf2_get_all_versions(&versions, shelf,
+                                            scratch_pool, scratch_pool));
+  for (i = 0; i < versions->nelts; i++)
+    {
+      svn_client__shelf2_version_t *shelf_version
+        = APR_ARRAY_IDX(versions, i, void *);
+
+      SVN_ERR(stats(shelf, i + 1, shelf_version, time_now,
+                    FALSE /*with_logmsg*/, scratch_pool));
+    }
+
+  SVN_ERR(svn_client__shelf2_close(shelf, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* Find the name of the youngest shelf.
+ */
+static svn_error_t *
+name_of_youngest(const char **name_p,
+                 const char *local_abspath,
+                 svn_client_ctx_t *ctx,
+                 apr_pool_t *result_pool,
+                 apr_pool_t *scratch_pool)
+{
+  apr_array_header_t *list;
+  const svn_sort__item_t *youngest_item;
+
+  SVN_ERR(list_sorted_by_date(&list,
+                              local_abspath, ctx, scratch_pool));
+  if (list->nelts == 0)
+    return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
+                            _("No shelves found"));
+
+  youngest_item = &APR_ARRAY_IDX(list, list->nelts - 1, svn_sort__item_t);
+  *name_p = apr_pstrdup(result_pool, youngest_item->key);
+  return SVN_NO_ERROR;
+}
+
+struct status_baton
+{
+  /* These fields correspond to the ones in the
+     svn_cl__print_status() interface. */
+  const char *target_abspath;
+  const char *target_path;
+
+  svn_boolean_t quiet;  /* don't display statuses while shelving them */
+  int num_paths_shelved;
+  int num_paths_not_shelved;
+  svn_client_ctx_t *ctx;
+};
+
+/* A status callback function for printing STATUS for PATH. */
+static svn_error_t *
+print_status(void *baton,
+             const char *path,
+             const svn_client_status_t *status,
+             apr_pool_t *scratch_pool)
+{
+  struct status_baton *sb = baton;
+  unsigned int conflicts;
+
+  return svn_cl__print_status(sb->target_abspath, sb->target_path,
+                              path, status,
+                              TRUE /*suppress_externals_placeholders*/,
+                              FALSE /*detailed*/,
+                              FALSE /*show_last_committed*/,
+                              TRUE /*skip_unrecognized*/,
+                              FALSE /*repos_locks*/,
+                              &conflicts, &conflicts, &conflicts,
+                              sb->ctx,
+                              scratch_pool);
+}
+
+/* A callback function for shelved paths. */
+static svn_error_t *
+was_shelved(void *baton,
+            const char *path,
+            const svn_client_status_t *status,
+            apr_pool_t *scratch_pool)
+{
+  struct status_baton *sb = baton;
+
+  if (!sb->quiet)
+    {
+      SVN_ERR(print_status(baton, path, status, scratch_pool));
+    }
+
+  ++sb->num_paths_shelved;
+  return SVN_NO_ERROR;
+}
+
+/* A callback function for not-shelved paths. */
+static svn_error_t *
+was_not_shelved(void *baton,
+                const char *path,
+                const svn_client_status_t *status,
+                apr_pool_t *scratch_pool)
+{
+  struct status_baton *sb = baton;
+
+  SVN_ERR(print_status(baton, path, status, scratch_pool));
+  SVN_ERR(svn_cmdline_printf(scratch_pool, "      >   not shelved\n"));
+  ++sb->num_paths_not_shelved;
+  return SVN_NO_ERROR;
+}
+
+/** Shelve/save a new version of changes.
+ *
+ * Shelve in shelf @a name the local modifications found by @a paths,
+ * @a depth, @a changelists. Revert the shelved changes from the WC
+ * unless @a keep_local is true.
+ *
+ * If no local modifications are found, throw an error.
+ *
+ * If @a dry_run is true, don't actually do it.
+ *
+ * Report in @a *new_version_p the new version number (or, with dry run,
+ * what it would be).
+ */
+static svn_error_t *
+shelve(int *new_version_p,
+       const char *name,
+       const apr_array_header_t *paths,
+       svn_depth_t depth,
+       const apr_array_header_t *changelists,
+       apr_hash_t *revprop_table,
+       svn_boolean_t keep_local,
+       svn_boolean_t dry_run,
+       svn_boolean_t quiet,
+       const char *local_abspath,
+       svn_client_ctx_t *ctx,
+       apr_pool_t *scratch_pool)
+{
+  svn_client__shelf2_t *shelf;
+  svn_client__shelf2_version_t *previous_version;
+  svn_client__shelf2_version_t *new_version;
+  struct status_baton sb;
+
+  SVN_ERR(svn_client__shelf2_open_or_create(&shelf,
+                                          name, local_abspath,
+                                          ctx, scratch_pool));
+  SVN_ERR(svn_client__shelf2_get_newest_version(&previous_version, shelf,
+                                              scratch_pool, scratch_pool));
+
+  if (! quiet)
+    {
+      SVN_ERR(svn_cmdline_printf(scratch_pool, keep_local
+                                 ? _("--- Save a new version of '%s' in WC root '%s'\n")
+                                 : _("--- Shelve '%s' in WC root '%s'\n"),
+                                 shelf->name, shelf->wc_root_abspath));
+      SVN_ERR(stats(shelf, shelf->max_version, previous_version, apr_time_now(),
+                    TRUE /*with_logmsg*/, scratch_pool));
+    }
+
+  sb.target_abspath = shelf->wc_root_abspath;
+  sb.target_path = "";
+  sb.quiet = quiet;
+  sb.num_paths_shelved = 0;
+  sb.num_paths_not_shelved = 0;
+  sb.ctx = ctx;
+
+  if (! quiet)
+    SVN_ERR(svn_cmdline_printf(scratch_pool,
+                               keep_local ? _("--- Saving...\n")
+                               : _("--- Shelving...\n")));
+  SVN_ERR(svn_client__shelf2_save_new_version3(&new_version, shelf,
+                                             paths, depth, changelists,
+                                             was_shelved, &sb,
+                                             was_not_shelved, &sb,
+                                             scratch_pool));
+  if (sb.num_paths_not_shelved > 0)
+    {
+      SVN_ERR(svn_client__shelf2_delete_newer_versions(shelf, previous_version,
+                                                     scratch_pool));
+      SVN_ERR(svn_client__shelf2_close(shelf, scratch_pool));
+      return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                               Q_("%d path could not be shelved",
+                                  "%d paths could not be shelved",
+                                  sb.num_paths_not_shelved),
+                               sb.num_paths_not_shelved);
+    }
+  if (sb.num_paths_shelved == 0
+      || ! new_version)
+    {
+      SVN_ERR(svn_client__shelf2_close(shelf, scratch_pool));
+      return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                               keep_local ? _("No local modifications could be saved")
+                               : _("No local modifications could be shelved"));
+    }
+
+  /* Un-apply the changes, if required. */
+  if (!keep_local)
+    {
+      SVN_ERR(svn_client__shelf2_unapply(new_version,
+                                       dry_run, scratch_pool));
+    }
+
+  /* Fetch the log message and any other revprops */
+  if (ctx->log_msg_func3)
+    {
+      const char *tmp_file;
+      apr_array_header_t *commit_items
+        = apr_array_make(scratch_pool, 1, sizeof(void *));
+      const char *message = "";
+
+      SVN_ERR(ctx->log_msg_func3(&message, &tmp_file, commit_items,
+                                 ctx->log_msg_baton3, scratch_pool));
+      /* Abort the shelving if the log message callback requested so. */
+      if (! message)
+        return SVN_NO_ERROR;
+
+      if (message && !dry_run)
+        {
+          svn_string_t *propval = svn_string_create(message, scratch_pool);
+
+          if (! revprop_table)
+            revprop_table = apr_hash_make(scratch_pool);
+          svn_hash_sets(revprop_table, SVN_PROP_REVISION_LOG, propval);
+        }
+    }
+
+  SVN_ERR(svn_client__shelf2_revprop_set_all(shelf, revprop_table, scratch_pool));
+
+  if (new_version_p)
+    *new_version_p = shelf->max_version;
+
+  if (dry_run)
+    {
+      SVN_ERR(svn_client__shelf2_delete_newer_versions(shelf, previous_version,
+                                                     scratch_pool));
+    }
+
+  SVN_ERR(svn_client__shelf2_close(shelf, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* Return the single character representation of STATUS.
+ * (Similar to subversion/svn/status.c:generate_status_code()
+ * and subversion/tests/libsvn_client/client-test.c:status_to_char().) */
+static char
+status_to_char(enum svn_wc_status_kind status)
+{
+  switch (status)
+    {
+    case svn_wc_status_none:        return '.';
+    case svn_wc_status_unversioned: return '?';
+    case svn_wc_status_normal:      return ' ';
+    case svn_wc_status_added:       return 'A';
+    case svn_wc_status_missing:     return '!';
+    case svn_wc_status_deleted:     return 'D';
+    case svn_wc_status_replaced:    return 'R';
+    case svn_wc_status_modified:    return 'M';
+    case svn_wc_status_merged:      return 'G';
+    case svn_wc_status_conflicted:  return 'C';
+    case svn_wc_status_ignored:     return 'I';
+    case svn_wc_status_obstructed:  return '~';
+    case svn_wc_status_external:    return 'X';
+    case svn_wc_status_incomplete:  return ':';
+    default:                        return '*';
+    }
+}
+
+/* Throw an error if any path affected by SHELF_VERSION gives a conflict
+ * when applied (as a dry-run) to the WC. */
+static svn_error_t *
+test_apply(svn_client__shelf2_version_t *shelf_version,
+           svn_client_ctx_t *ctx,
+           apr_pool_t *scratch_pool)
+{
+  apr_hash_t *paths;
+  apr_hash_index_t *hi;
+
+  SVN_ERR(svn_client__shelf2_paths_changed(&paths, shelf_version,
+                                         scratch_pool, scratch_pool));
+  for (hi = apr_hash_first(scratch_pool, paths); hi; hi = apr_hash_next(hi))
+    {
+      const char *path = apr_hash_this_key(hi);
+      svn_boolean_t conflict;
+
+      SVN_ERR(svn_client__shelf2_test_apply_file(&conflict, shelf_version, path,
+                                               scratch_pool));
+      if (conflict)
+        {
+          char *to_wc_abspath
+            = svn_dirent_join(shelf_version->shelf->wc_root_abspath, path,
+                              scratch_pool);
+          svn_wc_status3_t *status;
+
+          SVN_ERR(svn_wc_status3(&status, ctx->wc_ctx, to_wc_abspath,
+                                 scratch_pool, scratch_pool));
+          return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                                   _("Shelved path '%s' already has "
+                                     "status '%c' in the working copy"),
+                                   path, status_to_char(status->node_status));
+        }
+    }
+  return SVN_NO_ERROR;
+}
+
+/** Restore/unshelve a given or newest version of changes.
+ *
+ * Restore local modifications from shelf @a name version @a arg,
+ * or the newest version is @a arg is null.
+ *
+ * If @a dry_run is true, don't actually do it.
+ *
+ * Error if any path would have a conflict, unless @a force_if_conflict.
+ */
+static svn_error_t *
+shelf_restore(const char *name,
+              const char *arg,
+              svn_boolean_t dry_run,
+              svn_boolean_t quiet,
+              svn_boolean_t force_if_conflict,
+              const char *local_abspath,
+              svn_client_ctx_t *ctx,
+              apr_pool_t *scratch_pool)
+{
+  int version, old_version;
+  apr_time_t time_now = apr_time_now();
+  svn_client__shelf2_t *shelf;
+  svn_client__shelf2_version_t *shelf_version;
+
+  SVN_ERR(svn_client__shelf2_open_existing(&shelf, name, local_abspath,
+                                         ctx, scratch_pool));
+
+  old_version = shelf->max_version;
+  if (arg)
+    {
+      SVN_ERR(svn_cstring_atoi(&version, arg));
+      SVN_ERR(svn_client__shelf2_version_open(&shelf_version,
+                                            shelf, version,
+                                            scratch_pool, scratch_pool));
+    }
+  else
+    {
+      version = shelf->max_version;
+      SVN_ERR(get_newest_version_existing(&shelf_version, shelf,
+                                          scratch_pool, scratch_pool));
+    }
+
+  if (! quiet)
+    {
+      SVN_ERR(svn_cmdline_printf(scratch_pool,
+                                 _("--- Unshelve '%s' in WC root '%s'\n"),
+                                 shelf->name, shelf->wc_root_abspath));
+      SVN_ERR(stats(shelf, version, shelf_version, time_now,
+                    TRUE /*with_logmsg*/, scratch_pool));
+    }
+  if (! force_if_conflict)
+    {
+      SVN_ERR_W(test_apply(shelf_version, ctx, scratch_pool),
+                _("Cannot unshelve/restore, as at least one shelved "
+                  "path would conflict with a local modification "
+                  "or other status in the working copy"));
+    }
+
+  SVN_ERR(svn_client__shelf2_apply(shelf_version,
+                                 dry_run, scratch_pool));
+
+  if (! dry_run)
+    {
+      SVN_ERR(svn_client__shelf2_delete_newer_versions(shelf, shelf_version,
+                                                     scratch_pool));
+    }
+
+  if (!quiet)
+    {
+      if (version < old_version)
+        SVN_ERR(svn_cmdline_printf(scratch_pool,
+                                   Q_("restored '%s' version %d and deleted %d newer version\n",
+                                      "restored '%s' version %d and deleted %d newer versions\n",
+                                      old_version - version),
+                                   name, version, old_version - version));
+      else
+        SVN_ERR(svn_cmdline_printf(scratch_pool,
+                                   _("restored '%s' version %d (the newest version)\n"),
+                                   name, version));
+    }
+
+  SVN_ERR(svn_client__shelf2_close(shelf, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+shelf_diff(const char *name,
+           const char *arg,
+           const char *local_abspath,
+           svn_boolean_t summarize,
+           svn_depth_t depth,
+           svn_boolean_t ignore_ancestry,
+           svn_client_ctx_t *ctx,
+           apr_pool_t *scratch_pool)
+{
+  svn_client__shelf2_t *shelf;
+  svn_client__shelf2_version_t *shelf_version;
+  svn_stream_t *stream, *errstream;
+  svn_diff_tree_processor_t *diff_processor;
+
+  SVN_ERR(svn_client__shelf2_open_existing(&shelf, name, local_abspath,
+                                         ctx, scratch_pool));
+
+  if (arg)
+    {
+      int version;
+
+      SVN_ERR(svn_cstring_atoi(&version, arg));
+      SVN_ERR(svn_client__shelf2_version_open(&shelf_version,
+                                            shelf, version,
+                                            scratch_pool, scratch_pool));
+    }
+  else
+    {
+      SVN_ERR(get_newest_version_existing(&shelf_version, shelf,
+                                          scratch_pool, scratch_pool));
+    }
+
+  SVN_ERR(svn_stream_for_stdout(&stream, scratch_pool));
+  errstream = svn_stream_empty(scratch_pool);
+
+  if (summarize)
+    {
+      svn_client_diff_summarize_func_t func;
+      void *baton;
+
+      SVN_ERR(svn_cl__get_diff_summary_writer(&func, &baton,
+                                              FALSE /*xml*/,
+                                              FALSE /*ignore_properties*/,
+                                              "" /*anchor/prefix*/,
+                                              scratch_pool, scratch_pool));
+      SVN_ERR(svn_client__get_diff_summarize_callbacks(&diff_processor,
+                                                       func, baton,
+                                                       scratch_pool,
+                                                       scratch_pool));
+    }
+  else
+    {
+      SVN_ERR(svn_client__get_diff_writer_svn(
+                &diff_processor,
+                NULL /*anchor*/,
+                "", "", /*orig_path_1, orig_path_2,*/
+                NULL /*options*/,
+                "" /*relative_to_dir*/,
+                FALSE /*no_diff_added*/,
+                FALSE /*no_diff_deleted*/,
+                FALSE /*show_copies_as_adds*/,
+                FALSE /*ignore_content_type*/,
+                FALSE /*ignore_properties*/,
+                FALSE /*properties_only*/,
+                TRUE /*pretty_print_mergeinfo*/,
+                svn_cmdline_output_encoding(scratch_pool),
+                stream, errstream,
+                ctx, scratch_pool));
+    }
+
+  SVN_ERR(svn_client__shelf2_diff(shelf_version, "",
+                                 depth, ignore_ancestry,
+                                 diff_processor, scratch_pool));
+  SVN_ERR(svn_stream_close(stream));
+
+  SVN_ERR(svn_client__shelf2_close(shelf, scratch_pool));
+  return SVN_NO_ERROR;
+}
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+shelf_drop(const char *name,
+           const char *local_abspath,
+           svn_boolean_t dry_run,
+           svn_boolean_t quiet,
+           svn_client_ctx_t *ctx,
+           apr_pool_t *scratch_pool)
+{
+  SVN_ERR(svn_client__shelf2_delete(name, local_abspath, dry_run,
+                                  ctx, scratch_pool));
+  if (! quiet)
+    SVN_ERR(svn_cmdline_printf(scratch_pool,
+                               _("deleted '%s'\n"),
+                               name));
+  return SVN_NO_ERROR;
+}
+
+/*  */
+static svn_error_t *
+shelf_shelve(int *new_version,
+             const char *name,
+             apr_array_header_t *targets,
+             svn_depth_t depth,
+             apr_array_header_t *changelists,
+             apr_hash_t *revprop_table,
+             svn_boolean_t keep_local,
+             svn_boolean_t dry_run,
+             svn_boolean_t quiet,
+             svn_client_ctx_t *ctx,
+             apr_pool_t *scratch_pool)
+{
+  const char *local_abspath;
+
+  if (depth == svn_depth_unknown)
+    depth = svn_depth_infinity;
+
+  SVN_ERR(svn_cl__check_targets_are_local_paths(targets));
+
+  SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));
+
+  svn_opt_push_implicit_dot_target(targets, scratch_pool);
+
+  /* ### TODO: check all paths are in same WC; for now use first path */
+  SVN_ERR(svn_dirent_get_absolute(&local_abspath,
+                                  APR_ARRAY_IDX(targets, 0, char *),
+                                  scratch_pool));
+
+  SVN_ERR(shelve(new_version, name,
+                 targets, depth, changelists,
+                 revprop_table,
+                 keep_local, dry_run, quiet,
+                 local_abspath, ctx, scratch_pool));
+
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+svn_cl__shelf_shelve(apr_getopt_t *os,
+                     void *baton,
+                     apr_pool_t *pool);
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+svn_cl__shelf_save(apr_getopt_t *os,
+                   void *baton,
+                   apr_pool_t *pool)
+{
+  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
+
+  opt_state->keep_local = TRUE;
+  SVN_ERR(svn_cl__shelf_shelve(os, baton, pool));
+  return SVN_NO_ERROR;
+}
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+svn_cl__shelf_shelve(apr_getopt_t *os,
+                     void *baton,
+                     apr_pool_t *pool)
+{
+  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
+  svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
+  const char *name;
+  apr_array_header_t *targets;
+
+  if (opt_state->quiet)
+    ctx->notify_func2 = NULL; /* Easy out: avoid unneeded work */
+
+  SVN_ERR(get_next_argument(&name, os, pool, pool));
+
+  /* Parse the remaining arguments as paths. */
+  SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
+                                                      opt_state->targets,
+                                                      ctx, FALSE, pool));
+  {
+    int new_version;
+    svn_error_t *err;
+
+    if (ctx->log_msg_func3)
+      SVN_ERR(svn_cl__make_log_msg_baton(&ctx->log_msg_baton3,
+                                         opt_state, NULL, ctx->config,
+                                         pool));
+    err = shelf_shelve(&new_version, name,
+                       targets, opt_state->depth, opt_state->changelists,
+                       opt_state->revprop_table,
+                       opt_state->keep_local, opt_state->dry_run,
+                       opt_state->quiet, ctx, pool);
+    if (ctx->log_msg_func3)
+      SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3,
+                                      err, pool));
+    else
+      SVN_ERR(err);
+
+      if (! opt_state->quiet)
+      {
+        if (opt_state->keep_local)
+          SVN_ERR(svn_cmdline_printf(pool,
+                                     _("saved '%s' version %d\n"),
+                                     name, new_version));
+        else
+          SVN_ERR(svn_cmdline_printf(pool,
+                                     _("shelved '%s' version %d\n"),
+                                     name, new_version));
+      }
+  }
+
+  return SVN_NO_ERROR;
+}
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+svn_cl__shelf_unshelve(apr_getopt_t *os,
+                       void *baton,
+                       apr_pool_t *scratch_pool)
+{
+  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
+  svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
+  const char *local_abspath;
+  const char *name;
+  const char *arg = NULL;
+
+  SVN_ERR(svn_dirent_get_absolute(&local_abspath, "", scratch_pool));
+
+  if (os->ind < os->argc)
+    {
+      SVN_ERR(get_next_argument(&name, os, scratch_pool, scratch_pool));
+    }
+  else
+    {
+      SVN_ERR(name_of_youngest(&name,
+                               local_abspath, ctx, scratch_pool, scratch_pool));
+      SVN_ERR(svn_cmdline_printf(scratch_pool,
+                                 _("unshelving the youngest shelf, '%s'\n"),
+                                 name));
+    }
+
+  /* Which checkpoint number? */
+  if (os->ind < os->argc)
+    SVN_ERR(get_next_argument(&arg, os, scratch_pool, scratch_pool));
+
+  if (os->ind < os->argc)
+    return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                            _("Too many arguments"));
+
+  if (opt_state->quiet)
+    ctx->notify_func2 = NULL; /* Easy out: avoid unneeded work */
+
+  SVN_ERR(shelf_restore(name, arg,
+                        opt_state->dry_run, opt_state->quiet,
+                        opt_state->force /*force_already_modified*/,
+                        local_abspath, ctx, scratch_pool));
+
+  if (opt_state->drop)
+    {
+      SVN_ERR(shelf_drop(name, local_abspath,
+                         opt_state->dry_run, opt_state->quiet,
+                         ctx, scratch_pool));
+    }
+  return SVN_NO_ERROR;
+}
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+svn_cl__shelf_list(apr_getopt_t *os,
+                   void *baton,
+                   apr_pool_t *pool)
+{
+  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
+  svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
+  apr_array_header_t *targets = NULL;
+  apr_pool_t *iterpool = svn_pool_create(pool);
+  int i;
+
+  SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
+                                                      opt_state->targets,
+                                                      ctx, FALSE, pool));
+  /* Add "." if user passed 0 arguments */
+  svn_opt_push_implicit_dot_target(targets, pool);
+
+  for (i = 0; i < targets->nelts; ++i)
+    {
+      const char *local_abspath;
+      const char *target = APR_ARRAY_IDX(targets, i, const char *);
+
+      svn_pool_clear(iterpool);
+
+      SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool));
+
+      SVN_ERR(shelves_list(local_abspath,
+                           opt_state->quiet,
+                           ctx, iterpool));
+    }
+
+  svn_pool_destroy(iterpool);
+
+  return SVN_NO_ERROR;
+}
+
+/* "svn shelf-list-by-paths [PATH...]"
+ *
+ * TARGET_RELPATHS are all within the same WC, relative to WC_ROOT_ABSPATH.
+ */
+static svn_error_t *
+shelf_list_by_paths(apr_array_header_t *target_relpaths,
+                    const char *wc_root_abspath,
+                    svn_client_ctx_t *ctx,
+                    apr_pool_t *scratch_pool)
+{
+  apr_array_header_t *shelves;
+  apr_hash_t *paths_to_shelf_name = apr_hash_make(scratch_pool);
+  apr_array_header_t *array;
+  int i;
+
+  SVN_ERR(list_sorted_by_date(&shelves,
+                              wc_root_abspath, ctx, scratch_pool));
+
+  /* Check paths are valid */
+  for (i = 0; i < target_relpaths->nelts; i++)
+    {
+      char *target_relpath = APR_ARRAY_IDX(target_relpaths, i, char *);
+
+      if (svn_path_is_url(target_relpath))
+        return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                                 _("'%s' is not a local path"), target_relpath);
+      SVN_ERR_ASSERT(svn_relpath_is_canonical(target_relpath));
+    }
+
+  /* Find the most recent shelf for each affected path */
+  for (i = 0; i < shelves->nelts; i++)
+    {
+      svn_sort__item_t *item = &APR_ARRAY_IDX(shelves, i, svn_sort__item_t);
+      const char *name = item->key;
+      svn_client__shelf2_t *shelf;
+      svn_client__shelf2_version_t *shelf_version;
+      apr_hash_t *shelf_paths;
+      int j;
+
+      SVN_ERR(svn_client__shelf2_open_existing(&shelf,
+                                              name, wc_root_abspath,
+                                              ctx, scratch_pool));
+      SVN_ERR(svn_client__shelf2_get_newest_version(&shelf_version, shelf,
+                                                   scratch_pool, scratch_pool));
+      if (!shelf_version)
+        continue;
+      SVN_ERR(svn_client__shelf2_paths_changed(&shelf_paths,
+                                              shelf_version,
+                                              scratch_pool, scratch_pool));
+      for (j = 0; j < target_relpaths->nelts; j++)
+        {
+          char *target_relpath = APR_ARRAY_IDX(target_relpaths, j, char *);
+          apr_hash_index_t *hi;
+
+          for (hi = apr_hash_first(scratch_pool, shelf_paths);
+               hi; hi = apr_hash_next(hi))
+            {
+              const char *shelf_path = apr_hash_this_key(hi);
+
+              if (svn_relpath_skip_ancestor(target_relpath, shelf_path))
+                {
+                  if (! svn_hash_gets(paths_to_shelf_name, shelf_path))
+                    {
+                      svn_hash_sets(paths_to_shelf_name, shelf_path, shelf->name);
+                    }
+                }
+            }
+        }
+    }
+
+  /* Print the results. */
+  array = svn_sort__hash(paths_to_shelf_name,
+                         svn_sort_compare_items_as_paths,
+                         scratch_pool);
+  for (i = 0; i < array->nelts; i++)
+    {
+      svn_sort__item_t *item = &APR_ARRAY_IDX(array, i, svn_sort__item_t);
+      const char *path = item->key;
+      const char *name = item->value;
+
+      SVN_ERR(svn_cmdline_printf(scratch_pool, "%-20.20s %s\n",
+                                 name,
+                                 svn_dirent_local_style(path, scratch_pool)));
+    }
+  return SVN_NO_ERROR;
+}
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+svn_cl__shelf_list_by_paths(apr_getopt_t *os,
+                            void *baton,
+                            apr_pool_t *pool)
+{
+  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
+  svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
+  const char *wc_root_abspath;
+  apr_array_header_t *targets;
+
+  /* Parse the remaining arguments as paths. */
+  SVN_ERR(targets_relative_to_a_wc(&wc_root_abspath, &targets,
+                                   os, opt_state->targets,
+                                   ctx, pool, pool));
+
+  SVN_ERR(shelf_list_by_paths(targets, wc_root_abspath, ctx, pool));
+  return SVN_NO_ERROR;
+}
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+svn_cl__shelf_diff(apr_getopt_t *os,
+                   void *baton,
+                   apr_pool_t *pool)
+{
+  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
+  svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
+  const char *local_abspath;
+  const char *name;
+  const char *arg = NULL;
+
+  SVN_ERR(svn_dirent_get_absolute(&local_abspath, "", pool));
+
+  SVN_ERR(get_next_argument(&name, os, pool, pool));
+
+  /* Which checkpoint number? */
+  if (os->ind < os->argc)
+    SVN_ERR(get_next_argument(&arg, os, pool, pool));
+
+  if (os->ind < os->argc)
+    return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                            _("Too many arguments"));
+
+  SVN_ERR(shelf_diff(name, arg, local_abspath,
+                     opt_state->diff.summarize,
+                     opt_state->depth, opt_state->ignore_ancestry,
+                     ctx, pool));
+
+  return SVN_NO_ERROR;
+}
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+svn_cl__shelf_drop(apr_getopt_t *os,
+                   void *baton,
+                   apr_pool_t *pool)
+{
+  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
+  svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
+  const char *name;
+  apr_array_header_t *targets = NULL;
+  apr_pool_t *iterpool = svn_pool_create(pool);
+  int i;
+
+  SVN_ERR(get_next_argument(&name, os, pool, pool));
+
+  SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
+                                                      opt_state->targets,
+                                                      ctx, FALSE, pool));
+  svn_opt_push_implicit_dot_target(targets, pool);
+
+  for (i = 0; i < targets->nelts; ++i)
+    {
+      const char *local_abspath;
+      const char *target = APR_ARRAY_IDX(targets, i, const char *);
+
+      svn_pool_clear(iterpool);
+
+      SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool));
+      SVN_ERR(shelf_drop(name, local_abspath,
+                         opt_state->dry_run, opt_state->quiet,
+                         ctx, iterpool));
+    }
+
+  svn_pool_destroy(iterpool);
+
+  return SVN_NO_ERROR;
+}
+
+/* This implements the `svn_opt_subcommand_t' interface. */
+static svn_error_t *
+svn_cl__shelf_log(apr_getopt_t *os,
+                  void *baton,
+                  apr_pool_t *pool)
+{
+  svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
+  svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
+  const char *name;
+  apr_array_header_t *targets = NULL;
+  apr_pool_t *iterpool = svn_pool_create(pool);
+  int i;
+
+  SVN_ERR(get_next_argument(&name, os, pool, pool));
+
+  SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
+                                                      opt_state->targets,
+                                                      ctx, FALSE, pool));
+  svn_opt_push_implicit_dot_target(targets, pool);
+
+  for (i = 0; i < targets->nelts; ++i)
+    {
+      const char *local_abspath;
+      const char *target = APR_ARRAY_IDX(targets, i, const char *);
+
+      svn_pool_clear(iterpool);
+
+      SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool));
+      SVN_ERR(shelf_log(name, local_abspath, ctx, iterpool));
+    }
+
+  svn_pool_destroy(iterpool);
+
+  return SVN_NO_ERROR;
+}
+
+const svn_opt_subcommand_desc3_t
+svn_cl__cmd_table_shelf2[] =
+{
+  { "x-shelf-diff", svn_cl__shelf_diff, {0}, {N_(
+     "Show shelved changes as a diff.\n"
+     "usage: x-shelf-diff SHELF [VERSION]\n"
+     "\n"), N_(
+     "  Show the changes in SHELF:VERSION (default: latest) as a diff.\n"
+     "\n"), N_(
+     "  See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n"
+     "  'svn diff'.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {opt_summarize},
+  },
+
+  { "x-shelf-drop", svn_cl__shelf_drop, {0}, {N_(
+     "Delete a shelf.\n"
+     "usage: x-shelf-drop SHELF [PATH ...]\n"
+     "\n"), N_(
+     "  Delete the shelves named SHELF from the working copies containing PATH\n"
+     "  (default PATH is '.')\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+  },
+
+  { "x-shelf-list", svn_cl__shelf_list, {"x-shelves"}, {N_(
+     "List shelves.\n"
+     "usage: x-shelf-list [PATH ...]\n"
+     "\n"), N_(
+     "  List shelves for each working copy containing PATH (default is '.')\n"
+     "  Include the first line of any log message and some details about the\n"
+     "  contents of the shelf, unless '-q' is given.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {'q', 'v'}
+  },
+
+  { "x-shelf-list-by-paths", svn_cl__shelf_list_by_paths, {0}, {N_(
+     "List which shelf affects each path.\n"
+     "usage: x-shelf-list-by-paths [PATH...]\n"
+     "\n"), N_(
+     "  List which shelf most recently affects each path below the given PATHs.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+  },
+
+  { "x-shelf-log", svn_cl__shelf_log, {0}, {N_(
+     "Show the versions of a shelf.\n"
+     "usage: x-shelf-log SHELF [PATH...]\n"
+     "\n"), N_(
+     "  Show all versions of SHELF for each working copy containing PATH (the\n"
+     "  default PATH is '.').\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {'q', 'v'}
+  },
+
+  { "x-shelf-save", svn_cl__shelf_save, {0}, {N_(
+     "Copy local changes onto a new version of a shelf.\n"
+     "usage: x-shelf-save SHELF [PATH...]\n"
+     "\n"), N_(
+     "  Save local changes in the given PATHs as a new version of SHELF.\n"
+     "  The shelf's log message can be set with -m, -F, etc.\n"
+     "\n"), N_(
+     "  The same as 'svn shelve --keep-local'.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {'q', opt_dry_run,
+     opt_depth, opt_targets, opt_changelist,
+     SVN_CL__LOG_MSG_OPTIONS,
+    }
+  },
+
+  { "x-shelve", svn_cl__shelf_shelve, {0}, {N_(
+     "Move local changes onto a shelf.\n"
+     "usage: x-shelve [--keep-local] SHELF [PATH...]\n"
+     "\n"), N_(
+     "  Save the local changes in the given PATHs to a new or existing SHELF.\n"
+     "  Revert those changes from the WC unless '--keep-local' is given.\n"
+     "  The shelf's log message can be set with -m, -F, etc.\n"
+     "\n"), N_(
+     "  'svn shelve --keep-local' is the same as 'svn shelf-save'.\n"
+     "\n"), N_(
+     "  The kinds of change you can shelve are committable changes to files and\n"
+     "  properties, except the following kinds which are not yet supported:\n"
+     "     * copies and moves\n"
+     "     * mkdir and rmdir\n"
+     "  Uncommittable states such as conflicts, unversioned and missing cannot\n"
+     "  be shelved.\n"
+     "\n"), N_(
+     "  To bring back shelved changes, use 'svn unshelve SHELF'.\n"
+     "\n"), N_(
+     "  Shelves are currently stored under <WC>/.svn/experimental/shelves/ .\n"
+     "  (In Subversion 1.10, shelves were stored under <WC>/.svn/shelves/ as\n"
+     "  patch files. To recover a shelf created by 1.10, either use a 1.10\n"
+     "  client to find and unshelve it, or find the patch file and use any\n"
+     "  1.10 or later 'svn patch' to apply it.)\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {'q', opt_dry_run, opt_keep_local,
+     opt_depth, opt_targets, opt_changelist,
+     SVN_CL__LOG_MSG_OPTIONS,
+    } },
+
+  { "x-unshelve", svn_cl__shelf_unshelve, {0}, {N_(
+     "Copy shelved changes back into the WC.\n"
+     "usage: x-unshelve [--drop] [SHELF [VERSION]]\n"
+     "\n"), N_(
+     "  Apply the changes stored in SHELF to the working copy.\n"
+     "  SHELF defaults to the newest shelf.\n"
+     "\n"), N_(
+     "  Apply the newest version of the shelf, by default. If VERSION is\n"
+     "  specified, apply that version and discard all versions newer than that.\n"
+     "  In any case, retain the unshelved version and versions older than that\n"
+     "  (unless --drop is specified).\n"
+     "\n"), N_(
+     "  With --drop, delete the entire shelf (like 'svn shelf-drop') after\n"
+     "  successfully unshelving with no conflicts.\n"
+     "\n"), N_(
+     "  The working files involved should be in a clean, unmodified state\n"
+     "  before using this command. To roll back to an older version of the\n"
+     "  shelf, first ensure any current working changes are removed, such as\n"
+     "  by shelving or reverting them, and then unshelve the desired version.\n"
+     "\n"), N_(
+     "  Unshelve normally refuses to apply any changes if any path involved is\n"
+     "  already modified (or has any other abnormal status) in the WC. With\n"
+     "  --force, it does not check and may error out and/or produce partial or\n"
+     "  unexpected results.\n"
+     "\n"), N_(
+     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
+     "  in the next release, and there is no promise of backward compatibility.\n"
+    )},
+    {opt_drop, 'q', opt_dry_run, opt_force} },
+
+  { NULL, NULL, {0}, {NULL}, {0} }
+};
+
diff --git a/subversion/svn/shelf2-cmd.h b/subversion/svn/shelf2-cmd.h
new file mode 100644
index 0000000..b058073
--- /dev/null
+++ b/subversion/svn/shelf2-cmd.h
@@ -0,0 +1,49 @@
+/*
+ * shelf2-cmd.h:  experimental shelving v2
+ *
+ * ====================================================================
+ *    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_SHELF2_CMD_H
+#define SVN_SHELF2_CMD_H
+
+/*** Includes. ***/
+#include <apr_getopt.h>
+
+#include "svn_opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+extern const svn_opt_subcommand_desc3_t svn_cl__cmd_table_shelf2[];
+/*extern const apr_getopt_option_t svn_cl__options_shelving2[];*/
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_SHELF2_CMD_H */
diff --git a/subversion/svn/svn.c b/subversion/svn/svn.c
index f83cc08..3c3ac6d 100644
--- a/subversion/svn/svn.c
+++ b/subversion/svn/svn.c
@@ -52,6 +52,8 @@
 #include "svn_hash.h"
 #include "svn_version.h"
 #include "cl.h"
+#include "shelf2-cmd.h"
+#include "shelf-cmd.h"
 
 #include "private/svn_opt_private.h"
 #include "private/svn_cmdline_private.h"
@@ -63,95 +65,6 @@
 
 /*** Option Processing ***/
 
-/* Add an identifier here for long options that don't have a short
-   option. Options that have both long and short options should just
-   use the short option letter as identifier.  */
-typedef enum svn_cl__longopt_t {
-  opt_auth_password = SVN_OPT_FIRST_LONGOPT_ID,
-  opt_auth_password_from_stdin,
-  opt_auth_username,
-  opt_autoprops,
-  opt_changelist,
-  opt_config_dir,
-  opt_config_options,
-  /* diff options */
-  opt_diff_cmd,
-  opt_internal_diff,
-  opt_no_diff_added,
-  opt_no_diff_deleted,
-  opt_show_copies_as_adds,
-  opt_notice_ancestry,
-  opt_summarize,
-  opt_use_git_diff_format,
-  opt_ignore_properties,
-  opt_properties_only,
-  opt_patch_compatible,
-  /* end of diff options */
-  opt_dry_run,
-  opt_editor_cmd,
-  opt_encoding,
-  opt_force_log,
-  opt_force,
-  opt_keep_changelists,
-  opt_ignore_ancestry,
-  opt_ignore_externals,
-  opt_incremental,
-  opt_merge_cmd,
-  opt_native_eol,
-  opt_new_cmd,
-  opt_no_auth_cache,
-  opt_no_autoprops,
-  opt_no_ignore,
-  opt_no_unlock,
-  opt_non_interactive,
-  opt_force_interactive,
-  opt_old_cmd,
-  opt_record_only,
-  opt_relocate,
-  opt_remove,
-  opt_revprop,
-  opt_stop_on_copy,
-  opt_strict,                   /* ### DEPRECATED */
-  opt_targets,
-  opt_depth,
-  opt_set_depth,
-  opt_version,
-  opt_xml,
-  opt_keep_local,
-  opt_with_revprop,
-  opt_with_all_revprops,
-  opt_with_no_revprops,
-  opt_parents,
-  opt_accept,
-  opt_show_revs,
-  opt_reintegrate,
-  opt_trust_server_cert,
-  opt_trust_server_cert_failures,
-  opt_strip,
-  opt_ignore_keywords,
-  opt_reverse_diff,
-  opt_ignore_whitespace,
-  opt_diff,
-  opt_allow_mixed_revisions,
-  opt_include_externals,
-  opt_show_inherited_props,
-  opt_search,
-  opt_search_and,
-  opt_mergeinfo_log,
-  opt_remove_unversioned,
-  opt_remove_ignored,
-  opt_remove_added,
-  opt_no_newline,
-  opt_show_passwords,
-  opt_pin_externals,
-  opt_show_item,
-  opt_adds_as_modification,
-  opt_vacuum_pristines,
-  opt_drop,
-  opt_viewspec,
-} svn_cl__longopt_t;
-
-
 /* Option codes and descriptions for the command line client.
  *
  * The entire list must be terminated with an entry of nulls.
@@ -471,7 +384,9 @@ const apr_getopt_option_t svn_cl__options[] =
                           "                             "
                           "   'schedule'   'normal','add','delete','replace'\n"
                           "                             "
-                          "   'depth'      checkout depth of TARGET in WC")},
+                          "   'depth'      checkout depth of TARGET in WC\n"
+                          "                             "
+                          "   'changelist' changelist of TARGET in WC")},
 
   {"adds-as-modification", opt_adds_as_modification, 0,
                        N_("Local additions are merged with incoming additions\n"
@@ -530,15 +445,8 @@ const int svn_cl__global_options[] =
   opt_config_dir, opt_config_options, 0
 };
 
-/* Options for giving a log message.  (Some of these also have other uses.)
- */
-#define SVN_CL__LOG_MSG_OPTIONS 'm', 'F', \
-                                opt_force_log, \
-                                opt_editor_cmd, \
-                                opt_encoding, \
-                                opt_with_revprop
-
-const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
+static const svn_opt_subcommand_desc3_t
+svn_cl__cmd_table_main[] =
 {
   { "add", svn_cl__add, {0}, {N_(
      "Put new files and directories under version control.\n"
@@ -632,7 +540,8 @@ const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
     {'r', opt_ignore_keywords} },
 
   { "changelist", svn_cl__changelist, {"cl"}, {N_(
-     "Associate (or dissociate) changelist CLNAME with the named files.\n"
+     "Associate (or dissociate) changelist CLNAME with the named\n"
+     "files.\n"
      "usage: 1. changelist CLNAME PATH...\n"
      "       2. changelist --remove PATH...\n"
     )},
@@ -668,8 +577,8 @@ const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
     {{'N', N_("obsolete; same as --depth=files")}} },
 
   { "cleanup", svn_cl__cleanup, {0}, {N_(
-     "Either recover from an interrupted operation that left the working copy locked,\n"
-     "or remove unwanted files.\n"
+     "Either recover from an interrupted operation that left the working\n"
+     "copy locked, or remove unwanted files.\n"
      "usage: 1. cleanup [WCPATH...]\n"
      "       2. cleanup --remove-unversioned [WCPATH...]\n"
      "          cleanup --remove-ignored [WCPATH...]\n"
@@ -696,9 +605,9 @@ const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
      "    referenced by any file in the working copy.\n"
     )},
     { opt_remove_unversioned, opt_remove_ignored, opt_vacuum_pristines,
-      opt_include_externals, 'q', opt_merge_cmd }, 
+      opt_include_externals, 'q', opt_merge_cmd },
     { { opt_merge_cmd, N_("deprecated and ignored") } } },
-      
+
   { "commit", svn_cl__commit, {"ci"}, {N_(
      "Send changes from your working copy to the repository.\n"
      "usage: commit [PATH...]\n"
@@ -1871,7 +1780,8 @@ const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
      {'N', N_("obsolete; same as --depth=immediates")}} },
 
   { "switch", svn_cl__switch, {"sw"}, {N_(
-     "Update the working copy to a different URL within the same repository.\n"
+     "Update the working copy to a different URL within the same\n"
+     "repository.\n"
      "usage: 1. switch URL[@PEGREV] [PATH]\n"
      "       2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
      "\n"), N_(
@@ -1907,9 +1817,6 @@ const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
      "\n"), N_(
      "  Examples:\n"
      "    svn switch ^/branches/1.x-release\n"
-     "    svn switch --relocate http:// svn://\n"
-     "    svn switch --relocate http://www.example.com/repo/project \\\n"
-     "                          svn://svn.example.com/repo/project\n"
     )},
     { 'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd,
       opt_ignore_externals, opt_ignore_ancestry, opt_force, opt_accept,
@@ -1993,167 +1900,11 @@ const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
     )},
     { 'q' } },
 
-  { "x-shelf-diff", svn_cl__shelf_diff, {0}, {N_(
-     "Show shelved changes as a diff.\n"
-     "usage: x-shelf-diff SHELF [VERSION]\n"
-     "\n"), N_(
-     "  Show the changes in SHELF:VERSION (default: latest) as a diff.\n"
-     "\n"), N_(
-     "  See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n"
-     "  'svn diff'.\n"
-     "\n"), N_(
-     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-    {opt_summarize},
-  },
-
-  { "x-shelf-drop", svn_cl__shelf_drop, {0}, {N_(
-     "Delete a shelf.\n"
-     "usage: x-shelf-drop SHELF [PATH ...]\n"
-     "\n"), N_(
-     "  Delete the shelves named SHELF from the working copies containing PATH\n"
-     "  (default PATH is '.')\n"
-     "\n"), N_(
-     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-  },
-
-  { "x-shelf-list", svn_cl__shelf_list, {"x-shelves"}, {N_(
-     "List shelves.\n"
-     "usage: x-shelf-list [PATH ...]\n"
-     "\n"), N_(
-     "  List shelves for each working copy containing PATH (default is '.')\n"
-     "  Include the first line of any log message and some details about the\n"
-     "  contents of the shelf, unless '-q' is given.\n"
-     "\n"), N_(
-     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-    {'q', 'v'}
-  },
-
-  { "x-shelf-list-by-paths", svn_cl__shelf_list_by_paths, {0}, {N_(
-     "List which shelf affects each path.\n"
-     "usage: x-shelf-list-by-paths [PATH...]\n"
-     "\n"), N_(
-     "  List which shelf most recently affects each path below the given PATHs.\n"
-     "\n"), N_(
-     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-  },
-
-  { "x-shelf-log", svn_cl__shelf_log, {0}, {N_(
-     "Show the versions of a shelf.\n"
-     "usage: x-shelf-log SHELF [PATH...]\n"
-     "\n"), N_(
-     "  Show all versions of SHELF for each working copy containing PATH (the\n"
-     "  default PATH is '.').\n"
-     "\n"), N_(
-     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-    {'q', 'v'}
-  },
-
-  { "x-shelf-save", svn_cl__shelf_save, {0}, {N_(
-     "Copy local changes onto a new version of a shelf.\n"
-     "usage: x-shelf-save SHELF [PATH...]\n"
-     "\n"), N_(
-     "  Save local changes in the given PATHs as a new version of SHELF.\n"
-     "  The shelf's log message can be set with -m, -F, etc.\n"
-     "\n"), N_(
-     "  The same as 'svn shelve --keep-local'.\n"
-     "\n"), N_(
-     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-    {'q', opt_dry_run,
-     opt_depth, opt_targets, opt_changelist,
-     SVN_CL__LOG_MSG_OPTIONS,
-    }
-  },
-
-  { "x-shelve", svn_cl__shelf_shelve, {0}, {N_(
-     "Move local changes onto a shelf.\n"
-     "usage: x-shelve [--keep-local] SHELF [PATH...]\n"
-     "\n"), N_(
-     "  Save the local changes in the given PATHs to a new or existing SHELF.\n"
-     "  Revert those changes from the WC unless '--keep-local' is given.\n"
-     "  The shelf's log message can be set with -m, -F, etc.\n"
-     "\n"), N_(
-     "  'svn shelve --keep-local' is the same as 'svn shelf-save'.\n"
-     "\n"), N_(
-     "  The kinds of change you can shelve are committable changes to files and\n"
-     "  properties, except the following kinds which are not yet supported:\n"
-     "     * copies and moves\n"
-     "     * mkdir and rmdir\n"
-     "  Uncommittable states such as conflicts, unversioned and missing cannot\n"
-     "  be shelved.\n"
-     "\n"), N_(
-     "  To bring back shelved changes, use 'svn unshelve SHELF'.\n"
-     "\n"), N_(
-     "  Shelves are currently stored under <WC>/.svn/experimental/shelves/ .\n"
-     "  (In Subversion 1.10, shelves were stored under <WC>/.svn/shelves/ as\n"
-     "  patch files. To recover a shelf created by 1.10, either use a 1.10\n"
-     "  client to find and unshelve it, or find the patch file and use any\n"
-     "  1.10 or later 'svn patch' to apply it.)\n"
-     "\n"), N_(
-     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-    {'q', opt_dry_run, opt_keep_local,
-     opt_depth, opt_targets, opt_changelist,
-     SVN_CL__LOG_MSG_OPTIONS,
-    } },
-
-  { "x-unshelve", svn_cl__shelf_unshelve, {0}, {N_(
-     "Copy shelved changes back into the WC.\n"
-     "usage: x-unshelve [--drop] [SHELF [VERSION]]\n"
-     "\n"), N_(
-     "  Apply the changes stored in SHELF to the working copy.\n"
-     "  SHELF defaults to the newest shelf.\n"
-     "\n"), N_(
-     "  Apply the newest version of the shelf, by default. If VERSION is\n"
-     "  specified, apply that version and discard all versions newer than that.\n"
-     "  In any case, retain the unshelved version and versions older than that\n"
-     "  (unless --drop is specified).\n"
-     "\n"), N_(
-     "  With --drop, delete the entire shelf (like 'svn shelf-drop') after\n"
-     "  successfully unshelving with no conflicts.\n"
-     "\n"), N_(
-     "  The working files involved should be in a clean, unmodified state\n"
-     "  before using this command. To roll back to an older version of the\n"
-     "  shelf, first ensure any current working changes are removed, such as\n"
-     "  by shelving or reverting them, and then unshelve the desired version.\n"
-     "\n"), N_(
-     "  Unshelve normally refuses to apply any changes if any path involved is\n"
-     "  already modified (or has any other abnormal status) in the WC. With\n"
-     "  --force, it does not check and may error out and/or produce partial or\n"
-     "  unexpected results.\n"
-     "\n"), N_(
-     "  The shelving feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-    {opt_drop, 'q', opt_dry_run, opt_force} },
-
-  { "x-wc-copy-mods", svn_cl__wc_copy_mods, {0}, {N_(
-     "Copy local modifications from one WC to another.\n"
-     "usage: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n"
-     "\n"), N_(
-     "  The source and destination WC paths may be in the same WC or in different"
-     "  WCs.\n"
-     "\n"), N_(
-     "  This feature is EXPERIMENTAL. This command is likely to change\n"
-     "  in the next release, and there is no promise of backward compatibility.\n"
-    )},
-  },
-
   { NULL, NULL, {0}, {NULL}, {0} }
 };
 
+const svn_opt_subcommand_desc3_t *svn_cl__cmd_table = svn_cl__cmd_table_main;
+
 
 /* Version compatibility check */
 static svn_error_t *
@@ -2232,6 +1983,33 @@ viewspec_from_word(enum svn_cl__viewspec_t *viewspec,
   return SVN_NO_ERROR;
 }
 
+/* Re-initialize the command table SVN_CL__CMD_TABLE,
+ * adding additional commands from CMDS_ADD.
+ * (TODO: and the options table) */
+static void
+add_commands(const svn_opt_subcommand_desc3_t *cmds_add,
+             apr_pool_t *pool)
+{
+  int elt_size = sizeof(svn_opt_subcommand_desc3_t);
+  const svn_opt_subcommand_desc3_t *cmds_old = svn_cl__cmd_table;
+  const svn_opt_subcommand_desc3_t *cmd;
+  int n_cmds_old, n_cmds_add, n_cmds_new;
+  svn_opt_subcommand_desc3_t *cmds_new;
+
+  for (cmd = cmds_old; cmd->name; cmd++) ;
+  n_cmds_old = (int)(cmd - cmds_old);
+  for (cmd = cmds_add; cmd->name; cmd++) ;
+  n_cmds_add = (int)(cmd - cmds_add);
+  n_cmds_new = n_cmds_old + n_cmds_add;
+
+  /* copy CMDS_OLD and CMDS_ADD, plus an all-zeros terminator entry */
+  cmds_new = apr_pcalloc(pool, (n_cmds_new + 1) * elt_size);
+  memcpy(cmds_new, cmds_old, n_cmds_old * elt_size);
+  memcpy(&cmds_new[n_cmds_old], cmds_add, n_cmds_add * elt_size);
+
+  svn_cl__cmd_table = cmds_new;
+}
+
 
 /*** Main. ***/
 
@@ -2249,6 +2027,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool)
   svn_cl__opt_state_t opt_state = { 0, { 0 } };
   svn_client_ctx_t *ctx;
   apr_array_header_t *received_opts;
+  const char *exp_cmds;
   int i;
   const svn_opt_subcommand_desc3_t *subcommand = NULL;
   const char *dash_F_arg = NULL;
@@ -2289,6 +2068,18 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool)
   /* Init the temporary buffer. */
   svn_membuf__create(&buf, 0, pool);
 
+  /* Add experimental commands, if requested. Use the most recent version
+   * that we know about and that is mentioned in the env. var. */
+  exp_cmds = getenv("SVN_EXPERIMENTAL_COMMANDS");
+  if (exp_cmds && strstr(exp_cmds, "shelf3"))
+    {
+      add_commands(svn_cl__cmd_table_shelf3, pool);
+    }
+  else if (exp_cmds && strstr(exp_cmds, "shelf2"))
+    {
+      add_commands(svn_cl__cmd_table_shelf2, pool);
+    }
+
   /* Begin processing arguments. */
   opt_state.start_revision.kind = svn_opt_revision_unspecified;
   opt_state.end_revision.kind = svn_opt_revision_unspecified;
@@ -3223,17 +3014,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool)
      sense (unless we've also been instructed not to care).  This may
      access the working copy so do it after setting the locking mode. */
   if ((! opt_state.force_log)
-      && (subcommand->cmd_func == svn_cl__commit
-          || subcommand->cmd_func == svn_cl__copy
-          || subcommand->cmd_func == svn_cl__delete
-          || subcommand->cmd_func == svn_cl__import
-          || subcommand->cmd_func == svn_cl__mkdir
-          || subcommand->cmd_func == svn_cl__move
-          || subcommand->cmd_func == svn_cl__lock
-          || subcommand->cmd_func == svn_cl__propedit
-          || subcommand->cmd_func == svn_cl__shelf_save
-          || subcommand->cmd_func == svn_cl__shelf_shelve
-         ))
+      && subcommand->cmd_func != svn_cl__propset)
     {
       /* If the -F argument is a file that's under revision control,
          that's probably not what the user intended. */
diff --git a/subversion/svn_private_config.h.in b/subversion/svn_private_config.h.in
index 3ecd337..93255e6 100644
--- a/subversion/svn_private_config.h.in
+++ b/subversion/svn_private_config.h.in
@@ -49,6 +49,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the <py3c.h> header file. */
+#undef HAVE_PY3C_H
+
 /* Define to 1 if you have the `rb_errinfo' function. */
 #undef HAVE_RB_ERRINFO
 
diff --git a/subversion/svnadmin/svnadmin.c b/subversion/svnadmin/svnadmin.c
index 85a6279..949ed42 100644
--- a/subversion/svnadmin/svnadmin.c
+++ b/subversion/svnadmin/svnadmin.c
@@ -97,6 +97,7 @@ check_lib_versions(void)
 /** Subcommands. **/
 
 static svn_opt_subcommand_t
+  subcommand_build_repcache,
   subcommand_crashtest,
   subcommand_create,
   subcommand_delrevprop,
@@ -306,6 +307,16 @@ static const apr_getopt_option_t options_table[] =
  */
 static const svn_opt_subcommand_desc3_t cmd_table[] =
 {
+  {"build-repcache", subcommand_build_repcache, {0}, {N_(
+    "usage: svnadmin build-repcache REPOS_PATH [-r LOWER[:UPPER]]\n"
+    "\n"), N_(
+    "Add missing entries to the representation cache for the repository\n"
+    "at REPOS_PATH. Process data in revisions LOWER through UPPER.\n"
+    "If no revision arguments are given, process all revisions. If only\n"
+    "LOWER revision argument is given, process only that single revision.\n"
+   )},
+   {'r', 'q', 'M'} },
+
   {"crashtest", subcommand_crashtest, {0}, {N_(
     "usage: svnadmin crashtest REPOS_PATH\n"
     "\n"), N_(
@@ -498,7 +509,7 @@ static const svn_opt_subcommand_desc3_t cmd_table[] =
     "Print the names of uncommitted transactions. With -rN skip the output\n"
     "of those that have a base revision more recent than rN.  Transactions\n"
     "with base revisions much older than HEAD are likely to have been\n"
-    "abandonded and are candidates to be removed.\n"
+    "abandoned and are candidates to be removed.\n"
    )},
    {'r'},
    { {'r', "transaction base revision ARG"} } },
@@ -1833,7 +1844,7 @@ subcommand_lstxns(apr_getopt_t *os, void *baton, apr_pool_t *pool)
   SVN_ERR(svn_fs_youngest_rev(&youngest, fs, pool));
   SVN_ERR(get_revnum(&limit, &opt_state->start_revision, youngest, repos,
                      pool));
-  
+
   iterpool = svn_pool_create(pool);
   for (i = 0; i < txns->nelts; i++)
     {
@@ -2887,7 +2898,7 @@ revision_size(apr_off_t *rev_size,
     {
       return svn_error_quick_wrapf(err,
                                    _("Revision size query is not implemented "
-                                     "for the filesytem type found in '%s'"),
+                                     "for the filesystem type found in '%s'"),
                                    svn_fs_path(fs, scratch_pool));
     }
   SVN_ERR(err);
@@ -2923,6 +2934,107 @@ subcommand_rev_size(apr_getopt_t *os, void *baton, apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
+static void
+build_rep_cache_progress_func(svn_revnum_t revision,
+                              void *baton,
+                              apr_pool_t *pool)
+{
+  svn_error_clear(svn_cmdline_printf(pool,
+                                     _("* Processed revision %ld.\n"),
+                                     revision));
+}
+
+static svn_error_t *
+build_rep_cache(svn_fs_t *fs,
+                svn_revnum_t start_rev,
+                svn_revnum_t end_rev,
+                struct svnadmin_opt_state *opt_state,
+                apr_pool_t *pool)
+{
+  svn_fs_fs__ioctl_build_rep_cache_input_t input = {0};
+  svn_error_t *err;
+
+  input.start_rev = start_rev;
+  input.end_rev = end_rev;
+
+  if (opt_state->quiet)
+    {
+      input.progress_func = NULL;
+      input.progress_baton = NULL;
+    }
+  else
+    {
+      input.progress_func = build_rep_cache_progress_func;
+      input.progress_baton = NULL;
+    }
+
+  err = svn_fs_ioctl(fs, SVN_FS_FS__IOCTL_BUILD_REP_CACHE,
+                     &input, NULL,
+                     check_cancel, NULL, pool, pool);
+  if (err && err->apr_err == SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE)
+    {
+      return svn_error_quick_wrapf(err,
+                                   _("Building rep-cache is not implemented "
+                                     "for the filesystem type found in '%s'"),
+                                   svn_fs_path(fs, pool));
+    }
+  else if (err && err->apr_err == SVN_ERR_FS_REP_SHARING_NOT_ALLOWED)
+    {
+      svn_error_clear(err);
+      SVN_ERR(svn_cmdline_printf(pool,
+                                 _("svnadmin: Warning - this repository has rep-sharing disabled."
+                                   " Building rep-cache has no effect.\n")));
+      return SVN_NO_ERROR;
+    }
+  else
+    {
+      return err;
+    }
+}
+
+/* This implements `svn_opt_subcommand_t'. */
+static svn_error_t *
+subcommand_build_repcache(apr_getopt_t *os, void *baton, apr_pool_t *pool)
+{
+  struct svnadmin_opt_state *opt_state = baton;
+  svn_repos_t *repos;
+  svn_fs_t *fs;
+  svn_revnum_t youngest;
+  svn_revnum_t lower;
+  svn_revnum_t upper;
+
+  /* Expect no more arguments. */
+  SVN_ERR(parse_args(NULL, os, 0, 0, pool));
+
+  SVN_ERR(open_repos(&repos, opt_state->repository_path, opt_state, pool));
+  fs = svn_repos_fs(repos);
+  SVN_ERR(svn_fs_youngest_rev(&youngest, fs, pool));
+
+  SVN_ERR(get_revnum(&lower, &opt_state->start_revision,
+                     youngest, repos, pool));
+  SVN_ERR(get_revnum(&upper, &opt_state->end_revision,
+                     youngest, repos, pool));
+
+  if (SVN_IS_VALID_REVNUM(lower) && SVN_IS_VALID_REVNUM(upper))
+    {
+      if (lower > upper)
+        return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                                _("First revision cannot be higher than second"));
+    }
+  else if (SVN_IS_VALID_REVNUM(lower))
+    {
+      upper = lower;
+    }
+  else
+    {
+      upper = youngest;
+    }
+
+  SVN_ERR(build_rep_cache(fs, lower, upper, opt_state, pool));
+
+  return SVN_NO_ERROR;
+}
+
 
 /** Main. **/
 
diff --git a/subversion/svnmucc/svnmucc.c b/subversion/svnmucc/svnmucc.c
index e6ec38a..ce4a1ce 100644
--- a/subversion/svnmucc/svnmucc.c
+++ b/subversion/svnmucc/svnmucc.c
@@ -632,7 +632,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool)
         case config_inline_opt:
           SVN_ERR(svn_utf_cstring_to_utf8(&opt_arg, arg, pool));
           SVN_ERR(svn_cmdline__parse_config_option(config_options, opt_arg,
-                                                   "svnmucc: ", 
+                                                   "svnmucc: ",
                                                    pool));
           break;
         case no_auth_cache_opt:
diff --git a/subversion/svnrdump/load_editor.c b/subversion/svnrdump/load_editor.c
index e426ad1..8733025 100644
--- a/subversion/svnrdump/load_editor.c
+++ b/subversion/svnrdump/load_editor.c
@@ -576,7 +576,8 @@ set_revision_property(void *baton,
     {
       if (! svn_hash_gets(rb->pb->skip_revprops, name))
         svn_hash_sets(rb->revprop_table,
-                      apr_pstrdup(rb->pool, name), value);
+                      apr_pstrdup(rb->pool, name),
+                      svn_string_dup(value, rb->pool));
     }
   else if (rb->head_rev_before_commit == 0
            && ! svn_hash_gets(rb->pb->skip_revprops, name))
@@ -591,9 +592,9 @@ set_revision_property(void *baton,
   /* Remember any datestamp/ author that passes through (see comment
      in close_revision). */
   if (!strcmp(name, SVN_PROP_REVISION_DATE))
-    rb->datestamp = value;
+    rb->datestamp = svn_string_dup(value, rb->pool);
   if (!strcmp(name, SVN_PROP_REVISION_AUTHOR))
-    rb->author = value;
+    rb->author = svn_string_dup(value, rb->pool);
 
   return SVN_NO_ERROR;
 }
@@ -636,7 +637,7 @@ set_node_property(void *baton,
 
   prop = apr_palloc(nb->rb->pool, sizeof (*prop));
   prop->name = apr_pstrdup(pool, name);
-  prop->value = value;
+  prop->value = svn_string_dup(value, pool);
   svn_hash_sets(nb->prop_changes, prop->name, prop);
 
   return SVN_NO_ERROR;
diff --git a/subversion/svnrdump/svnrdump.c b/subversion/svnrdump/svnrdump.c
index e647b46..500a5f9 100644
--- a/subversion/svnrdump/svnrdump.c
+++ b/subversion/svnrdump/svnrdump.c
@@ -925,7 +925,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool)
 
             SVN_ERR(svn_utf_cstring_to_utf8(&opt_arg, opt_arg, pool));
             SVN_ERR(svn_cmdline__parse_config_option(config_options,
-                                                     opt_arg, 
+                                                     opt_arg,
                                                      "svnrdump: ",
                                                      pool));
           break;
diff --git a/subversion/svnrdump/util.c b/subversion/svnrdump/util.c
index e612b12..fe80c59 100644
--- a/subversion/svnrdump/util.c
+++ b/subversion/svnrdump/util.c
@@ -46,8 +46,8 @@ svn_rdump__normalize_props(apr_hash_t **normal_props,
       svn_pool_clear(iterpool);
 
       SVN_ERR(svn_repos__normalize_prop(&value, NULL, key, value,
-                                        result_pool, iterpool));
-      svn_hash_sets(*normal_props, key, value);
+                                        iterpool, iterpool));
+      svn_hash_sets(*normal_props, key, svn_string_dup(value, result_pool));
     }
   svn_pool_destroy(iterpool);
 
diff --git a/subversion/svnsync/svnsync.c b/subversion/svnsync/svnsync.c
index 43c977b..7c1c0ef 100644
--- a/subversion/svnsync/svnsync.c
+++ b/subversion/svnsync/svnsync.c
@@ -294,7 +294,7 @@ static const apr_getopt_option_t svnsync_options[] =
 
 typedef struct opt_baton_t {
   svn_boolean_t non_interactive;
-  struct { 
+  struct {
     svn_boolean_t trust_server_cert_unknown_ca;
     svn_boolean_t trust_server_cert_cn_mismatch;
     svn_boolean_t trust_server_cert_expired;
@@ -821,7 +821,7 @@ do_initialize(svn_ra_session_t *to_session,
 
   /* Now fill in our bookkeeping info in the dest repository. */
 
-  SVN_ERR(svn_ra_open4(&from_session, NULL, baton->from_url, NULL,
+  SVN_ERR(svn_ra_open5(&from_session, NULL, NULL, baton->from_url, NULL,
                        &(baton->source_callbacks), baton,
                        baton->config, pool));
   SVN_ERR(svn_ra_get_repos_root2(from_session, &root_url, pool));
@@ -998,7 +998,7 @@ open_source_session(svn_ra_session_t **from_session,
                                           pool));
 
   /* Open the session to copy the revision data. */
-  SVN_ERR(svn_ra_open4(from_session, NULL, from_url, from_uuid_str->data,
+  SVN_ERR(svn_ra_open5(from_session, NULL, NULL, from_url, from_uuid_str->data,
                        callbacks, baton, config, pool));
 
   return SVN_NO_ERROR;
@@ -1013,7 +1013,7 @@ open_target_session(svn_ra_session_t **target_session_p,
                     apr_pool_t *pool)
 {
   svn_ra_session_t *target_session;
-  SVN_ERR(svn_ra_open4(&target_session, NULL, baton->to_url, NULL,
+  SVN_ERR(svn_ra_open5(&target_session, NULL, NULL, baton->to_url, NULL,
                        &(baton->sync_callbacks), baton, baton->config, pool));
   SVN_ERR(check_if_session_is_at_repos_root(target_session, baton->to_url, pool));
 
diff --git a/subversion/tests/README b/subversion/tests/README
index 9a506cd..cac3c4f 100644
--- a/subversion/tests/README
+++ b/subversion/tests/README
@@ -31,7 +31,7 @@ sub-tests it can run.  It has a standard interface:
     regression tracking scripts), and human-readable (for the sake of
     painstaking grovelling by hand in the dead of night):
 
-      (PASS | FAIL): (argv[0]) (argv[1]): (description)
+      (PASS | XPASS | FAIL | XFAIL | SKIP): (argv[0]) (argv[1]): (description)
 
 For example,
 
diff --git a/subversion/tests/afl/afl-svndiff.c b/subversion/tests/afl/afl-svndiff.c
index 4ff00bf..83d5bd8 100644
--- a/subversion/tests/afl/afl-svndiff.c
+++ b/subversion/tests/afl/afl-svndiff.c
@@ -56,7 +56,7 @@ parse(const char *filename, apr_pool_t *pool)
 
   stream = svn_txdelta_parse_svndiff(txdelta_window_handler, NULL, TRUE, pool);
   SVN_ERR(svn_stream_copy3(svndiff, stream, NULL, NULL, pool));
-  
+
   return SVN_NO_ERROR;
 }
 
diff --git a/subversion/tests/cmdline/atomic-ra-revprop-change.c b/subversion/tests/cmdline/atomic-ra-revprop-change.c
index 4f3d763..023ba42 100644
--- a/subversion/tests/cmdline/atomic-ra-revprop-change.c
+++ b/subversion/tests/cmdline/atomic-ra-revprop-change.c
@@ -99,8 +99,8 @@ change_rev_prop(const char *url,
   SVN_ERR(construct_auth_baton(&callbacks->auth_baton, config_dir, pool));
   SVN_ERR(construct_config(&config, config_dir, pool));
 
-  SVN_ERR(svn_ra_open4(&sess, NULL, url, NULL, callbacks, NULL /* baton */,
-                       config, pool));
+  SVN_ERR(svn_ra_open5(&sess, NULL, NULL, url, NULL,
+                       callbacks, NULL /* baton */, config, pool));
 
   SVN_ERR(svn_ra_has_capability(sess, &capable,
                                 SVN_RA_CAPABILITY_ATOMIC_REVPROPS,
diff --git a/subversion/tests/cmdline/basic_tests.py b/subversion/tests/cmdline/basic_tests.py
index c6b7482..30bb62b 100755
--- a/subversion/tests/cmdline/basic_tests.py
+++ b/subversion/tests/cmdline/basic_tests.py
@@ -3105,7 +3105,7 @@ def plaintext_password_storage_disabled(sbox):
   servers_file = open(os.path.join(config_dir_path, "servers"), "w")
   servers_file.write("[global]\nstore-plaintext-passwords=no\n")
   servers_file.close()
-  
+
   svntest.main.run_command(svntest.main.svn_binary, False, False,
    "commit", "--config-dir", config_dir_path,
     "-m", "committing with plaintext password storage disabled",
diff --git a/subversion/tests/cmdline/depth_tests.py b/subversion/tests/cmdline/depth_tests.py
index 18ce379..65a23db 100755
--- a/subversion/tests/cmdline/depth_tests.py
+++ b/subversion/tests/cmdline/depth_tests.py
@@ -2846,7 +2846,7 @@ def commit_excluded(sbox):
   expected_output = svntest.wc.State(wc_dir, {
     'D' : Item(verb='Adding'),
   })
-  
+
   expected_status.add({
     'D'          : Item(status='  ', wc_rev='2'),
     'D/H'        : Item(status='  ', wc_rev='2'),
@@ -2971,10 +2971,10 @@ def fold_tree_with_unversioned_items(sbox):
 
   # Set A to be excluded.
   svntest.main.run_svn(None, 'update', '--set-depth=exclude', A_path)
-  
+
   # try a simple update afterwards
   sbox.simple_update()
-  
+
 #----------------------------------------------------------------------
 # list all tests here, starting with None:
 test_list = [ None,
diff --git a/subversion/tests/cmdline/diff_tests.py b/subversion/tests/cmdline/diff_tests.py
index 63caa24..14df65b 100755
--- a/subversion/tests/cmdline/diff_tests.py
+++ b/subversion/tests/cmdline/diff_tests.py
@@ -5253,6 +5253,83 @@ def diff_git_format_copy(sbox):
   svntest.actions.run_and_verify_svn(expected_output, [], 'diff',
                                      '--git', '.')
 
+#----------------------------------------------------------------------
+# Regression test for issue #1722: 'svn diff' produced a wrong header,
+# indicating one revision as being in the working copy when it should
+# be 'nonexistent'
+@Issue(1722)
+def diff_nonexistent_in_wc(sbox):
+  "nonexistent in working copy"
+
+  sbox.build(empty=True)
+  wc_dir = sbox.wc_dir
+
+  # We mirror the actions of the reproduction script (with one exception:
+  # we 'svn up -r 0' instead of checking out a second working copy)
+
+  sbox.simple_add_text('test\n', 'file')
+  sbox.simple_commit()
+  sbox.simple_update(revision=0)
+
+  # Expected output is empty for these cases:
+  # svn diff -r BASE
+  # svn diff -r 0:BASE
+  # svn diff -r 0
+
+  # Expected output for:
+  # svn diff -r BASE:HEAD
+  # svn diff -r 0:HEAD
+  # svn diff -r 0:1
+  expected_output_base_head = make_diff_header("file", "nonexistent",
+                                               "revision 1") + [
+  "@@ -0,0 +1 @@\n",
+  "+test\n",
+  ]
+
+  # Expected output for:
+  # svn diff -r HEAD:BASE
+  # svn diff -r HEAD
+  # svn diff -r 1:0
+  # svn diff -r 1
+  expected_output_head_base = make_diff_header("file", "revision 1",
+                                               "nonexistent") + [
+  "@@ -1 +0,0 @@\n",
+  "-test\n"
+  ]
+
+  os.chdir(wc_dir)
+
+  svntest.actions.run_and_verify_svn(expected_output_base_head, [],
+                                     'diff', '-r', 'BASE:HEAD')
+
+  svntest.actions.run_and_verify_svn(expected_output_head_base, [],
+                                     'diff', '-r', 'HEAD:BASE')
+
+  svntest.actions.run_and_verify_svn([], [],
+                                     'diff', '-r', 'BASE')
+
+  svntest.actions.run_and_verify_svn(expected_output_head_base, [],
+                                     'diff', '-r', 'HEAD')
+
+  svntest.actions.run_and_verify_svn([], [],
+                                     'diff', '-r', '0:BASE')
+
+  svntest.actions.run_and_verify_svn(expected_output_base_head, [],
+                                     'diff', '-r', '0:HEAD')
+
+  svntest.actions.run_and_verify_svn(expected_output_base_head, [],
+                                     'diff', '-r', '0:1')
+
+  svntest.actions.run_and_verify_svn(expected_output_head_base, [],
+                                     'diff', '-r', '1:0')
+
+  svntest.actions.run_and_verify_svn([], [],
+                                     'diff', '-r', '0')
+
+  svntest.actions.run_and_verify_svn(expected_output_head_base, [],
+                                     'diff', '-r', '1')
+
+
 ########################################################################
 #Run the tests
 
@@ -5353,6 +5430,7 @@ test_list = [ None,
               diff_summary_repo_wc_local_copy_unmodified,
               diff_file_replaced_by_symlink,
               diff_git_format_copy,
+              diff_nonexistent_in_wc,
               ]
 
 if __name__ == '__main__':
diff --git a/subversion/tests/cmdline/getopt_tests.py b/subversion/tests/cmdline/getopt_tests.py
index f4e6398..ed6470c 100755
--- a/subversion/tests/cmdline/getopt_tests.py
+++ b/subversion/tests/cmdline/getopt_tests.py
@@ -38,10 +38,6 @@ import svntest
 
 #----------------------------------------------------------------------
 
-# This directory contains all the expected output from svn.
-getopt_output_dir = os.path.join(os.path.dirname(sys.argv[0]),
-                                 'getopt_tests_data')
-
 # Naming convention for golden files: take the svn command line as a
 # single string and apply the following sed transformations:
 #   echo svn option1 option2 ... | sed -e 's/ /_/g' -e 's/_--/--/g'
@@ -51,6 +47,10 @@ getopt_output_dir = os.path.join(os.path.dirname(sys.argv[0]),
 def load_expected_output(basename):
   "load the expected standard output and standard error"
 
+  # This directory contains all the expected output from svn.
+  getopt_output_dir = os.path.join(os.path.dirname(sys.argv[0]),
+                                   'getopt_tests_data')
+
   stdout_filename = os.path.join(getopt_output_dir, basename + '_stdout')
   stderr_filename = os.path.join(getopt_output_dir, basename + '_stderr')
 
@@ -229,7 +229,7 @@ def getopt_config_option(sbox):
   expected_stderr = '.*W205000.*did you mean.*'
   expected_stdout = svntest.verify.AnyOutput
   svntest.actions.run_and_verify_svn2(expected_stdout, expected_stderr, 0,
-                                      'info', 
+                                      'info',
                                       '--config-option',
                                       'config:miscellanous:diff-extensions=' +
                                         '-u -p',
diff --git a/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout b/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
index 672cd3e..264f496 100644
--- a/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
+++ b/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
@@ -48,7 +48,5 @@ Available subcommands:
    update (up)
    upgrade
 
-(Use '-v' to show experimental subcommands.)
-
 Subversion is a tool for version control.
 For additional information, see http://subversion.apache.org/
diff --git a/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout b/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
index 0c4731e..e246b1c 100644
--- a/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
+++ b/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
@@ -137,7 +137,8 @@ Valid options:
 
 (Use '-v' to show global and experimental options.)
 
-switch (sw): Update the working copy to a different URL within the same repository.
+switch (sw): Update the working copy to a different URL within the same
+repository.
 usage: 1. switch URL[@PEGREV] [PATH]
        2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]
 
@@ -173,9 +174,6 @@ usage: 1. switch URL[@PEGREV] [PATH]
 
   Examples:
     svn switch ^/branches/1.x-release
-    svn switch --relocate http:// svn://
-    svn switch --relocate http://www.example.com/repo/project \
-                          svn://svn.example.com/repo/project
 
 Valid options:
   -r [--revision] ARG      : ARG (some commands also take ARG1:ARG2 range)
diff --git a/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout b/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
index 672cd3e..264f496 100644
--- a/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
+++ b/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
@@ -48,7 +48,5 @@ Available subcommands:
    update (up)
    upgrade
 
-(Use '-v' to show experimental subcommands.)
-
 Subversion is a tool for version control.
 For additional information, see http://subversion.apache.org/
diff --git a/subversion/tests/cmdline/info_tests.py b/subversion/tests/cmdline/info_tests.py
index 7ac53a6..39b8ce2 100755
--- a/subversion/tests/cmdline/info_tests.py
+++ b/subversion/tests/cmdline/info_tests.py
@@ -818,6 +818,32 @@ def info_item_failures(sbox):
     sbox.ospath('iota'))
 
 
+@Issue(4837)
+def info_file_in_file_replaced_dir(sbox):
+  "info, file in file-replaced dir"
+
+  sbox.build(empty=True)
+  sbox.simple_mkdir('dir')
+  sbox.simple_add_text('text\n', 'dir/file')
+  sbox.simple_commit(message='Add file')
+
+  sbox.simple_copy('dir/file', 'file-moved')
+  sbox.simple_rm('dir')
+  sbox.simple_add_text('replaced\n', 'dir')
+  sbox.simple_commit(message='Replace dir with file')
+
+  sbox.simple_update()
+
+  expected = {'Relative URL' : r'\^/dir/file',
+              'Node Kind' : 'file',
+              'Revision': '1',
+              'Last Changed Rev': '1',
+             }
+
+  svntest.actions.run_and_verify_info([expected],
+                                      sbox.repo_url + '/dir/file@1')
+
+
 ########################################################################
 # Run the tests
 
@@ -842,6 +868,7 @@ test_list = [ None,
               info_item_size_repos,
               info_item_size_repos_recursive,
               info_item_failures,
+              info_file_in_file_replaced_dir,
              ]
 
 if __name__ == '__main__':
diff --git a/subversion/tests/cmdline/mod_authz_svn_tests.py b/subversion/tests/cmdline/mod_authz_svn_tests.py
index f3c52dd..72c359a 100755
--- a/subversion/tests/cmdline/mod_authz_svn_tests.py
+++ b/subversion/tests/cmdline/mod_authz_svn_tests.py
@@ -167,7 +167,7 @@ def anon(sbox):
 
   write_authz_file(sbox)
 
-  anon_tests = ( 
+  anon_tests = (
                  { 'path': '', 'status': 301 },
                  { 'path': '/', 'status': 200 },
                  { 'path': '/repos', 'status': 301 },
diff --git a/subversion/tests/cmdline/mod_dav_svn_tests.py b/subversion/tests/cmdline/mod_dav_svn_tests.py
index 1ab2464..3aa6cad 100755
--- a/subversion/tests/cmdline/mod_dav_svn_tests.py
+++ b/subversion/tests/cmdline/mod_dav_svn_tests.py
@@ -102,7 +102,7 @@ def compare_xml_elem(a, b):
   # iteration.
   def sortcmp(x, y):
     return compare_xml_elem(x, y)[0]
- 
+
   a_children = sorted(list(a), key=functools.cmp_to_key(sortcmp))
   b_children = sorted(list(b), key=functools.cmp_to_key(sortcmp))
 
@@ -686,7 +686,7 @@ def last_modified_header(sbox):
     raise svntest.Failure('Unexpected Last-Modified header: %s' % last_modified)
   r.read()
 
-  
+
 ########################################################################
 # Run the tests
 
diff --git a/subversion/tests/cmdline/move_tests.py b/subversion/tests/cmdline/move_tests.py
index 6da4a1d..5f05521 100755
--- a/subversion/tests/cmdline/move_tests.py
+++ b/subversion/tests/cmdline/move_tests.py
@@ -883,7 +883,7 @@ def build_simple_file_move_func(sbox, source, dest):
 #
 #   Each test must return on success or raise on failure.
 #
-# See http://wiki.apache.org/subversion/LocalMoves
+# See https://cwiki.apache.org/confluence/display/SVN/LocalMoves
 
 def lateral_move_file_test(sbox):
   "lateral (rename) move of a file test"
@@ -1755,7 +1755,7 @@ def move_conflict_markers(sbox):
   })
   expected_disk.remove('iota', 'iota.prej',
                        'A/B/E', 'A/B/E/alpha', 'A/B/E/beta',
-                       'A/B/E/dir_conflicts.prej', 
+                       'A/B/E/dir_conflicts.prej',
                        'A/B/E/beta.prej')
   expected_disk.add({
     'A/iotb'  : Item(contents="This is the file 'iota'.\n"),
diff --git a/subversion/tests/cmdline/pegrev_parse_tests.py b/subversion/tests/cmdline/pegrev_parse_tests.py
index 91469db..91469db 100644..100755
--- a/subversion/tests/cmdline/pegrev_parse_tests.py
+++ b/subversion/tests/cmdline/pegrev_parse_tests.py
diff --git a/subversion/tests/cmdline/relocate_tests.py b/subversion/tests/cmdline/relocate_tests.py
index 063c252..2ee3303 100755
--- a/subversion/tests/cmdline/relocate_tests.py
+++ b/subversion/tests/cmdline/relocate_tests.py
@@ -417,8 +417,8 @@ def prefix_partial_component(sbox):
                                      wc_dir)
   svntest.actions.run_and_verify_info([{ 'URL' : '.*.yyyother$' }],
                                       wc_dir)
-  
-  
+
+
 ########################################################################
 # Run the tests
 
diff --git a/subversion/tests/cmdline/shelf2_tests.py b/subversion/tests/cmdline/shelf2_tests.py
new file mode 100755
index 0000000..d0e4bcd
--- /dev/null
+++ b/subversion/tests/cmdline/shelf2_tests.py
@@ -0,0 +1,1030 @@
+#!/usr/bin/env python
+#
+#  shelf_tests.py:  testing shelving
+#
+#  Subversion is a tool for revision control.
+#  See http://subversion.apache.org for more information.
+#
+# ====================================================================
+#    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.
+######################################################################
+
+# General modules
+import shutil, stat, re, os, logging
+
+logger = logging.getLogger()
+
+# Our testing module
+import svntest
+from svntest import wc
+from svntest.verify import make_diff_header, make_no_diff_deleted_header, \
+                           make_git_diff_header, make_diff_prop_header, \
+                           make_diff_prop_val, make_diff_prop_deleted, \
+                           make_diff_prop_added, make_diff_prop_modified
+
+# (abbreviation)
+Skip = svntest.testcase.Skip_deco
+SkipUnless = svntest.testcase.SkipUnless_deco
+XFail = svntest.testcase.XFail_deco
+Issues = svntest.testcase.Issues_deco
+Issue = svntest.testcase.Issue_deco
+Wimp = svntest.testcase.Wimp_deco
+Item = wc.StateItem
+
+def shelf2_enabled():
+  v = os.getenv('SVN_EXPERIMENTAL_COMMANDS')
+  return v is not None and v.find('shelf2') >= 0
+
+#----------------------------------------------------------------------
+
+def state_from_status(wc_dir,
+                      v=True, u=True, q=True):
+  opts = ()
+  if v:
+    opts += ('-v',)
+  if u:
+    opts += ('-u',)
+  if q:
+    opts += ('-q',)
+  _, output, _ = svntest.main.run_svn(None, 'status', wc_dir, *opts)
+  return svntest.wc.State.from_status(output, wc_dir)
+
+def get_wc_state(wc_dir):
+  """Return a description of the WC state. Include as much info as shelving
+     should be capable of restoring.
+  """
+  return (state_from_status(wc_dir),
+          svntest.wc.State.from_wc(wc_dir, load_props=True),
+          )
+
+def check_wc_state(wc_dir, expected):
+  """Check a description of the WC state. Include as much info as shelving
+     should be capable of restoring.
+  """
+  expect_st, expect_wc = expected
+  actual_st, actual_wc = get_wc_state(wc_dir)
+
+  # Verify actual status against expected status.
+  try:
+    expect_st.compare_and_display('status', actual_st)
+  except svntest.tree.SVNTreeError:
+    svntest.actions._log_tree_state("EXPECT STATUS TREE:", expect_st.old_tree(),
+                                    wc_dir)
+    svntest.actions._log_tree_state("ACTUAL STATUS TREE:", actual_st.old_tree(),
+                                    wc_dir)
+    raise
+
+  # Verify actual WC against expected WC.
+  try:
+    expect_wc.compare_and_display('status', actual_wc)
+  except svntest.tree.SVNTreeError:
+    svntest.actions._log_tree_state("EXPECT WC TREE:", expect_wc.old_tree(),
+                                    wc_dir)
+    svntest.actions._log_tree_state("ACTUAL WC TREE:", actual_wc.old_tree(),
+                                    wc_dir)
+    raise
+
+def shelve_unshelve_verify(sbox, modifier, cannot_shelve=False):
+  """Round-trip: shelve; verify all changes are reverted;
+     unshelve; verify all changes are restored.
+  """
+
+  wc_dir = sbox.wc_dir
+  virginal_state = get_wc_state(wc_dir)
+
+  # Make some changes to the working copy
+  modifier(sbox)
+
+  # Save the modified state
+  modified_state = get_wc_state(wc_dir)
+
+  if cannot_shelve:
+    svntest.actions.run_and_verify_svn(None, '.* could not be shelved.*',
+                                       'x-shelve', 'foo')
+    return
+
+  # Shelve; check there are no longer any modifications
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelve', 'foo')
+  check_wc_state(wc_dir, virginal_state)
+
+  # List; ensure the shelf is listed
+  expected_output = svntest.verify.RegexListOutput(
+    [r'foo\s*version \d+.*',
+     r' ',
+    ])
+  svntest.actions.run_and_verify_svn(expected_output, [], 'x-shelves')
+
+  # Unshelve; check the original modifications are here again
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-unshelve', 'foo')
+  check_wc_state(wc_dir, modified_state)
+
+#----------------------------------------------------------------------
+
+def shelve_unshelve(sbox, modifier, cannot_shelve=False):
+  """Round-trip: build 'sbox'; apply changes by calling 'modifier(sbox)';
+     shelve and unshelve; verify changes are fully reverted and restored.
+  """
+
+  if not sbox.is_built():
+    sbox.build()
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+
+  shelve_unshelve_verify(sbox, modifier, cannot_shelve)
+
+  os.chdir(was_cwd)
+
+######################################################################
+# Tests
+#
+#   Each test must return on success or raise on failure.
+
+@SkipUnless(shelf2_enabled)
+def shelve_text_mods(sbox):
+  "shelve text mods"
+
+  def modifier(sbox):
+    sbox.simple_append('A/mu', 'appended mu text')
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_prop_changes(sbox):
+  "shelve prop changes"
+
+  def modifier(sbox):
+    sbox.simple_propset('p', 'v', 'A')
+    sbox.simple_propset('p', 'v', 'A/mu')
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_adds(sbox):
+  "shelve adds"
+
+  def modifier(sbox):
+    sbox.simple_add_text('A new file\n', 'A/new')
+    sbox.simple_add_text('A new file\n', 'A/new2')
+    sbox.simple_propset('p', 'v', 'A/new2')
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@Issue(4709)
+@SkipUnless(shelf2_enabled)
+def shelve_deletes(sbox):
+  "shelve deletes"
+
+  def modifier(sbox):
+    sbox.simple_rm('A/mu')
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_replace(sbox):
+  "shelve replace"
+
+  def modifier(sbox):
+    sbox.simple_rm('A/mu')
+    sbox.simple_add_text('Replacement\n', 'A/mu')
+    sbox.simple_propset('p', 'v', 'A/mu')
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_empty_adds(sbox):
+  "shelve empty adds"
+  sbox.build(empty=True)
+
+  def modifier(sbox):
+    sbox.simple_add_text('', 'empty')
+    sbox.simple_add_text('', 'empty-with-prop')
+    sbox.simple_propset('p', 'v', 'empty-with-prop')
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_empty_deletes(sbox):
+  "shelve empty deletes"
+  sbox.build(empty=True)
+  sbox.simple_add_text('', 'empty')
+  sbox.simple_add_text('', 'empty-with-prop')
+  sbox.simple_propset('p', 'v', 'empty-with-prop')
+  sbox.simple_commit()
+
+  def modifier(sbox):
+    sbox.simple_rm('empty', 'empty-with-prop')
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_from_inner_path(sbox):
+  "shelve from inner path"
+
+  def modifier(sbox):
+    sbox.simple_append('A/mu', 'appended mu text')
+
+  sbox.build()
+  was_cwd = os.getcwd()
+  os.chdir(sbox.ospath('A'))
+  sbox.wc_dir = '..'
+
+  shelve_unshelve_verify(sbox, modifier)
+
+  os.chdir(was_cwd)
+
+#----------------------------------------------------------------------
+
+def save_revert_restore(sbox, modifier1, modifier2):
+  "Save 2 checkpoints; revert; restore 1st"
+
+  sbox.build()
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+  wc_dir = ''
+
+  initial_state = get_wc_state(wc_dir)
+
+  # Make some changes to the working copy
+  modifier1(sbox)
+
+  # Remember the modified state
+  modified_state1 = get_wc_state(wc_dir)
+
+  # Save a checkpoint; check nothing changed
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelf-save', 'foo')
+  check_wc_state(wc_dir, modified_state1)
+
+  # Modify again; remember the state; save a checkpoint
+  modifier2(sbox)
+  modified_state2 = get_wc_state(wc_dir)
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelf-save', 'foo')
+  check_wc_state(wc_dir, modified_state2)
+
+  # Revert
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'revert', '-R', '.')
+  check_wc_state(wc_dir, initial_state)
+
+  # Restore; check the original modifications are here again
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-unshelve', 'foo', '1')
+  check_wc_state(wc_dir, modified_state1)
+
+  os.chdir(was_cwd)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def checkpoint_basic(sbox):
+  "checkpoint basic"
+
+  def modifier1(sbox):
+    sbox.simple_append('A/mu', 'appended mu text\n')
+
+  def modifier2(sbox):
+    sbox.simple_append('iota', 'appended iota text\n')
+    sbox.simple_append('A/mu', 'appended another line\n')
+
+  save_revert_restore(sbox, modifier1, modifier2)
+
+#----------------------------------------------------------------------
+
+@Issue(3747)
+@SkipUnless(shelf2_enabled)
+def shelve_mergeinfo(sbox):
+  "shelve mergeinfo"
+
+  def modifier(sbox):
+    sbox.simple_propset('svn:mergeinfo', '/trunk/A:1-3,10', 'A')
+    sbox.simple_propset('svn:mergeinfo', '/trunk/A/mu:1-3,10', 'A/mu')
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def unshelve_refuses_if_conflicts(sbox):
+  "unshelve refuses if conflicts"
+
+  def modifier1(sbox):
+    sbox.simple_append('alpha', 'A-mod1\nB\nC\nD\n', truncate=True)
+    sbox.simple_append('beta', 'A-mod1\nB\nC\nD\n', truncate=True)
+
+  def modifier2(sbox):
+    sbox.simple_append('beta', 'A-mod2\nB\nC\nD\n', truncate=True)
+
+  sbox.build(empty=True)
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+  wc_dir = ''
+
+  sbox.simple_add_text('A\nB\nC\nD\n', 'alpha')
+  sbox.simple_add_text('A\nB\nC\nD\n', 'beta')
+  sbox.simple_commit()
+  initial_state = get_wc_state(wc_dir)
+
+  # Make initial mods; remember this modified state
+  modifier1(sbox)
+  modified_state1 = get_wc_state(wc_dir)
+  assert modified_state1 != initial_state
+
+  # Shelve; check there are no longer any local mods
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelve', 'foo')
+  check_wc_state(wc_dir, initial_state)
+
+  # Make a different local mod that will conflict with the shelf
+  modifier2(sbox)
+  modified_state2 = get_wc_state(wc_dir)
+
+  # Try to unshelve; check it fails with an error about a conflict
+  svntest.actions.run_and_verify_svn(None, '.*[Cc]onflict.*',
+                                     'x-unshelve', 'foo')
+  # Check nothing changed in the attempt
+  check_wc_state(wc_dir, modified_state2)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_binary_file_mod(sbox):
+  "shelve binary file mod"
+
+  sbox.build(empty=True)
+
+  existing_files = ['A/B/existing']
+  mod_files = ['bin', 'A/B/bin']
+
+  sbox.simple_mkdir('A', 'A/B')
+  for f in existing_files + mod_files:
+    sbox.simple_add_text('\0\1\2\3\4\5', f)
+  sbox.simple_commit()
+
+  def modifier(sbox):
+    for f in mod_files:
+      sbox.simple_append(f, '\6\5\4\3\2\1\0', truncate=True)
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_binary_file_add(sbox):
+  "shelve binary file add"
+
+  sbox.build(empty=True)
+
+  existing_files = ['A/B/existing']
+  mod_files = ['bin', 'A/B/bin']
+
+  sbox.simple_mkdir('A', 'A/B')
+  for f in existing_files:
+    sbox.simple_add_text('\0\1\2\3\4\5', f)
+  sbox.simple_commit()
+
+  def modifier(sbox):
+    for f in mod_files:
+      sbox.simple_add_text('\0\1\2\3\4\5', f)
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_binary_file_del(sbox):
+  "shelve binary file del"
+
+  sbox.build(empty=True)
+
+  existing_files = ['A/B/existing']
+  mod_files = ['bin', 'A/B/bin']
+
+  sbox.simple_mkdir('A', 'A/B')
+  for f in existing_files + mod_files:
+    sbox.simple_add_text('\0\1\2\3\4\5', f)
+  sbox.simple_commit()
+
+  def modifier(sbox):
+    for f in mod_files:
+      sbox.simple_rm(f)
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_binary_file_replace(sbox):
+  "shelve binary file replace"
+
+  sbox.build(empty=True)
+
+  existing_files = ['A/B/existing']
+  mod_files = ['bin', 'A/B/bin']
+
+  sbox.simple_mkdir('A', 'A/B')
+  for f in existing_files + mod_files:
+    sbox.simple_add_text('\0\1\2\3\4\5', f)
+  sbox.simple_commit()
+
+  def modifier(sbox):
+    for f in mod_files:
+      sbox.simple_rm(f)
+      sbox.simple_add_text('\6\5\4\3\2\1\0', f)
+
+  shelve_unshelve(sbox, modifier)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_with_log_message(sbox):
+  "shelve with log message"
+
+  sbox.build(empty=True)
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+
+  sbox.simple_add_text('New file', 'f')
+  log_message = 'Log message for foo'
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelve', 'foo', '-m', log_message)
+  expected_output = svntest.verify.RegexListOutput(
+    ['foo .*',
+     ' ' + log_message
+    ])
+  svntest.actions.run_and_verify_svn(expected_output, [],
+                                     'x-shelf-list')
+
+  os.chdir(was_cwd)
+
+#----------------------------------------------------------------------
+
+def run_and_verify_status(wc_dir_name, status_tree, changelists=[]):
+  """Run 'status' on WC_DIR_NAME and compare it with the
+  expected STATUS_TREE.
+  Returns on success, raises on failure."""
+
+  if not isinstance(status_tree, wc.State):
+    raise TypeError('wc.State tree expected')
+
+  cl_opts = ('--cl=' + cl for cl in changelists)
+  exit_code, output, errput = svntest.main.run_svn(None, 'status', '-q',
+                                                   wc_dir_name, *cl_opts)
+
+  actual_status = svntest.wc.State.from_status(output, wc_dir=wc_dir_name)
+
+  # Verify actual output against expected output.
+  try:
+    status_tree.compare_and_display('status', actual_status)
+  except svntest.tree.SVNTreeError:
+    svntest.actions._log_tree_state("ACTUAL STATUS TREE:", actual_status.old_tree(),
+                                    wc_dir_name)
+    raise
+
+def run_and_verify_shelf_status(wc_dir, expected_status, shelf):
+  run_and_verify_status(wc_dir, expected_status,
+                        changelists=['svn:shelf:' + shelf])
+
+@SkipUnless(shelf2_enabled)
+def shelf_status(sbox):
+  "shelf status"
+
+  sbox.build()
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+
+  sbox.simple_add_text('New file', 'f')
+  sbox.simple_append('iota', 'New text')
+  sbox.simple_propset('p', 'v', 'A/mu')
+  sbox.simple_rm('A/B/lambda')
+  # Not yet supported:
+  #sbox.simple_rm('A/B/E')
+  expected_status = state_from_status(sbox.wc_dir, v=False, u=False, q=False)
+  run_and_verify_status(sbox.wc_dir, expected_status)
+
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelve', 'foo')
+  run_and_verify_shelf_status(sbox.wc_dir, expected_status, shelf='foo')
+
+  os.chdir(was_cwd)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_mkdir(sbox):
+  "shelve mkdir"
+
+  sbox.build()
+
+  def modifier(sbox):
+    sbox.simple_mkdir('D', 'D/D2')
+    sbox.simple_propset('p', 'v', 'D', 'D/D2')
+
+  shelve_unshelve(sbox, modifier, cannot_shelve=True)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_rmdir(sbox):
+  "shelve rmdir"
+
+  sbox.build()
+  sbox.simple_propset('p', 'v', 'A/C')
+  sbox.simple_commit()
+
+  def modifier(sbox):
+    sbox.simple_rm('A/C', 'A/D/G')
+
+  shelve_unshelve(sbox, modifier, cannot_shelve=True)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_replace_dir(sbox):
+  "shelve replace dir"
+
+  sbox.build()
+  sbox.simple_propset('p', 'v', 'A/C')
+  sbox.simple_commit()
+
+  def modifier(sbox):
+    sbox.simple_rm('A/C', 'A/D/G')
+    sbox.simple_mkdir('A/C', 'A/C/D2')
+
+  shelve_unshelve(sbox, modifier, cannot_shelve=True)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_file_copy(sbox):
+  "shelve file copy"
+
+  sbox.build()
+
+  def modifier(sbox):
+    sbox.simple_copy('iota', 'A/ii')
+    sbox.simple_propset('p', 'v', 'A/ii')
+
+  shelve_unshelve(sbox, modifier, cannot_shelve=True)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def shelve_dir_copy(sbox):
+  "shelve dir copy"
+
+  sbox.build()
+
+  def modifier(sbox):
+    sbox.simple_copy('A/B', 'BB')
+    sbox.simple_propset('p', 'v', 'BB')
+
+  shelve_unshelve(sbox, modifier, cannot_shelve=True)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def list_shelves(sbox):
+  "list_shelves"
+
+  sbox.build()
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+
+  # an empty list
+  svntest.actions.run_and_verify_svn([], [],
+                                     'x-shelf-list', '-q')
+
+  # make two shelves
+  sbox.simple_append('A/mu', 'appended mu text')
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelf-save', 'foo')
+  sbox.simple_append('A/mu', 'appended more text')
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelf-save', 'foo', '-m', 'log msg')
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelf-save', 'bar', '-m', 'log msg')
+
+  # We don't check for time-ordering of the shelves. If we want to do so, we
+  # would need to sleep for timestamps to differ, between creating them.
+
+  # a quiet list
+  expected_out = svntest.verify.UnorderedRegexListOutput(['foo', 'bar'])
+  svntest.actions.run_and_verify_svn(expected_out, [],
+                                     'x-shelf-list', '-q')
+
+  # a detailed list
+  expected_out = svntest.verify.UnorderedRegexListOutput(['foo .* 1 path.*',
+                                                          ' log msg',
+                                                          'bar .* 1 path.*',
+                                                          ' log msg'])
+  svntest.actions.run_and_verify_svn(expected_out, [],
+                                     'x-shelf-list')
+
+  os.chdir(was_cwd)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def refuse_to_shelve_conflict(sbox):
+  "refuse to shelve conflict"
+
+  sbox.build(empty=True)
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+
+  # create a tree conflict victim at an unversioned path
+  sbox.simple_mkdir('topdir')
+  sbox.simple_commit()
+  sbox.simple_mkdir('topdir/subdir')
+  sbox.simple_commit()
+  sbox.simple_update()
+  sbox.simple_rm('topdir')
+  sbox.simple_commit()
+  sbox.simple_update()
+  svntest.actions.run_and_verify_svn(
+    None, [],
+    'merge', '-c2', '.', '--ignore-ancestry', '--accept', 'postpone')
+  svntest.actions.run_and_verify_svn(
+    None, 'svn: E155015:.*existing.*conflict.*',
+    'merge', '-c1', '.', '--ignore-ancestry', '--accept', 'postpone')
+
+  # attempt to shelve
+  expected_out = svntest.verify.RegexListOutput([
+    r'--- .*',
+    r'--- .*',
+    r'\?     C topdir',
+    r'      > .*',
+    r'      >   not shelved'])
+  svntest.actions.run_and_verify_svn(expected_out,
+                                     '.* 1 path could not be shelved',
+                                     'x-shelf-save', 'foo')
+
+  os.chdir(was_cwd)
+
+#----------------------------------------------------------------------
+
+def unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state):
+  """Run a test scenario in which 'unshelve' needs to merge some shelved
+     changes made by modifier1() with some committed changes made by
+     modifier2(). tweak_expected_state() must produce the expected WC state.
+  """
+  sbox.build()
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+  wc_dir = sbox.wc_dir
+
+  setup(sbox)
+  sbox.simple_commit()
+  initial_state = get_wc_state(wc_dir)
+
+  # Make some changes to the working copy
+  modifier1(sbox)
+  modified_state = get_wc_state(wc_dir)
+
+  # Shelve; check there are no longer any modifications
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelve', 'foo')
+  check_wc_state(wc_dir, initial_state)
+
+  # Make a different change, with which we shall merge
+  modifier2(sbox)
+  sbox.simple_commit()
+  modified_state[0].tweak('A/mu', wc_rev='3')
+
+  # Unshelve; check the expected result of the merge
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-unshelve', 'foo')
+  tweak_expected_state(modified_state)
+  check_wc_state(wc_dir, modified_state)
+
+  os.chdir(was_cwd)
+
+@SkipUnless(shelf2_enabled)
+def unshelve_text_mod_merge(sbox):
+  "unshelve text mod merge"
+
+  orig_contents='A\nB\nC\nD\nE\n'
+  mod1_contents='A\nBB\nC\nD\nE\n'
+  mod2_contents='A\nB\nC\nDD\nE\n'
+  merged_contents='A\nBB\nC\nDD\nE\n'
+
+  def setup(sbox):
+    sbox.simple_append('A/mu', orig_contents, truncate=True)
+
+  def modifier1(sbox):
+    sbox.simple_append('A/mu', mod1_contents, truncate=True)
+
+  def modifier2(sbox):
+    sbox.simple_append('A/mu', mod2_contents, truncate=True)
+
+  def tweak_expected_state(modified_state):
+    modified_state[1].tweak('A/mu', contents=merged_contents)
+
+  unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def unshelve_text_mod_conflict(sbox):
+  "unshelve text mod conflict"
+
+  orig_contents='A\nB\nC\nD\nE\n'
+  mod1_contents='A\nBB\nC\nD\nE\n'
+  mod2_contents='A\nBCD\nC\nD\nE\n'
+  merged_contents = 'A\n<<<<<<< .working\nBCD\n||||||| .merge-left\nB\n=======\nBB\n>>>>>>> .merge-right\nC\nD\nE\n'
+
+  def setup(sbox):
+    sbox.simple_append('A/mu', orig_contents, truncate=True)
+
+  def modifier1(sbox):
+    sbox.simple_append('A/mu', mod1_contents, truncate=True)
+
+  def modifier2(sbox):
+    sbox.simple_append('A/mu', mod2_contents, truncate=True)
+
+  def tweak_expected_state(modified_state):
+    modified_state[0].tweak('A/mu', status='C ')
+    modified_state[1].tweak('A/mu', contents=merged_contents)
+    modified_state[1].add({
+      'A/mu.merge-left':  Item(contents=orig_contents),
+      'A/mu.merge-right': Item(contents=mod1_contents),
+      'A/mu.working':     Item(contents=mod2_contents),
+      })
+
+  unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def unshelve_undeclared_binary_mod_conflict(sbox):
+  "unshelve undeclared binary mod conflict"
+
+  orig_contents='\1\2\3\4\5'
+  mod1_contents='\1\2\2\3\4\5'
+  mod2_contents='\1\2\3\4\3\4\5'
+  merged_contents = '<<<<<<< .working\n' + mod2_contents + '||||||| .merge-left\n' + orig_contents + '=======\n' + mod1_contents + '>>>>>>> .merge-right\n'
+
+  def setup(sbox):
+    sbox.simple_append('A/mu', orig_contents, truncate=True)
+
+  def modifier1(sbox):
+    sbox.simple_append('A/mu', mod1_contents, truncate=True)
+
+  def modifier2(sbox):
+    sbox.simple_append('A/mu', mod2_contents, truncate=True)
+
+  def tweak_expected_state(modified_state):
+    modified_state[0].tweak('A/mu', status='C ')
+    modified_state[1].tweak('A/mu', contents=merged_contents)
+    modified_state[1].add({
+      'A/mu.merge-left':  Item(contents=orig_contents),
+      'A/mu.merge-right': Item(contents=mod1_contents),
+      'A/mu.working':     Item(contents=mod2_contents),
+      })
+
+  unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def unshelve_binary_mod_conflict(sbox):
+  "unshelve binary mod conflict"
+
+  orig_contents='\1\2\3\4\5'
+  mod1_contents='\1\2\2\3\4\5'
+  mod2_contents='\1\2\3\4\3\4\5'
+
+  def setup(sbox):
+    sbox.simple_append('A/mu', orig_contents, truncate=True)
+    sbox.simple_propset('svn:mime-type', 'application/octet-stream', 'A/mu')
+
+  def modifier1(sbox):
+    sbox.simple_append('A/mu', mod1_contents, truncate=True)
+
+  def modifier2(sbox):
+    sbox.simple_append('A/mu', mod2_contents, truncate=True)
+
+  def tweak_expected_state(modified_state):
+    modified_state[0].tweak('A/mu', status='C ')
+    modified_state[1].tweak('A/mu', contents=mod2_contents)
+    modified_state[1].add({
+      'A/mu.merge-left':  Item(contents=orig_contents),
+      'A/mu.merge-right': Item(contents=mod1_contents),
+      })
+
+  unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def unshelve_text_prop_merge(sbox):
+  "unshelve text prop merge"
+
+  def setup(sbox):
+    sbox.simple_propset('p1', 'v', 'A/mu')
+    sbox.simple_propset('p2', 'v', 'A/mu')
+
+  def modifier1(sbox):
+    sbox.simple_propset('p1', 'changed', 'A/mu')
+
+  def modifier2(sbox):
+    sbox.simple_propset('p2', 'changed', 'A/mu')
+
+  def tweak_expected_state(wc_state):
+    wc_state[1].tweak('A/mu', props={'p1':'changed',
+                                     'p2':'changed'})
+
+  unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state)
+
+#----------------------------------------------------------------------
+
+@SkipUnless(shelf2_enabled)
+def unshelve_text_prop_conflict(sbox):
+  "unshelve text prop conflict"
+
+  orig_contents='A'
+  mod1_contents='B'
+  mod2_contents='C'
+  merged_contents='C'
+  prej_contents='''Trying to change property 'p'
+but the local property value conflicts with the incoming change.
+<<<<<<< (local property value)
+C||||||| (incoming 'changed from' value)
+A=======
+B>>>>>>> (incoming 'changed to' value)
+'''
+
+  def setup(sbox):
+    sbox.simple_propset('p', orig_contents, 'A/mu')
+
+  def modifier1(sbox):
+    sbox.simple_propset('p', mod1_contents, 'A/mu')
+
+  def modifier2(sbox):
+    sbox.simple_propset('p', mod2_contents, 'A/mu')
+
+  def tweak_expected_state(wc_state):
+    wc_state[0].tweak('A/mu', status=' C')
+    wc_state[1].tweak('A/mu', props={'p':merged_contents})
+    wc_state[1].add({
+      'A/mu.prej':     Item(contents=prej_contents),
+      })
+
+  unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state)
+
+#----------------------------------------------------------------------
+
+def run_and_verify_shelf_diff_summarize(output_tree, shelf, *args):
+  """Run 'svn shelf-diff --summarize' with the arguments *ARGS.
+
+  The subcommand output will be verified against OUTPUT_TREE.  Returns
+  on success, raises on failure.
+  """
+
+  if isinstance(output_tree, wc.State):
+    output_tree = output_tree.old_tree()
+
+  exit_code, output, errput = svntest.actions.run_and_verify_svn(
+                                None, [],
+                                'x-shelf-diff', '--summarize', shelf, *args)
+
+  actual = svntest.tree.build_tree_from_diff_summarize(output)
+
+  # Verify actual output against expected output.
+  try:
+    svntest.tree.compare_trees("output", actual, output_tree)
+  except svntest.tree.SVNTreeError:
+    svntest.verify.display_trees(None, 'DIFF OUTPUT TREE', output_tree, actual)
+    raise
+
+# Exercise a very basic case of shelf-diff.
+@SkipUnless(shelf2_enabled)
+def shelf_diff_simple(sbox):
+  "shelf diff simple"
+
+  sbox.build()
+  was_cwd = os.getcwd()
+  os.chdir(sbox.wc_dir)
+  sbox.wc_dir = ''
+  wc_dir = sbox.wc_dir
+
+  def setup(sbox):
+    sbox.simple_propset('p1', 'v', 'A/mu')
+    sbox.simple_propset('p2', 'v', 'A/mu')
+
+  def modifier1(sbox):
+    sbox.simple_append('A/mu', 'New line.\n')
+    sbox.simple_propset('p1', 'changed', 'A/mu')
+
+  setup(sbox)
+  sbox.simple_commit()
+  initial_state = get_wc_state(wc_dir)
+
+  # Make some changes to the working copy
+  modifier1(sbox)
+  modified_state = get_wc_state(wc_dir)
+
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'x-shelf-save', 'foo')
+
+  # basic svn-style diff
+  expected_output = make_diff_header('A/mu', 'revision 2', 'working copy') + [
+                      "@@ -1 +1,2 @@\n",
+                      " This is the file 'mu'.\n",
+                      "+New line.\n",
+                    ] + make_diff_prop_header('A/mu') \
+                    + make_diff_prop_modified('p1', 'v', 'changed')
+  svntest.actions.run_and_verify_svn(expected_output, [],
+                                     'x-shelf-diff', 'foo')
+
+  # basic summary diff
+  expected_diff = svntest.wc.State(wc_dir, {
+    'A/mu':           Item(status='MM'),
+  })
+  run_and_verify_shelf_diff_summarize(expected_diff, 'foo')
+
+
+########################################################################
+# Run the tests
+
+# list all tests here, starting with None:
+test_list = [ None,
+              shelve_text_mods,
+              shelve_prop_changes,
+              shelve_adds,
+              shelve_deletes,
+              shelve_replace,
+              shelve_empty_adds,
+              shelve_empty_deletes,
+              shelve_from_inner_path,
+              checkpoint_basic,
+              shelve_mergeinfo,
+              unshelve_refuses_if_conflicts,
+              shelve_binary_file_mod,
+              shelve_binary_file_add,
+              shelve_binary_file_del,
+              shelve_binary_file_replace,
+              shelve_with_log_message,
+              shelf_status,
+              shelve_mkdir,
+              shelve_rmdir,
+              shelve_replace_dir,
+              shelve_file_copy,
+              shelve_dir_copy,
+              list_shelves,
+              refuse_to_shelve_conflict,
+              unshelve_text_mod_merge,
+              unshelve_text_mod_conflict,
+              unshelve_undeclared_binary_mod_conflict,
+              unshelve_binary_mod_conflict,
+              unshelve_text_prop_merge,
+              unshelve_text_prop_conflict,
+              shelf_diff_simple,
+             ]
+
+if __name__ == '__main__':
+  svntest.main.run_tests(test_list)
+  # NOTREACHED
+
+
+### End of file.
diff --git a/subversion/tests/cmdline/shelf_tests.py b/subversion/tests/cmdline/shelf_tests.py
index fe6108a..6be2099 100755
--- a/subversion/tests/cmdline/shelf_tests.py
+++ b/subversion/tests/cmdline/shelf_tests.py
@@ -46,6 +46,10 @@ Issue = svntest.testcase.Issue_deco
 Wimp = svntest.testcase.Wimp_deco
 Item = wc.StateItem
 
+def shelf3_enabled():
+  v = os.getenv('SVN_EXPERIMENTAL_COMMANDS')
+  return v is not None and v.find('shelf3') >= 0
+
 #----------------------------------------------------------------------
 
 def state_from_status(wc_dir,
@@ -126,6 +130,12 @@ def shelve_unshelve_verify(sbox, modifier, cannot_shelve=False):
     ])
   svntest.actions.run_and_verify_svn(expected_output, [], 'x-shelves')
 
+  # Diff; ensure something comes out and it doesn't crash
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
+                                     'x-shelf-diff', 'foo')
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
+                                     'x-shelf-diff', '--summarize', 'foo')
+
   # Unshelve; check the original modifications are here again
   svntest.actions.run_and_verify_svn(None, [],
                                      'x-unshelve', 'foo')
@@ -153,6 +163,7 @@ def shelve_unshelve(sbox, modifier, cannot_shelve=False):
 #
 #   Each test must return on success or raise on failure.
 
+@SkipUnless(shelf3_enabled)
 def shelve_text_mods(sbox):
   "shelve text mods"
 
@@ -163,6 +174,7 @@ def shelve_text_mods(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_prop_changes(sbox):
   "shelve prop changes"
 
@@ -174,6 +186,7 @@ def shelve_prop_changes(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_adds(sbox):
   "shelve adds"
 
@@ -187,6 +200,7 @@ def shelve_adds(sbox):
 #----------------------------------------------------------------------
 
 @Issue(4709)
+@SkipUnless(shelf3_enabled)
 def shelve_deletes(sbox):
   "shelve deletes"
 
@@ -197,6 +211,7 @@ def shelve_deletes(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_replace(sbox):
   "shelve replace"
 
@@ -209,6 +224,7 @@ def shelve_replace(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_empty_adds(sbox):
   "shelve empty adds"
   sbox.build(empty=True)
@@ -222,6 +238,7 @@ def shelve_empty_adds(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_empty_deletes(sbox):
   "shelve empty deletes"
   sbox.build(empty=True)
@@ -237,6 +254,7 @@ def shelve_empty_deletes(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_from_inner_path(sbox):
   "shelve from inner path"
 
@@ -297,6 +315,7 @@ def save_revert_restore(sbox, modifier1, modifier2):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def checkpoint_basic(sbox):
   "checkpoint basic"
 
@@ -312,6 +331,7 @@ def checkpoint_basic(sbox):
 #----------------------------------------------------------------------
 
 @Issue(3747)
+@SkipUnless(shelf3_enabled)
 def shelve_mergeinfo(sbox):
   "shelve mergeinfo"
 
@@ -323,6 +343,7 @@ def shelve_mergeinfo(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def unshelve_refuses_if_conflicts(sbox):
   "unshelve refuses if conflicts"
 
@@ -366,6 +387,7 @@ def unshelve_refuses_if_conflicts(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_binary_file_mod(sbox):
   "shelve binary file mod"
 
@@ -387,6 +409,7 @@ def shelve_binary_file_mod(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_binary_file_add(sbox):
   "shelve binary file add"
 
@@ -408,6 +431,7 @@ def shelve_binary_file_add(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_binary_file_del(sbox):
   "shelve binary file del"
 
@@ -429,6 +453,7 @@ def shelve_binary_file_del(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_binary_file_replace(sbox):
   "shelve binary file replace"
 
@@ -451,6 +476,7 @@ def shelve_binary_file_replace(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_with_log_message(sbox):
   "shelve with log message"
 
@@ -500,6 +526,7 @@ def run_and_verify_shelf_status(wc_dir, expected_status, shelf):
   run_and_verify_status(wc_dir, expected_status,
                         changelists=['svn:shelf:' + shelf])
 
+@SkipUnless(shelf3_enabled)
 def shelf_status(sbox):
   "shelf status"
 
@@ -526,6 +553,7 @@ def shelf_status(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def shelve_mkdir(sbox):
   "shelve mkdir"
 
@@ -539,6 +567,7 @@ def shelve_mkdir(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_rmdir(sbox):
   "shelve rmdir"
 
@@ -554,6 +583,7 @@ def shelve_rmdir(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def shelve_replace_dir(sbox):
   "shelve replace dir"
 
@@ -569,6 +599,7 @@ def shelve_replace_dir(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_file_copy(sbox):
   "shelve file copy"
 
@@ -582,6 +613,7 @@ def shelve_file_copy(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_dir_copy(sbox):
   "shelve dir copy"
 
@@ -595,6 +627,7 @@ def shelve_dir_copy(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def list_shelves(sbox):
   "list_shelves"
 
@@ -637,6 +670,7 @@ def list_shelves(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def refuse_to_shelve_conflict(sbox):
   "refuse to shelve conflict"
 
@@ -704,6 +738,7 @@ def unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state)
   os.chdir(was_cwd)
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_text_mod_merge(sbox):
   "unshelve text mod merge"
 
@@ -729,6 +764,7 @@ def unshelve_text_mod_merge(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_text_mod_conflict(sbox):
   "unshelve text mod conflict"
 
@@ -760,6 +796,7 @@ def unshelve_text_mod_conflict(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_undeclared_binary_mod_conflict(sbox):
   "unshelve undeclared binary mod conflict"
 
@@ -791,6 +828,7 @@ def unshelve_undeclared_binary_mod_conflict(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_binary_mod_conflict(sbox):
   "unshelve binary mod conflict"
 
@@ -820,6 +858,7 @@ def unshelve_binary_mod_conflict(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def unshelve_text_prop_merge(sbox):
   "unshelve text prop merge"
 
@@ -842,6 +881,7 @@ def unshelve_text_prop_merge(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_text_prop_conflict(sbox):
   "unshelve text prop conflict"
 
@@ -903,6 +943,7 @@ def run_and_verify_shelf_diff_summarize(output_tree, shelf, *args):
 #----------------------------------------------------------------------
 
 # Exercise a very basic case of shelf-diff.
+@SkipUnless(shelf3_enabled)
 def shelf_diff_simple(sbox):
   "shelf diff simple"
 
@@ -917,6 +958,8 @@ def shelf_diff_simple(sbox):
     sbox.simple_propset('p2', 'v', 'A/mu')
 
   def modifier1(sbox):
+    sbox.simple_rm('A/B/lambda')
+    sbox.simple_add_text('This is a new file.\n', 'A/B/new')
     sbox.simple_append('A/mu', 'New line.\n')
     sbox.simple_propset('p1', 'changed', 'A/mu')
 
@@ -932,7 +975,15 @@ def shelf_diff_simple(sbox):
                                      'x-shelf-save', 'foo')
 
   # basic svn-style diff
-  expected_output = make_diff_header('A/mu', 'revision 2', 'working copy') + [
+  expected_output = make_diff_header('A/B/lambda', 'revision 2', 'nonexistent') + [
+                      "@@ -1 +0,0 @@\n",
+                      "-This is the file 'lambda'.\n"
+                    ]
+  expected_output += make_diff_header('A/B/new', 'nonexistent', 'working copy') + [
+                      "@@ -0,0 +1 @@\n",
+                      "+This is a new file.\n"
+                    ]
+  expected_output += make_diff_header('A/mu', 'revision 2', 'working copy') + [
                       "@@ -1 +1,2 @@\n",
                       " This is the file 'mu'.\n",
                       "+New line.\n",
@@ -943,6 +994,8 @@ def shelf_diff_simple(sbox):
 
   # basic summary diff
   expected_diff = svntest.wc.State(wc_dir, {
+    'A/B/lambda':     Item(status='D '),
+    'A/B/new':        Item(status='A '),
     'A/mu':           Item(status='MM'),
   })
   run_and_verify_shelf_diff_summarize(expected_diff, 'foo')
@@ -951,6 +1004,7 @@ def shelf_diff_simple(sbox):
 
 @XFail()
 @Issue(4827)
+@SkipUnless(shelf3_enabled)
 def shelve_with_kw_translation(sbox):
   "shelve with kw translation"
   sbox.build(empty=True)
diff --git a/subversion/tests/cmdline/stat_tests.py b/subversion/tests/cmdline/stat_tests.py
index e0f1306..2799f9c 100755
--- a/subversion/tests/cmdline/stat_tests.py
+++ b/subversion/tests/cmdline/stat_tests.py
@@ -1606,7 +1606,7 @@ def status_dash_u_deleted_directories(sbox):
                                         os.path.join("B", "E", "alpha"),
           "D                1        1 jrandom      %s\n" % \
                                         os.path.join("B", "E", "beta"),
-          "D                1        1 jrandom      %s\n" % 
+          "D                1        1 jrandom      %s\n" %
           os.path.join("B", "F"),
           "Status against revision:      1\n" ])
   svntest.actions.run_and_verify_svn(expected,
diff --git a/subversion/tests/cmdline/svnadmin_tests.py b/subversion/tests/cmdline/svnadmin_tests.py
index bb71d3a..f49e796 100755
--- a/subversion/tests/cmdline/svnadmin_tests.py
+++ b/subversion/tests/cmdline/svnadmin_tests.py
@@ -3220,7 +3220,7 @@ def load_no_svndate_r0(sbox):
               b"Content-length: 10\n", b"\n",
               b"PROPS-END\n", b"\n"]
   svntest.actions.run_and_verify_load(sbox.repo_dir, dump_old)
-  
+
   # svn:date should have been removed
   svntest.actions.run_and_verify_svnlook([], [],
                                          'proplist', '--revprop', '-r0',
@@ -3859,7 +3859,7 @@ def dump_no_canonicalize_svndate(sbox):
                                      sbox.repo_url)
 
   dump_lines = svntest.actions.run_and_verify_dump(sbox.repo_dir)
-  assert propval + '\n' in dump_lines
+  assert propval.encode() + b'\n' in dump_lines
 
 def check_recover_prunes_rep_cache(sbox, enable_rep_sharing):
   """Check 'recover' prunes the rep-cache while enable-rep-sharing is
@@ -3965,6 +3965,100 @@ def dump_include_copied_directory(sbox):
   svntest.actions.run_and_verify_svn(expected_output, [],
                                      'log', '-v', '-q', sbox2.repo_url)
 
+def load_normalize_node_props(sbox):
+  "svnadmin load --normalize node props"
+
+  dump_str = b"""SVN-fs-dump-format-version: 2
+
+UUID: dc40867b-38f6-0310-9f5f-f81aa277e06f
+
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-05-03T19:09:41.129900Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 99
+Content-length: 99
+
+K 7
+svn:log
+V 0
+
+K 10
+svn:author
+V 2
+pl
+K 8
+svn:date
+V 27
+2005-05-03T19:10:19.975578Z
+PROPS-END
+
+Node-path: 
+Node-kind: dir
+Node-action: change
+Prop-content-length: 32
+Content-length: 32
+
+K 10
+svn:ignore
+V 3
+\n\r\n
+PROPS-END
+
+
+"""
+  sbox.build(empty=True)
+
+  # Try to load the dumpstream, expecting a failure (because of mixed
+  # EOLs in the svn:ignore property value).
+  exp_err = svntest.verify.RegexListOutput(['svnadmin: E125005:.*',
+                                            'svnadmin: E125017:.*'],
+                                           match_all=False)
+  load_and_verify_dumpstream(sbox, [], exp_err, dumpfile_revisions,
+                             False, dump_str, '--ignore-uuid')
+
+  # Now try it again with prop normalization.
+  svntest.actions.load_repo(sbox, dump_str=dump_str,
+                            bypass_prop_validation=False,
+                            normalize_props=True)
+  # We should get the normalized property value.
+  exit_code, output, _ = svntest.main.run_svn(None, 'pg', 'svn:ignore',
+                                              '--no-newline',
+                                              sbox.repo_url)
+  svntest.verify.verify_exit_code(None, exit_code, 0)
+  if output != ['\n', '\n']:
+    raise svntest.Failure("Unexpected property value %s" % output)
+
+@SkipUnless(svntest.main.is_fs_type_fsfs)
+@SkipUnless(svntest.main.fs_has_rep_sharing)
+@SkipUnless(svntest.main.python_sqlite_can_read_without_rowid)
+def build_repcache(sbox):
+  "svnadmin build-repcache"
+
+  sbox.build(create_wc = False)
+
+  # Remember and remove the existing rep-cache.
+  rep_cache = read_rep_cache(sbox.repo_dir)
+  rep_cache_path = os.path.join(sbox.repo_dir, 'db', 'rep-cache.db')
+  os.remove(rep_cache_path)
+
+  # Build a new rep-cache and compare with the original one.
+  expected_output = ["* Processed revision 1.\n"]
+  svntest.actions.run_and_verify_svnadmin(expected_output, [],
+                                          "build-repcache", sbox.repo_dir)
+
+  new_rep_cache = read_rep_cache(sbox.repo_dir)
+  if new_rep_cache != rep_cache:
+    raise svntest.Failure
+
+
 ########################################################################
 # Run the tests
 
@@ -4043,6 +4137,8 @@ test_list = [ None,
               recover_prunes_rep_cache_when_enabled,
               recover_prunes_rep_cache_when_disabled,
               dump_include_copied_directory,
+              load_normalize_node_props,
+              build_repcache,
              ]
 
 if __name__ == '__main__':
diff --git a/subversion/tests/cmdline/svneditor.py b/subversion/tests/cmdline/svneditor.py
index 375fc07..4699dc1 100755
--- a/subversion/tests/cmdline/svneditor.py
+++ b/subversion/tests/cmdline/svneditor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 #
 #  svneditor.py: a mock $SVN_EDITOR for the Subversion test suite
 #
diff --git a/subversion/tests/cmdline/svnfsfs_tests.py b/subversion/tests/cmdline/svnfsfs_tests.py
index aff3c2f..ccf5b3a 100755
--- a/subversion/tests/cmdline/svnfsfs_tests.py
+++ b/subversion/tests/cmdline/svnfsfs_tests.py
@@ -185,7 +185,7 @@ def test_stats(sbox):
                            '.*\d+ bytes in .*\d+ file property representations',
                            '.*\d+ average delta chain length',
                            '.*\d+ bytes in header & footer overhead' ],
-    '.* representation statistics:' : 
+    '.* representation statistics:' :
                           ['.*\d+ bytes in .*\d+ reps',
                            '.*\d+ bytes in .*\d+ shared reps',
                            '.*\d+ bytes expanded size',
diff --git a/subversion/tests/cmdline/svnmover_tests.py b/subversion/tests/cmdline/svnmover_tests.py
index 6c98b64..d0acd0f 100755
--- a/subversion/tests/cmdline/svnmover_tests.py
+++ b/subversion/tests/cmdline/svnmover_tests.py
@@ -1545,7 +1545,7 @@ def replace_via_rm_cp(sbox):
   """replace by deleting and copying"""
 
   sbox_build_svnmover(sbox)
-                 
+
   expected_eids = svntest.wc.State('', {
     'B0'     : Item(eid=0),
     'B0/X'   : Item(eid=1),
@@ -1572,7 +1572,7 @@ def replace_via_rm_cp(sbox):
   test_svnmover_verify_log(sbox.repo_url,
                            ['D /top0/X/A',
                             'A /top0/X/A (from /top0/X/A:1)'])
-                 
+
 @XFail()
 # After making a commit, svnmover currently can't (within the same execution)
 # look up paths in the revision it just committed.
diff --git a/subversion/tests/cmdline/svnserveautocheck.sh b/subversion/tests/cmdline/svnserveautocheck.sh
index 644a77e..8572cd6 100755
--- a/subversion/tests/cmdline/svnserveautocheck.sh
+++ b/subversion/tests/cmdline/svnserveautocheck.sh
@@ -134,7 +134,7 @@ random_port() {
   if [ -n "$BASH_VERSION" ]; then
     echo $(($RANDOM+1024))
   else
-    $PYTHON -c 'import random; print random.randint(1024, 2**16-1)'
+    $PYTHON -c 'import random; print(random.randint(1024, 2**16-1))'
   fi
 }
 
diff --git a/subversion/tests/cmdline/svntest/actions.py b/subversion/tests/cmdline/svntest/actions.py
index bb2ee63..91a88da 100644
--- a/subversion/tests/cmdline/svntest/actions.py
+++ b/subversion/tests/cmdline/svntest/actions.py
@@ -2181,7 +2181,7 @@ def set_prop(name, value, path, expected_re_string=None, force=None):
       file = None
   else:
     raise TypeError(value)
- 
+
   if file is None:
     propset += (name, value, path)
   else:
diff --git a/subversion/tests/cmdline/svntest/main.py b/subversion/tests/cmdline/svntest/main.py
index 38c03c5..a02733a 100644
--- a/subversion/tests/cmdline/svntest/main.py
+++ b/subversion/tests/cmdline/svntest/main.py
@@ -57,7 +57,7 @@ from svntest import Failure
 from svntest import Skip
 from svntest.wc import StateItem as Item
 
-SVN_VER_MINOR = 13
+SVN_VER_MINOR = 14
 
 ######################################################################
 #
diff --git a/subversion/tests/cmdline/svntest/wc.py b/subversion/tests/cmdline/svntest/wc.py
index ddfc439..1b703f1 100644
--- a/subversion/tests/cmdline/svntest/wc.py
+++ b/subversion/tests/cmdline/svntest/wc.py
@@ -829,7 +829,7 @@ class State:
       match = _re_parse_eid_ele.search(line)
       if match and match.group(2) != 'none':
         eid = match.group(1)
-        parent_eid = match.group(3) 
+        parent_eid = match.group(3)
         path = match.group(4)
         if path == '.':
           path = ''
@@ -851,7 +851,7 @@ class State:
     add_to_desc(eids, desc, branch_id)
 
     return cls('', desc)
-  
+
 
 class StateItem:
   """Describes an individual item within a working copy.
diff --git a/subversion/tests/cmdline/tree_conflict_tests.py b/subversion/tests/cmdline/tree_conflict_tests.py
index 61f3231..3edd00a 100755
--- a/subversion/tests/cmdline/tree_conflict_tests.py
+++ b/subversion/tests/cmdline/tree_conflict_tests.py
@@ -1518,7 +1518,7 @@ def local_missing_dir_endless_loop(sbox):
   sbox.simple_move('A/B', 'A/B2')
   sbox.simple_commit()
   sbox.simple_update()
-  main.file_append_binary(sbox.ospath("A/B2/lambda"), "This is more content.\n")
+  main.file_append(sbox.ospath("A/B2/lambda"), "This is more content.\n")
   sbox.simple_commit()
   sbox.simple_update()
 
@@ -1541,7 +1541,7 @@ interactive-conflicts = true
   # If everything works as expected the resolver will recommended a
   # resolution option and 'svn' will resolve the conflict automatically.
   # Verify that 'A1/B/lambda' contains the merged content:
-  contents = open(sbox.ospath('A1/B/lambda'), 'rb').readlines()
+  contents = open(sbox.ospath('A1/B/lambda'), 'r').readlines()
   svntest.verify.compare_and_display_lines(
     "A1/B/lambda has unexpectected contents", sbox.ospath("A1/B/lambda"),
     [ "This is the file 'lambda'.\n", "This is more content.\n"], contents)
diff --git a/subversion/tests/cmdline/update_tests.py b/subversion/tests/cmdline/update_tests.py
index fa6d0d7..bf967e5 100755
--- a/subversion/tests/cmdline/update_tests.py
+++ b/subversion/tests/cmdline/update_tests.py
@@ -3642,10 +3642,6 @@ def update_accept_conflicts(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  # Make a backup copy of the working copy
-  wc_backup = sbox.add_wc_path('backup')
-  svntest.actions.duplicate_dir(wc_dir, wc_backup)
-
   # Make a few local mods to files which will be committed
   iota_path = sbox.ospath('iota')
   lambda_path = sbox.ospath('A/B/lambda')
@@ -3653,13 +3649,25 @@ def update_accept_conflicts(sbox):
   alpha_path = sbox.ospath('A/B/E/alpha')
   beta_path = sbox.ospath('A/B/E/beta')
   pi_path = sbox.ospath('A/D/G/pi')
+  p_i_path = sbox.ospath('A/D/G/p; i')
   rho_path = sbox.ospath('A/D/G/rho')
+
+  # Rename pi to "p; i" so we can exercise SVN_EDITOR's handling of paths with
+  # special characters
+  sbox.simple_move('A/D/G/pi', 'A/D/G/p; i')
+  sbox.simple_commit()
+  sbox.simple_update()
+
+  # Make a backup copy of the working copy
+  wc_backup = sbox.add_wc_path('backup')
+  svntest.actions.duplicate_dir(wc_dir, wc_backup)
+
   svntest.main.file_append(lambda_path, 'Their appended text for lambda\n')
   svntest.main.file_append(iota_path, 'Their appended text for iota\n')
   svntest.main.file_append(mu_path, 'Their appended text for mu\n')
   svntest.main.file_append(alpha_path, 'Their appended text for alpha\n')
   svntest.main.file_append(beta_path, 'Their appended text for beta\n')
-  svntest.main.file_append(pi_path, 'Their appended text for pi\n')
+  svntest.main.file_append(p_i_path, 'Their appended text for pi\n')
   svntest.main.file_append(rho_path, 'Their appended text for rho\n')
 
   # Make a few local mods to files which will be conflicted
@@ -3668,7 +3676,7 @@ def update_accept_conflicts(sbox):
   mu_path_backup = os.path.join(wc_backup, 'A', 'mu')
   alpha_path_backup = os.path.join(wc_backup, 'A', 'B', 'E', 'alpha')
   beta_path_backup = os.path.join(wc_backup, 'A', 'B', 'E', 'beta')
-  pi_path_backup = os.path.join(wc_backup, 'A', 'D', 'G', 'pi')
+  p_i_path_backup = os.path.join(wc_backup, 'A', 'D', 'G', 'p; i')
   rho_path_backup = os.path.join(wc_backup, 'A', 'D', 'G', 'rho')
   svntest.main.file_append(iota_path_backup,
                            'My appended text for iota\n')
@@ -3680,7 +3688,7 @@ def update_accept_conflicts(sbox):
                            'My appended text for alpha\n')
   svntest.main.file_append(beta_path_backup,
                            'My appended text for beta\n')
-  svntest.main.file_append(pi_path_backup,
+  svntest.main.file_append(p_i_path_backup,
                            'My appended text for pi\n')
   svntest.main.file_append(rho_path_backup,
                            'My appended text for rho\n')
@@ -3692,18 +3700,19 @@ def update_accept_conflicts(sbox):
     'A/mu' : Item(verb='Sending'),
     'A/B/E/alpha': Item(verb='Sending'),
     'A/B/E/beta': Item(verb='Sending'),
-    'A/D/G/pi' : Item(verb='Sending'),
+    'A/D/G/p; i' : Item(verb='Sending'),
     'A/D/G/rho' : Item(verb='Sending'),
     })
 
-  expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
-  expected_status.tweak('iota', wc_rev=2)
-  expected_status.tweak('A/B/lambda', wc_rev=2)
-  expected_status.tweak('A/mu', wc_rev=2)
-  expected_status.tweak('A/B/E/alpha', wc_rev=2)
-  expected_status.tweak('A/B/E/beta', wc_rev=2)
-  expected_status.tweak('A/D/G/pi', wc_rev=2)
-  expected_status.tweak('A/D/G/rho', wc_rev=2)
+  expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+  expected_status.tweak('iota', wc_rev=3)
+  expected_status.tweak('A/B/lambda', wc_rev=3)
+  expected_status.tweak('A/mu', wc_rev=3)
+  expected_status.tweak('A/B/E/alpha', wc_rev=3)
+  expected_status.tweak('A/B/E/beta', wc_rev=3)
+  expected_status.rename({'A/D/G/pi': 'A/D/G/p; i'})
+  expected_status.tweak('A/D/G/p; i', wc_rev=3)
+  expected_status.tweak('A/D/G/rho', wc_rev=3)
 
   # Commit.
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -3719,14 +3728,14 @@ def update_accept_conflicts(sbox):
   # Just leave the conflicts alone, since run_and_verify_svn already uses
   # the --non-interactive option.
   svntest.actions.run_and_verify_svn(update_output_with_conflicts(
-                                       2, iota_path_backup),
+                                       3, iota_path_backup),
                                      [],
                                      'update', iota_path_backup)
 
   # lambda: --accept=postpone
   # Just leave the conflicts alone.
   svntest.actions.run_and_verify_svn(update_output_with_conflicts(
-                                       2, lambda_path_backup),
+                                       3, lambda_path_backup),
                                      [],
                                      'update', '--accept=postpone',
                                      lambda_path_backup)
@@ -3734,7 +3743,7 @@ def update_accept_conflicts(sbox):
   # mu: --accept=base
   # Accept the pre-update base file.
   svntest.actions.run_and_verify_svn(update_output_with_conflicts_resolved(
-                                       2, mu_path_backup),
+                                       3, mu_path_backup),
                                      [],
                                      'update', '--accept=base',
                                      mu_path_backup)
@@ -3742,7 +3751,7 @@ def update_accept_conflicts(sbox):
   # alpha: --accept=mine
   # Accept the user's working file.
   svntest.actions.run_and_verify_svn(update_output_with_conflicts_resolved(
-                                       2, alpha_path_backup),
+                                       3, alpha_path_backup),
                                      [],
                                      'update', '--accept=mine-full',
                                      alpha_path_backup)
@@ -3750,7 +3759,7 @@ def update_accept_conflicts(sbox):
   # beta: --accept=theirs
   # Accept their file.
   svntest.actions.run_and_verify_svn(update_output_with_conflicts_resolved(
-                                       2, beta_path_backup),
+                                       3, beta_path_backup),
                                      [],
                                      'update', '--accept=theirs-full',
                                      beta_path_backup)
@@ -3760,16 +3769,16 @@ def update_accept_conflicts(sbox):
   # conflicts in place, so expect a message on stderr, but expect
   # svn to exit with an exit code of 0.
   svntest.actions.run_and_verify_svn2(update_output_with_conflicts_resolved(
-                                        2, pi_path_backup),
+                                        3, p_i_path_backup),
                                       "system(.*) returned.*", 0,
                                       'update', '--accept=edit',
                                       '--force-interactive',
-                                      pi_path_backup)
+                                      p_i_path_backup)
 
   # rho: --accept=launch
   # Run the external merge tool, it should leave conflict markers in place.
   svntest.actions.run_and_verify_svn(update_output_with_conflicts(
-                                       2, rho_path_backup),
+                                       3, rho_path_backup),
                                      [],
                                      'update', '--accept=launch',
                                      '--force-interactive',
@@ -3781,55 +3790,57 @@ def update_accept_conflicts(sbox):
   expected_disk.tweak('iota', contents=("This is the file 'iota'.\n"
                                         '<<<<<<< .mine\n'
                                         'My appended text for iota\n'
-                                        '||||||| .r1\n'
+                                        '||||||| .r2\n'
                                         '=======\n'
                                         'Their appended text for iota\n'
-                                        '>>>>>>> .r2\n'))
+                                        '>>>>>>> .r3\n'))
   expected_disk.tweak('A/B/lambda', contents=("This is the file 'lambda'.\n"
                                               '<<<<<<< .mine\n'
                                               'My appended text for lambda\n'
-                                              '||||||| .r1\n'
+                                              '||||||| .r2\n'
                                               '=======\n'
                                               'Their appended text for lambda\n'
-                                              '>>>>>>> .r2\n'))
+                                              '>>>>>>> .r3\n'))
   expected_disk.tweak('A/mu', contents="This is the file 'mu'.\n")
   expected_disk.tweak('A/B/E/alpha', contents=("This is the file 'alpha'.\n"
                                                'My appended text for alpha\n'))
   expected_disk.tweak('A/B/E/beta', contents=("This is the file 'beta'.\n"
                                               'Their appended text for beta\n'))
-  expected_disk.tweak('A/D/G/pi', contents=("This is the file 'pi'.\n"
-                                             '<<<<<<< .mine\n'
-                                             'My appended text for pi\n'
-                                             '||||||| .r1\n'
-                                             '=======\n'
-                                             'Their appended text for pi\n'
-                                             '>>>>>>> .r2\n'
-                                             'foo\n'))
+  expected_disk.rename({'A/D/G/pi': 'A/D/G/p; i'})
+  expected_disk.tweak('A/D/G/p; i', contents=("This is the file 'pi'.\n"
+                                              '<<<<<<< .mine\n'
+                                              'My appended text for pi\n'
+                                              '||||||| .r2\n'
+                                              '=======\n'
+                                              'Their appended text for pi\n'
+                                              '>>>>>>> .r3\n'
+                                              'foo\n'))
   expected_disk.tweak('A/D/G/rho', contents=("This is the file 'rho'.\n"
                                              '<<<<<<< .mine\n'
                                              'My appended text for rho\n'
-                                             '||||||| .r1\n'
+                                             '||||||| .r2\n'
                                              '=======\n'
                                              'Their appended text for rho\n'
-                                             '>>>>>>> .r2\n'
+                                             '>>>>>>> .r3\n'
                                              'foo\n'))
 
   # Set the expected extra files for the test
-  extra_files = ['iota.*\.r1', 'iota.*\.r2', 'iota.*\.mine',
-                 'lambda.*\.r1', 'lambda.*\.r2', 'lambda.*\.mine',
-                 'rho.*\.r1', 'rho.*\.r2', 'rho.*\.mine']
+  extra_files = ['iota.*\.r2', 'iota.*\.r3', 'iota.*\.mine',
+                 'lambda.*\.r2', 'lambda.*\.r3', 'lambda.*\.mine',
+                 'rho.*\.r2', 'rho.*\.r3', 'rho.*\.mine']
 
   # Set the expected status for the test
-  expected_status = svntest.actions.get_virginal_state(wc_backup, 2)
+  expected_status = svntest.actions.get_virginal_state(wc_backup, 3)
+  expected_status.rename({'A/D/G/pi': 'A/D/G/p; i'})
   expected_status.tweak('iota', 'A/B/lambda', 'A/mu',
                         'A/B/E/alpha', 'A/B/E/beta',
-                        'A/D/G/pi', 'A/D/G/rho', wc_rev=2)
+                        'A/D/G/p; i', 'A/D/G/rho', wc_rev=3)
   expected_status.tweak('iota', status='C ')
   expected_status.tweak('A/B/lambda', status='C ')
   expected_status.tweak('A/mu', status='M ')
   expected_status.tweak('A/B/E/alpha', status='M ')
   expected_status.tweak('A/B/E/beta', status='  ')
-  expected_status.tweak('A/D/G/pi', status='M ')
+  expected_status.tweak('A/D/G/p; i', status='M ')
   expected_status.tweak('A/D/G/rho', status='C ')
 
   # Set the expected output for the test
@@ -6843,16 +6854,16 @@ def update_delete_switched(sbox):
 @XFail()
 def update_add_missing_local_add(sbox):
   "update adds missing local addition"
-  
+
   sbox.build(read_only=True)
-  
+
   # Note that updating 'A' to r0 doesn't reproduce this issue...
   sbox.simple_update('', revision='0')
   sbox.simple_mkdir('A')
   sbox.simple_add_text('mumumu', 'A/mu')
   os.unlink(sbox.ospath('A/mu'))
   os.rmdir(sbox.ospath('A'))
-  
+
   sbox.simple_update()
 
 # Verify that deleting an unmodified directory leaves behind any unversioned
diff --git a/subversion/tests/libsvn_client/client-test.c b/subversion/tests/libsvn_client/client-test.c
index d8603f5..956642f 100644
--- a/subversion/tests/libsvn_client/client-test.c
+++ b/subversion/tests/libsvn_client/client-test.c
@@ -61,7 +61,7 @@ create_greek_repos(const char **repos_url,
   svn_fs_txn_t *txn;
   svn_fs_root_t *txn_root;
 
-  /* Create a filesytem and repository. */
+  /* Create a filesystem and repository. */
   SVN_ERR(svn_test__create_repos(
               &repos, svn_test_data_path(name, pool), opts, pool));
 
@@ -372,7 +372,7 @@ test_patch(const svn_test_opts_t *opts,
     "+It is really the file 'gamma'."
   };
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "test-patch-repos", opts, pool));
 
   /* Check out the HEAD revision */
@@ -447,7 +447,7 @@ test_wc_add_scenarios(const svn_test_opts_t *opts,
   const char *ex_dir_path;
   const char *ex2_dir_path;
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "test-wc-add-repos", opts, pool));
   committed_rev = 1;
 
@@ -576,7 +576,7 @@ test_copy_crash(const svn_test_opts_t *opts,
   const char *dest;
   const char *repos_url;
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "test-copy-crash", opts, pool));
 
   SVN_ERR(svn_client_create_context(&ctx, pool));
@@ -610,7 +610,7 @@ test_16k_add(const svn_test_opts_t *opts,
   apr_pool_t *iterpool = svn_pool_create(pool);
   int i;
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "test-16k-repos", opts, pool));
 
   /* Check out the HEAD revision */
@@ -671,7 +671,7 @@ test_youngest_common_ancestor(const svn_test_opts_t *opts,
   const char *dest;
   svn_client__pathrev_t *yc_ancestor;
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "test-youngest-common-ancestor", opts, pool));
 
   SVN_ERR(svn_client_create_context(&ctx, pool));
@@ -739,7 +739,7 @@ test_foreign_repos_copy(const svn_test_opts_t *opts,
   svn_ra_session_t *ra_session;
   svn_client__pathrev_t *loc;
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "foreign-copy1", opts, pool));
   SVN_ERR(create_greek_repos(&repos2_url, "foreign-copy2", opts, pool));
 
@@ -798,7 +798,7 @@ test_suggest_mergesources(const svn_test_opts_t *opts,
 
   peg_rev.kind = svn_opt_revision_unspecified;
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "mergesources", opts, pool));
 
   SVN_ERR(svn_client_create_context(&ctx, pool));
@@ -939,7 +939,7 @@ test_remote_only_status(const svn_test_opts_t *opts, apr_pool_t *pool)
 
   SVN_ERR(svn_stream_mark(contentstream, &start, pool));
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "test-remote-only-status", opts, pool));
 
   SVN_ERR(svn_client_create_context(&ctx, pool));
@@ -1107,7 +1107,7 @@ test_copy_pin_externals(const svn_test_opts_t *opts,
     { NULL },
   };
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "pin-externals", opts, pool));
 
   wc_path = svn_test_data_path("pin-externals-working-copy", pool);
@@ -1334,7 +1334,7 @@ test_copy_pin_externals_select_subtree(const svn_test_opts_t *opts, apr_pool_t *
     { NULL },
   };
 
-  /* Create a filesytem and repository containing the Greek tree. */
+  /* Create a filesystem and repository containing the Greek tree. */
   SVN_ERR(create_greek_repos(&repos_url, "pin-externals-select-subtree",
                              opts, pool));
 
diff --git a/subversion/tests/libsvn_client/conflicts-test.c b/subversion/tests/libsvn_client/conflicts-test.c
index 54e0181..cc71283 100644
--- a/subversion/tests/libsvn_client/conflicts-test.c
+++ b/subversion/tests/libsvn_client/conflicts-test.c
@@ -154,7 +154,7 @@ assert_text_conflict_options(svn_client_conflict_t *conflict,
   return SVN_NO_ERROR;
 }
 
-/* 
+/*
  * The following tests verify resolution of "incoming file add vs.
  * local file obstruction upon merge" tree conflicts.
  */
@@ -482,7 +482,7 @@ test_merge_incoming_added_file_replace_and_merge(const svn_test_opts_t *opts,
   return SVN_NO_ERROR;
 }
 
-/* 
+/*
  * The following tests verify resolution of "incoming dir add vs.
  * local dir obstruction upon merge" tree conflicts.
  */
@@ -1453,7 +1453,7 @@ test_merge_incoming_delete_file_ignore(const svn_test_opts_t *opts,
   SVN_TEST_ASSERT(!status->file_external);
   SVN_TEST_ASSERT(status->moved_from_abspath == NULL);
   SVN_TEST_ASSERT(status->moved_to_abspath == NULL);
-  
+
   SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, deleted_path),
                                   ctx, b->pool, b->pool));
 
@@ -1806,7 +1806,7 @@ test_update_incoming_delete_file_ignore(const svn_test_opts_t *opts,
   SVN_TEST_ASSERT(!status->file_external);
   SVN_TEST_ASSERT(status->moved_from_abspath == NULL);
   SVN_TEST_ASSERT(status->moved_to_abspath == NULL);
-  
+
   SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, deleted_path),
                                   ctx, b->pool, b->pool));
 
@@ -2116,7 +2116,7 @@ create_wc_with_incoming_delete_dir_conflict(svn_test__sandbox_t *b,
   if (local_add)
     {
       const char *new_child_path;
-      
+
       new_child_path = svn_relpath_join(branch_path,
                                         svn_relpath_join(deleted_dir_name,
                                                          new_file_name_branch,
@@ -4127,7 +4127,7 @@ create_wc_with_dir_add_vs_dir_add_update_conflict(
     SVN_ERR(svn_io_dir_make(sbox_wc_path(b, new_file_child_path),
                             APR_OS_DEFAULT, b->pool));
 
-  /* Update to the HEAD revision. 
+  /* Update to the HEAD revision.
    * This should raise an "incoming add vs local add" tree conflict. */
   SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM));
 
@@ -5026,7 +5026,7 @@ test_cherry_pick_post_move_edit(const svn_test_opts_t *opts,
 
   /* And "A1/mu" should have expected contents. */
   SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/mu"), pool));
-  SVN_TEST_STRING_ASSERT(buf->data, 
+  SVN_TEST_STRING_ASSERT(buf->data,
     "<<<<<<< .working" "\n"
     "This is the file 'mu'." "\n"
     "||||||| .old" "\n"
@@ -6732,7 +6732,7 @@ test_merge_file_move_vs_file_move_accept_move(const svn_test_opts_t *opts,
   struct status_baton sb;
   struct svn_client_status_t *status;
 
-  SVN_ERR(svn_test__sandbox_create(b, 
+  SVN_ERR(svn_test__sandbox_create(b,
                                    "merge_file_move_vs_file_move_accept_move",
                                    opts, pool));
 
diff --git a/subversion/tests/libsvn_fs/fs-test.c b/subversion/tests/libsvn_fs/fs-test.c
index 0033e6d..42f11ca 100644
--- a/subversion/tests/libsvn_fs/fs-test.c
+++ b/subversion/tests/libsvn_fs/fs-test.c
@@ -7219,7 +7219,7 @@ test_cache_clear_during_stream(const svn_test_opts_t *opts,
    * Just to be sure, make it not too uniform to keep self-txdelta at bay. */
   SVN_ERR(svn_fs_apply_textdelta(&consumer_func, &consumer_baton,
                                  txn_root, "/foo", NULL, NULL, subpool));
-  stream = svn_txdelta_target_push(consumer_func, consumer_baton, 
+  stream = svn_txdelta_target_push(consumer_func, consumer_baton,
                                    svn_stream_empty(subpool), subpool);
   for (i = 0; i < 10000; ++ i)
     {
diff --git a/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c b/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
index 469eb4e..e313a48 100644
--- a/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
+++ b/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
@@ -59,7 +59,8 @@ static const char *
 get_rev_contents(svn_revnum_t rev, apr_pool_t *pool)
 {
   /* Toss in a bunch of magic numbers for spice. */
-  apr_int64_t num = ((rev * 1234353 + 4358) * 4583 + ((rev % 4) << 1)) / 42;
+  apr_int64_t rev64 = rev;
+  apr_int64_t num = ((rev64 * 1234353 + 4358) * 4583 + ((rev64 % 4) << 1)) / 42;
   return apr_psprintf(pool, "%" APR_INT64_T_FMT "\n", num);
 }
 
@@ -1693,7 +1694,7 @@ compare_0_length_rep(const svn_test_opts_t *opts,
 
   enum { COUNT = 5 };
   const char *file_names[COUNT] = { no_rep_file,
-                                    empty_plain_file, 
+                                    empty_plain_file,
                                     plain_file,
                                     empty_delta_file,
                                     delta_file };
diff --git a/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c b/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
index 51bfac2..9f788a3 100644
--- a/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
+++ b/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
@@ -35,6 +35,8 @@
 #include "private/svn_subr_private.h"
 
 #include "../../libsvn_fs_fs/index.h"
+#include "../../libsvn_fs_fs/rep-cache.h"
+#include "../../libsvn_fs/fs-loader.h"
 
 #include "../svn_test_fs.h"
 
@@ -440,6 +442,63 @@ load_index(const svn_test_opts_t *opts, apr_pool_t *pool)
 
 #undef REPO_NAME
 
+/* ------------------------------------------------------------------------ */
+
+static svn_error_t *
+build_rep_cache(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+  svn_fs_t *fs;
+  fs_fs_data_t *ffd;
+  svn_fs_txn_t *txn;
+  svn_fs_root_t *txn_root;
+  svn_revnum_t rev;
+  svn_boolean_t exists;
+  const char *fs_path;
+  svn_fs_fs__ioctl_build_rep_cache_input_t input = {0};
+
+  /* Bail (with success) on known-untestable scenarios */
+  if (strcmp(opts->fs_type, "fsfs") != 0)
+    return svn_error_create(SVN_ERR_TEST_SKIPPED, NULL,
+                            "this will test FSFS repositories only");
+
+  if (opts->server_minor_version && (opts->server_minor_version < 6))
+    return svn_error_create(SVN_ERR_TEST_SKIPPED, NULL,
+                            "pre-1.6 SVN doesn't support FSFS rep-sharing");
+
+  /* Create a filesystem and explicitly disable rep-sharing. */
+  fs_path = "test-repo-build-rep-cache-test";
+  SVN_ERR(svn_test__create_fs2(&fs, fs_path, opts, NULL, pool));
+  ffd = fs->fsap_data;
+  ffd->rep_sharing_allowed = FALSE;
+
+  /* Add the Greek tree. */
+  SVN_ERR(svn_fs_begin_txn(&txn, fs, 0, pool));
+  SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
+  SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
+  SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, pool));
+  SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
+
+  /* Make sure the rep-cache does not exist. */
+  SVN_ERR(svn_fs_fs__exists_rep_cache(&exists, fs, pool));
+  SVN_TEST_ASSERT(!exists);
+
+  /* Build and verify the rep-cache. */
+  ffd->rep_sharing_allowed = TRUE;
+
+  input.start_rev = rev;
+  input.end_rev = rev;
+  SVN_ERR(svn_fs_ioctl(fs, SVN_FS_FS__IOCTL_BUILD_REP_CACHE,
+                       &input, NULL, NULL, NULL, pool, pool));
+
+  SVN_ERR(svn_fs_fs__exists_rep_cache(&exists, fs, pool));
+  SVN_TEST_ASSERT(exists);
+
+  SVN_ERR(svn_fs_verify(fs_path, NULL, 0, SVN_INVALID_REVNUM,
+                        NULL, NULL, NULL, NULL, pool));
+
+  return SVN_NO_ERROR;
+}
+
 
 
 /* The test table.  */
@@ -455,6 +514,8 @@ static struct svn_test_descriptor_t test_funcs[] =
                        "dump the P2L index"),
     SVN_TEST_OPTS_PASS(load_index,
                        "load the P2L index"),
+    SVN_TEST_OPTS_PASS(build_rep_cache,
+                       "build the representation cache"),
     SVN_TEST_NULL
   };
 
diff --git a/subversion/tests/libsvn_ra/ra-test.c b/subversion/tests/libsvn_ra/ra-test.c
index beee607..8cdaa2c 100644
--- a/subversion/tests/libsvn_ra/ra-test.c
+++ b/subversion/tests/libsvn_ra/ra-test.c
@@ -62,7 +62,8 @@ make_and_open_repos(svn_ra_session_t **session,
                                   pool, pool));
   SVN_ERR(svn_ra_initialize(pool));
 
-  SVN_ERR(svn_ra_open4(session, NULL, url, NULL, cbtable, NULL, NULL, pool));
+  SVN_ERR(svn_ra_open5(session, NULL, NULL, url, NULL, cbtable, NULL, NULL,
+                       pool));
 
   return SVN_NO_ERROR;
 }
@@ -387,7 +388,7 @@ check_tunnel_callback_test(const svn_test_opts_t *opts,
                                          NULL, NULL, NULL, pool));
 
   b->last_check = TRUE;
-  SVN_TEST_ASSERT_ERROR(svn_ra_open4(&session, NULL,
+  SVN_TEST_ASSERT_ERROR(svn_ra_open5(&session, NULL, NULL,
                                      "svn+foo://localhost/no-repo",
                                      NULL, cbtable, NULL, NULL, pool),
                         SVN_ERR_RA_CANNOT_CREATE_SESSION);
@@ -430,7 +431,7 @@ tunnel_callback_test(const svn_test_opts_t *opts,
                                          NULL, NULL, NULL, pool));
 
   b->last_check = FALSE;
-  SVN_ERR(svn_ra_open4(&session, NULL, url, NULL, cbtable, NULL, NULL,
+  SVN_ERR(svn_ra_open5(&session, NULL, NULL, url, NULL, cbtable, NULL, NULL,
                         scratch_pool));
   SVN_TEST_ASSERT(b->last_check);
   SVN_TEST_ASSERT(b->open_count > 0);
@@ -1591,7 +1592,7 @@ tunnel_run_checkout(const svn_test_opts_t *opts,
 
   b->last_check = FALSE;
 
-  SVN_ERR(svn_ra_open4(&session, NULL, url, NULL, cbtable, NULL, NULL,
+  SVN_ERR(svn_ra_open5(&session, NULL, NULL, url, NULL, cbtable, NULL, NULL,
                        scratch_pool));
 
   SVN_ERR(commit_changes(session, pool));
@@ -1661,16 +1662,16 @@ commit_empty_last_change(const svn_test_opts_t *opts,
       SVN_ERR(svn_ra_get_commit_editor3(session, &editor, &edit_baton,
                                         revprop_table,
                                         NULL, NULL, NULL, TRUE, tmp_pool));
-      
+
       SVN_ERR(editor->open_root(edit_baton, 1, tmp_pool, &root_baton));
       SVN_ERR(editor->close_directory(root_baton, tmp_pool));
       SVN_ERR(editor->close_edit(edit_baton, tmp_pool));
-      
+
       SVN_ERR(svn_ra_stat(session, "", 2+i, &dirent, tmp_pool));
-      
+
       SVN_TEST_ASSERT(dirent != NULL);
       SVN_TEST_STRING_ASSERT(dirent->last_author, "jrandom");
-      
+
       /* BDB used to only updates last_changed on the repos_root when there
          was an actual change. Now all filesystems behave in the same way */
       SVN_TEST_INT_ASSERT(dirent->created_rev, 2+i);
@@ -1733,7 +1734,7 @@ commit_locked_file(const svn_test_opts_t *opts, apr_pool_t *pool)
   SVN_ERR(svn_ra_create_callbacks(&cbtable, pool));
   SVN_ERR(svn_test__init_auth_baton(&cbtable->auth_baton, pool));
 
-  SVN_ERR(svn_ra_open4(&session, NULL, url, NULL, cbtable,
+  SVN_ERR(svn_ra_open5(&session, NULL, NULL, url, NULL, cbtable,
                        NULL, NULL, pool));
   SVN_ERR(svn_ra_get_commit_editor3(session, &editor, &edit_baton,
                                     apr_hash_make(pool),
@@ -1766,7 +1767,7 @@ commit_locked_file(const svn_test_opts_t *opts, apr_pool_t *pool)
   }
 
   /* Open a new session using the file parent's URL. */
-  SVN_ERR(svn_ra_open4(&session, NULL, url, NULL, cbtable,
+  SVN_ERR(svn_ra_open5(&session, NULL, NULL, url, NULL, cbtable,
                        NULL, NULL, pool));
 
   /* Create a new commit editor supplying our lock token. */
diff --git a/subversion/tests/libsvn_repos/authz-test.c b/subversion/tests/libsvn_repos/authz-test.c
index fecafc8..33e9323 100644
--- a/subversion/tests/libsvn_repos/authz-test.c
+++ b/subversion/tests/libsvn_repos/authz-test.c
@@ -481,7 +481,7 @@ issue_4741_groups(apr_pool_t *pool)
 static svn_error_t *
 reposful_reposless_stanzas_inherit(apr_pool_t *pool)
 {
-  const char rules[] = 
+  const char rules[] =
     "[groups]"                               NL
     "company = user1, user2, user3"          NL
     "customer = customer1, customer2"        NL
diff --git a/subversion/tests/libsvn_repos/repos-test.c b/subversion/tests/libsvn_repos/repos-test.c
index 63b76e1..5c3fb00 100644
--- a/subversion/tests/libsvn_repos/repos-test.c
+++ b/subversion/tests/libsvn_repos/repos-test.c
@@ -4154,7 +4154,7 @@ mkdir_delete_copy(svn_repos_t *repos,
   svn_fs_root_t *txn_root, *rev_root;
 
   SVN_ERR(svn_fs_youngest_rev(&youngest_rev, fs, pool));
-  
+
   SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, pool));
   SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
   SVN_ERR(svn_fs_make_dir(txn_root, "A/T", pool));
diff --git a/subversion/tests/libsvn_subr/io-test.c b/subversion/tests/libsvn_subr/io-test.c
index e702367..c31dc4c 100644
--- a/subversion/tests/libsvn_subr/io-test.c
+++ b/subversion/tests/libsvn_subr/io-test.c
@@ -1176,7 +1176,7 @@ test_apr_trunc_workaround(apr_pool_t *pool)
   SVN_ERR(svn_io_file_seek(f, APR_CUR, &offset, pool));
   SVN_TEST_ASSERT(offset == (int)len);
 
-  return SVN_NO_ERROR;  
+  return SVN_NO_ERROR;
 }
 
 
diff --git a/subversion/tests/libsvn_subr/mergeinfo-test.c b/subversion/tests/libsvn_subr/mergeinfo-test.c
index e9a57a2..5b0da9a 100644
--- a/subversion/tests/libsvn_subr/mergeinfo-test.c
+++ b/subversion/tests/libsvn_subr/mergeinfo-test.c
@@ -33,6 +33,8 @@
 #include "svn_types.h"
 #include "svn_mergeinfo.h"
 #include "private/svn_mergeinfo_private.h"
+#include "private/svn_sorts_private.h"
+#include "private/svn_error_private.h"
 #include "../svn_test.h"
 
 /* A quick way to create error messages.  */
@@ -1783,6 +1785,701 @@ test_rangelist_loop(apr_pool_t *pool)
 
   return SVN_NO_ERROR;
 }
+
+/* A specific case where result was non-canonical, around svn 1.10 ~ 1.13. */
+static svn_error_t *
+test_rangelist_merge_canonical_result(apr_pool_t *pool)
+{
+  const char *rangelist_str = "8-10";
+  const char *changes_str = "5-10*,11-24";
+  const char *expected_str = "5-7*,8-24";
+  /* wrong result: "5-7*,8-10,11-24" */
+  svn_rangelist_t *rangelist, *changes;
+  svn_string_t *result_string;
+
+  /* prepare the inputs */
+  SVN_ERR(svn_rangelist__parse(&rangelist, rangelist_str, pool));
+  SVN_ERR(svn_rangelist__parse(&changes, changes_str, pool));
+  SVN_TEST_ASSERT(svn_rangelist__is_canonical(rangelist));
+  SVN_TEST_ASSERT(svn_rangelist__is_canonical(changes));
+
+  /* perform the merge */
+  SVN_ERR(svn_rangelist_merge2(rangelist, changes, pool, pool));
+
+  /* check the output */
+  SVN_TEST_ASSERT(svn_rangelist__is_canonical(rangelist));
+  SVN_ERR(svn_rangelist_to_string(&result_string, rangelist, pool));
+  SVN_TEST_STRING_ASSERT(result_string->data, expected_str);
+
+  return SVN_NO_ERROR;
+}
+
+/* Test svn_rangelist_merge2() with specific inputs derived from an
+ * occurrence of issue #4840 "in the wild", that triggered a hard
+ * assertion failure (abort) in a 1.10.6 release-mode build.
+ */
+static svn_error_t *
+test_rangelist_merge_array_insert_failure(apr_pool_t *pool)
+{
+  svn_rangelist_t *rx, *ry;
+  svn_string_t *rxs;
+
+  /* Simplified case with same failure mode as reported case: error
+   * "E200004: svn_sort__array_insert2:
+   *  Attempted insert at index 4 in array length 3" */
+  SVN_ERR(svn_rangelist__parse(&rx, "2*,4*,6*,8", pool));
+  SVN_ERR(svn_rangelist__parse(&ry, "1-9*,11", pool));
+  SVN_ERR(svn_rangelist_merge2(rx, ry, pool, pool));
+  SVN_ERR(svn_rangelist_to_string(&rxs, rx, pool));
+  SVN_TEST_STRING_ASSERT(rxs->data, "1-7*,8,9*,11");
+
+  /* Actual reported case: in v1.10.6, aborted; after r1872118, error
+   * "E200004: svn_sort__array_insert2:
+   *  Attempted insert at index 57 in array length 55".  The actual "index"
+   *  and "array length" numbers vary with changes such as r1823728. */
+  SVN_ERR(svn_rangelist__parse(&rx, "997347-997597*,997884-1000223*,1000542-1000551*,1001389-1001516,1002139-1002268*,1002896-1003064*,1003320-1003468,1005939-1006089*,1006443-1006630*,1006631-1006857,1007028-1007116*,1009467-1009629,1009630-1010007*,1010774-1010860,1011036-1011502,1011672-1014004*,1014023-1014197,1014484-1014542*,1015077-1015568,1016219-1016365,1016698-1016845,1017331-1018616,1027032-1027180,1027855-1028051,1028261-1028395,1028553-1028663,1028674-1028708,1028773-1028891*,1029223-1030557,1032239-1032284*,1032801-1032959,1032960-1033074*,1033745-1033810,1034990-1035104,1035435-1036108*,1036109-1036395,1036396-1036865*,1036866-1036951,1036952-1037647*,1037648-1037750,1037751-1038548*,1038549-1038700,1038701-1042103*,1042104-1042305,1042306-1046626*,1046627-1046910,1046911-1047676*,1047677-1047818,1047819-1047914*,1047915-1048025,1048026-1048616*,1048617-1048993,1048994-1050066*,1054605-1054739,1054854-1055021", pool));
+  SVN_ERR(svn_rangelist__parse(&ry, "1035435-1050066*,1052459-1054617", pool));
+  SVN_ERR(svn_rangelist_merge2(rx, ry, pool, pool));
+  /* Here we don't care to check the result; just that it returns "success". */
+  return SVN_NO_ERROR;
+}
+
+
+/* Random testing parameters and coverage
+ *
+ * The parameters for testing random inputs, in conjunction with the
+ * specific test case generation code, were adjusted so as to observe the
+ * tests generating each of the known failure modes.  The aim is also to
+ * have sufficient coverage of inputs to discover other failure modes in
+ * future if the code is changed.
+ *
+ * There are neither theoretic nor empirical guarantees on the coverage.
+ */
+
+/* Randomize revision numbers over this small range.
+ * (With a larger range, we would find edge cases more rarely.)
+ * See comment "Random testing parameters and coverage" */
+#define RANGELIST_TESTS_MAX_REV 15
+
+/* A representation of svn_rangelist_t in which
+ *   root[R]    := (revision R is in the rangelist)
+ *   inherit[R] := (revision R is in the rangelist and inheritable)
+ *
+ * Assuming all forward ranges.
+ */
+typedef struct rl_array_t {
+    svn_boolean_t root[RANGELIST_TESTS_MAX_REV + 1];
+    svn_boolean_t inherit[RANGELIST_TESTS_MAX_REV + 1];
+} rl_array_t;
+
+static void
+rangelist_to_array(rl_array_t *a,
+                   const svn_rangelist_t *rl)
+{
+  int i;
+
+  memset(a, 0, sizeof(*a));
+  for (i = 0; i < rl->nelts; i++)
+    {
+      svn_merge_range_t *range = APR_ARRAY_IDX(rl, i, svn_merge_range_t *);
+      svn_revnum_t r;
+
+      for (r = range->start + 1; r <= range->end; r++)
+        {
+          a->root[r] = TRUE;
+          a->inherit[r] = range->inheritable;
+        }
+    }
+}
+
+/* Compute the union of two rangelists arrays.
+ * Let MA := union(BA, CA)
+ */
+static void
+rangelist_array_union(rl_array_t *ma,
+                      const rl_array_t *ba,
+                      const rl_array_t *ca)
+{
+  svn_revnum_t r;
+
+  for (r = 0; r <= RANGELIST_TESTS_MAX_REV; r++)
+    {
+      ma->root[r]    = ba->root[r]    || ca->root[r];
+      ma->inherit[r] = ba->inherit[r] || ca->inherit[r];
+    }
+}
+
+/* Return TRUE iff two rangelist arrays are equal.
+ */
+static svn_boolean_t
+rangelist_array_equal(const rl_array_t *ba,
+                      const rl_array_t *ca)
+{
+  svn_revnum_t r;
+
+  for (r = 0; r <= RANGELIST_TESTS_MAX_REV; r++)
+    {
+      if (ba->root[r]    != ca->root[r]
+       || ba->inherit[r] != ca->inherit[r])
+        {
+          return FALSE;
+        }
+    }
+  return TRUE;
+}
+
+#define IS_VALID_FORWARD_RANGE(range) \
+  (SVN_IS_VALID_REVNUM((range)->start) && ((range)->start < (range)->end))
+
+/* Check rangelist is sorted and contains forward ranges. */
+static svn_boolean_t
+rangelist_is_sorted(const svn_rangelist_t *rangelist)
+{
+  int i;
+
+  for (i = 0; i < rangelist->nelts; i++)
+    {
+      const svn_merge_range_t *thisrange
+        = APR_ARRAY_IDX(rangelist, i, svn_merge_range_t *);
+
+      if (!IS_VALID_FORWARD_RANGE(thisrange))
+        return FALSE;
+    }
+  for (i = 1; i < rangelist->nelts; i++)
+    {
+      const svn_merge_range_t *lastrange
+        = APR_ARRAY_IDX(rangelist, i-1, svn_merge_range_t *);
+      const svn_merge_range_t *thisrange
+        = APR_ARRAY_IDX(rangelist, i, svn_merge_range_t *);
+
+      if (svn_sort_compare_ranges(&lastrange, &thisrange) > 0)
+        return FALSE;
+    }
+  return TRUE;
+}
+
+/* Return a random number R, where 0 <= R < N.
+ */
+static int rand_less_than(int n, apr_uint32_t *seed)
+{
+  apr_uint32_t next = svn_test_rand(seed);
+  return ((apr_uint64_t)next * n) >> 32;
+}
+
+/* Return a random integer in a triangular (centre-weighted) distribution in
+ * the inclusive interval [MIN, MAX]. */
+static int
+rand_interval_triangular(int min, int max, apr_uint32_t *seed)
+{
+  int span = max - min + 1;
+
+  return min + rand_less_than(span/2 + 1, seed)
+             + rand_less_than((span+1)/2, seed);
+}
+
+/* Generate a rangelist with a random number of random ranges.
+ * Choose from 0 to NON_V_MAX_RANGES ranges, biased towards the middle.
+ */
+#define NON_V_MAX_RANGES 4  /* See "Random testing parameters and coverage" */
+static void
+rangelist_random_non_validated(svn_rangelist_t **rl,
+                               apr_uint32_t *seed,
+                               apr_pool_t *pool)
+{
+  svn_rangelist_t *r = apr_array_make(pool, NON_V_MAX_RANGES,
+                                      sizeof(svn_merge_range_t *));
+  int n_ranges = rand_interval_triangular(0, NON_V_MAX_RANGES, seed);
+  int i;
+
+  for (i = 0; i < n_ranges; i++)
+    {
+      svn_merge_range_t *mrange = apr_pcalloc(pool, sizeof(*mrange));
+
+      mrange->start = rand_less_than(RANGELIST_TESTS_MAX_REV + 1, seed);
+      mrange->end = rand_less_than(RANGELIST_TESTS_MAX_REV + 1, seed);
+      mrange->inheritable = rand_less_than(2, seed);
+      APR_ARRAY_PUSH(r, svn_merge_range_t *) = mrange;
+    }
+  *rl = r;
+}
+
+/* Compare two integers pointed to by A_P and B_P, for use with qsort(). */
+static int
+int_compare(const void *a_p, const void *b_p)
+{
+  const int *a = a_p, *b = b_p;
+
+  return (*a < *b) ? -1 : (*a > *b) ? 1 : 0;
+}
+
+/* Fill an ARRAY[ARRAY_LENGTH] with values each in the inclusive range
+ * [0, MAX].  The values are in ascending order, possibly with the same
+ * value repeated any number of times.
+ */
+static void
+ascending_values(int *array,
+                 int array_length,
+                 int max,
+                 apr_uint32_t *seed)
+{
+  int i;
+
+  for (i = 0; i < array_length; i++)
+    array[i] = rand_less_than(max + 1, seed);
+  /* Sort them. (Some values will be repeated.) */
+  qsort(array, array_length, sizeof(*array), int_compare);
+}
+
+/* Generate a random rangelist that is not necessarily canonical
+ * but is at least sorted according to svn_sort_compare_ranges()
+ * and on which svn_rangelist__canonicalize() would succeed.
+ * Choose from 0 to SEMI_C_MAX_RANGES ranges, biased towards the middle.
+ */
+#define SEMI_C_MAX_RANGES 8
+static void
+rangelist_random_semi_canonical(svn_rangelist_t **rl,
+                                apr_uint32_t *seed,
+                                apr_pool_t *pool)
+{
+  svn_rangelist_t *r = apr_array_make(pool, 4, sizeof(svn_merge_range_t *));
+  int n_ranges = rand_interval_triangular(0, SEMI_C_MAX_RANGES, seed);
+  int start_and_end_revs[SEMI_C_MAX_RANGES * 2];
+  int i;
+
+  /* Choose start and end revs of the ranges. To end up with ranges evenly
+   * distributed up to RANGELIST_TESTS_MAX_REV, we start with them evenly
+   * distributed up to RANGELIST_TESTS_MAX_REV - N_RANGES, before spreading. */
+  ascending_values(start_and_end_revs, n_ranges * 2,
+                   RANGELIST_TESTS_MAX_REV - n_ranges,
+                   seed);
+  /* Some values will be repeated. Within one range, that is not allowed,
+   * so add 1 to the length of each range, spreading the ranges out so they
+   * still don't overlap:
+   * [(6,6), (6,8)] becomes [(6,7), (7, 10)] */
+  for (i = 0; i < n_ranges; i++)
+    {
+      start_and_end_revs[i*2] += i;
+      start_and_end_revs[i*2 + 1] += i+1;
+    }
+
+  for (i = 0; i < n_ranges; i++)
+    {
+      svn_merge_range_t *mrange = apr_pcalloc(pool, sizeof(*mrange));
+
+      mrange->start = start_and_end_revs[i * 2];
+      mrange->end = start_and_end_revs[i * 2 + 1];
+      mrange->inheritable = rand_less_than(2, seed);
+      APR_ARRAY_PUSH(r, svn_merge_range_t *) = mrange;
+    }
+  *rl = r;
+
+  /* check postconditions */
+  {
+    svn_rangelist_t *dup;
+    svn_error_t *err;
+
+    SVN_ERR_ASSERT_NO_RETURN(rangelist_is_sorted(*rl));
+    dup = svn_rangelist_dup(*rl, pool);
+    err = svn_rangelist__canonicalize(dup, pool);
+    SVN_ERR_ASSERT_NO_RETURN(!err);
+  }
+}
+
+/* Generate a random rangelist that satisfies svn_rangelist__is_canonical().
+ */
+static void
+rangelist_random_canonical(svn_rangelist_t **rl,
+                           apr_uint32_t *seed,
+                           apr_pool_t *pool)
+{
+  svn_rangelist_t *r;
+  int i;
+
+  rangelist_random_semi_canonical(&r, seed, pool);
+  for (i = 1; i < r->nelts; i++)
+    {
+      svn_merge_range_t *prev_mrange = APR_ARRAY_IDX(r, i-1, svn_merge_range_t *);
+      svn_merge_range_t *mrange = APR_ARRAY_IDX(r, i, svn_merge_range_t *);
+
+      /* to be canonical: adjacent ranges need differing inheritability */
+      if (mrange->start == prev_mrange->end)
+        {
+          mrange->inheritable = !prev_mrange->inheritable;
+        }
+    }
+  *rl = r;
+
+  /* check postconditions */
+  SVN_ERR_ASSERT_NO_RETURN(svn_rangelist__is_canonical(*rl));
+}
+
+static const char *
+rangelist_to_string(const svn_rangelist_t *rl,
+                    apr_pool_t *pool)
+{
+  svn_error_t *err;
+  svn_string_t *ss;
+
+  err = svn_rangelist_to_string(&ss, rl, pool);
+  if (err)
+    {
+      const char *s
+        = apr_psprintf(pool, "<rangelist[%d ranges]: %s>",
+                       rl->nelts, svn_error_purge_tracing(err)->message);
+      svn_error_clear(err);
+      return s;
+    }
+  return ss->data;
+}
+
+/* Try svn_rangelist_merge2(rlx, rly) and check errors and result */
+static svn_error_t *
+rangelist_merge_random_inputs(svn_rangelist_t *rlx,
+                              svn_rangelist_t *rly,
+                              apr_pool_t *pool)
+{
+  rl_array_t ax, ay, a_expected, a_actual;
+  svn_rangelist_t *rlm;
+
+  rangelist_to_array(&ax, rlx);
+  rangelist_to_array(&ay, rly);
+
+  rlm = svn_rangelist_dup(rlx, pool);
+  /*printf("testcase: %s / %s\n", rangelist_to_string(rlx, pool), rangelist_to_string(rly, pool));*/
+  SVN_ERR(svn_rangelist_merge2(rlm, rly, pool, pool));
+
+  if (!svn_rangelist__is_canonical(rlm))
+    {
+      return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+                               "non-canonical result %s",
+                               rangelist_to_string(rlm, pool));
+    }
+
+  /*SVN_TEST_ASSERT(rangelist_equal(rlm, ...));*/
+  rangelist_array_union(&a_expected, &ax, &ay);
+  rangelist_to_array(&a_actual, rlm);
+  if (!rangelist_array_equal(&a_actual, &a_expected))
+    {
+      return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+                               "wrong result: (c? %d / %d) -> %s",
+                               svn_rangelist__is_canonical(rlx),
+                               svn_rangelist__is_canonical(rly),
+                               rangelist_to_string(rlm, pool));
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Insert a failure mode (ERR_CHAIN) into RESPONSES, keyed by a message
+ * representing its failure mode.  The failure mode message is the lowest
+ * level error message in ERR_CHAIN, with some case-specific details
+ * removed to aid de-duplication.  If it is new failure mode (not already in
+ * RESPONSES), store the error and return the message (hash key), else
+ * clear the error and return NULL.
+ */
+static const char *
+add_failure_mode(svn_error_t *err_chain,
+                 apr_hash_t *failure_modes)
+{
+  svn_error_t *err = err_chain;
+  char buf[100];
+  const char *message;
+
+  if (!err_chain)
+    return NULL;
+
+  while (err->child)
+    err = err->child;
+  message = svn_err_best_message(err, buf, sizeof(buf));
+
+  /* For deduplication, ignore case-specific data in certain messages. */
+  if (strstr(message, "Unable to parse overlapping revision ranges '"))
+            message = "Unable to parse overlapping revision ranges '...";
+  if (strstr(message, "wrong result: (c?"))
+            message = "wrong result: (c?...";
+  if (strstr(message, "svn_sort__array_insert2: Attempted insert at index "))
+            message = "svn_sort__array_insert2: Attempted insert at index ...";
+
+  if (!svn_hash_gets(failure_modes, message))
+    {
+      svn_hash_sets(failure_modes, message, err);
+      return message;
+    }
+  else
+    {
+      svn_error_clear(err_chain);
+      return NULL;
+    }
+}
+
+static void
+clear_failure_mode_errors(apr_hash_t *failure_modes, apr_pool_t *scratch_pool)
+{
+  apr_hash_index_t *hi;
+
+  for (hi = apr_hash_first(scratch_pool, failure_modes);
+       hi;
+       hi = apr_hash_next(hi))
+    {
+      svn_error_t *err = apr_hash_this_val(hi);
+      svn_error_clear(err);
+    }
+}
+
+static svn_error_t *
+test_rangelist_merge_random_canonical_inputs(apr_pool_t *pool)
+{
+  static apr_uint32_t seed = 0;
+  apr_pool_t *iterpool = svn_pool_create(pool);
+  apr_hash_t *failure_modes = apr_hash_make(pool);
+  svn_boolean_t pass = TRUE;
+  int ix, iy;
+
+  /* "300": See comment "Random testing parameters and coverage" */
+  for (ix = 0; ix < 300; ix++)
+   {
+    svn_rangelist_t *rlx;
+
+    rangelist_random_canonical(&rlx, &seed, pool);
+
+    for (iy = 0; iy < 300; iy++)
+      {
+        svn_rangelist_t *rly;
+        svn_error_t *err;
+        const char *failure_mode;
+
+        svn_pool_clear(iterpool);
+
+        rangelist_random_canonical(&rly, &seed, iterpool);
+
+        err = svn_error_trace(rangelist_merge_random_inputs(rlx, rly, iterpool));
+        failure_mode = add_failure_mode(err, failure_modes);
+        if (failure_mode)
+          {
+            printf("first example of a failure mode: %s / %s\n"
+                   "  %s\n",
+                   rangelist_to_string(rlx, iterpool),
+                   rangelist_to_string(rly, iterpool),
+                   failure_mode);
+            /*svn_handle_error(err, stdout, FALSE);*/
+            pass = FALSE;
+          }
+      }
+   }
+
+  clear_failure_mode_errors(failure_modes, pool);
+
+  if (!pass)
+    return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+                             "Test failed: %d failure modes",
+                             apr_hash_count(failure_modes));
+  return SVN_NO_ERROR;
+}
+
+/* Test svn_rangelist_merge2() with inputs that confirm to its doc-string.
+ * Fail if any errors are produced.
+ */
+static svn_error_t *
+test_rangelist_merge_random_semi_c_inputs(apr_pool_t *pool)
+{
+  static apr_uint32_t seed = 0;
+  apr_pool_t *iterpool = svn_pool_create(pool);
+  apr_hash_t *failure_modes = apr_hash_make(pool);
+  svn_boolean_t pass = TRUE;
+  int ix, iy;
+
+  /* "300": See comment "Random testing parameters and coverage" */
+  for (ix = 0; ix < 300; ix++)
+   {
+    svn_rangelist_t *rlx;
+
+    rangelist_random_semi_canonical(&rlx, &seed, pool);
+
+    for (iy = 0; iy < 300; iy++)
+      {
+        svn_rangelist_t *rly;
+        svn_error_t *err;
+        const char *failure_mode;
+
+        svn_pool_clear(iterpool);
+
+        rangelist_random_semi_canonical(&rly, &seed, iterpool);
+
+        err = svn_error_trace(rangelist_merge_random_inputs(rlx, rly, iterpool));
+        failure_mode = add_failure_mode(err, failure_modes);
+        if (failure_mode)
+          {
+            printf("first example of a failure mode: %s / %s\n"
+                   "  %s\n",
+                   rangelist_to_string(rlx, iterpool),
+                   rangelist_to_string(rly, iterpool),
+                   failure_mode);
+            /*svn_handle_error(err, stdout, FALSE);*/
+            pass = FALSE;
+          }
+      }
+   }
+
+  clear_failure_mode_errors(failure_modes, pool);
+
+  if (!pass)
+    return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+                             "Test failed: %d failure modes",
+                             apr_hash_count(failure_modes));
+  return SVN_NO_ERROR;
+}
+
+/* Test svn_rangelist_merge2() with random non-validated inputs.
+ *
+ * Unlike the tests with valid inputs, this test expects many assertion
+ * failures.  We don't care about those.  All we care about is that it does
+ * not crash. */
+static svn_error_t *
+test_rangelist_merge_random_non_validated_inputs(apr_pool_t *pool)
+{
+  static apr_uint32_t seed = 0;
+  apr_pool_t *iterpool = svn_pool_create(pool);
+  apr_hash_t *failure_modes = apr_hash_make(pool);
+  int ix, iy;
+
+  /* "300": See comment "Random testing parameters and coverage" */
+  for (ix = 0; ix < 300; ix++)
+   {
+    svn_rangelist_t *rlx;
+
+    rangelist_random_non_validated(&rlx, &seed, pool);
+
+    for (iy = 0; iy < 300; iy++)
+      {
+        svn_rangelist_t *rly;
+        svn_error_t *err;
+
+        svn_pool_clear(iterpool);
+
+        rangelist_random_non_validated(&rly, &seed, iterpool);
+
+        err = svn_error_trace(rangelist_merge_random_inputs(rlx, rly, iterpool));
+        add_failure_mode(err, failure_modes);
+      }
+   }
+
+  clear_failure_mode_errors(failure_modes, pool);
+
+  return SVN_NO_ERROR;
+}
+
+/* Generate random mergeinfo, in which the paths and rangelists are not
+ * necessarily valid. */
+static svn_error_t *
+mergeinfo_random_non_validated(svn_mergeinfo_t *mp,
+                               apr_uint32_t *seed,
+                               apr_pool_t *pool)
+{
+  svn_mergeinfo_t m = apr_hash_make(pool);
+  int n_paths = 3;  /* See comment "Random testing parameters and coverage" */
+  int i;
+
+  for (i = 0; i < n_paths; i++)
+    {
+      const char *path;
+      svn_rangelist_t *rl;
+
+      /* A manually chosen distribution of valid and invalid paths:
+         See comment "Random testing parameters and coverage" */
+      switch (rand_less_than(8, seed))
+        {
+        case 0: case 1: case 2: case 3:
+          path = apr_psprintf(pool, "/path%d", i); break;
+        case 4:
+          path = apr_psprintf(pool, "path%d", i); break;
+        case 5:
+          path = apr_psprintf(pool, "//path%d", i); break;
+        case 6:
+          path = "/"; break;
+        case 7:
+          path = ""; break;
+        }
+      rangelist_random_non_validated(&rl, seed, pool);
+      svn_hash_sets(m, path, rl);
+    }
+  *mp = m;
+  return SVN_NO_ERROR;
+}
+
+#if 0
+static const char *
+mergeinfo_to_string_debug(svn_mergeinfo_t m,
+                          apr_pool_t *pool)
+{
+  svn_string_t *s;
+  svn_error_t *err;
+
+  err = svn_mergeinfo_to_string(&s, m, pool);
+  if (err)
+    {
+      const char *s2 = err->message;
+      svn_error_clear(err);
+      return s2;
+    }
+  return s->data;
+}
+#endif
+
+/* Try a mergeinfo merge.  This does not check the result. */
+static svn_error_t *
+mergeinfo_merge_random_inputs(const svn_mergeinfo_t mx,
+                              const svn_mergeinfo_t my,
+                              apr_pool_t *pool)
+{
+  svn_mergeinfo_t mm = svn_mergeinfo_dup(mx, pool);
+
+  SVN_ERR(svn_mergeinfo_merge2(mm, my, pool, pool));
+  return SVN_NO_ERROR;
+}
+
+/* Test svn_mergeinfo_merge2() with random non-validated inputs.
+ *
+ * Unlike the tests with valid inputs, this test expects many assertion
+ * failures.  We don't care about those.  All we care about is that it does
+ * not crash. */
+static svn_error_t *
+test_mergeinfo_merge_random_non_validated_inputs(apr_pool_t *pool)
+{
+  static apr_uint32_t seed = 0;
+  apr_pool_t *iterpool = svn_pool_create(pool);
+  int ix, iy;
+
+  for (ix = 0; ix < 300; ix++)
+   {
+    svn_mergeinfo_t mx;
+
+    SVN_ERR(mergeinfo_random_non_validated(&mx, &seed, pool));
+
+    for (iy = 0; iy < 300; iy++)
+      {
+        svn_mergeinfo_t my;
+        svn_error_t *err;
+
+        svn_pool_clear(iterpool);
+
+        SVN_ERR(mergeinfo_random_non_validated(&my, &seed, iterpool));
+
+        err = mergeinfo_merge_random_inputs(mx, my, iterpool);
+        if (err)
+          {
+            /*
+            printf("testcase FAIL: %s / %s\n",
+                   mergeinfo_to_string_debug(mx, iterpool),
+                   mergeinfo_to_string_debug(my, iterpool));
+            svn_handle_error(err, stdout, FALSE);
+            */
+            svn_error_clear(err);
+          }
+      }
+   }
+
+  return SVN_NO_ERROR;
+}
 
 /* The test table.  */
 
@@ -1831,6 +2528,18 @@ static struct svn_test_descriptor_t test_funcs[] =
                    "merge of rangelists with overlaps (issue 4686)"),
     SVN_TEST_PASS2(test_rangelist_loop,
                     "test rangelist edgecases via loop"),
+    SVN_TEST_PASS2(test_rangelist_merge_canonical_result,
+                   "test rangelist merge canonical result (#4840)"),
+    SVN_TEST_PASS2(test_rangelist_merge_array_insert_failure,
+                   "test rangelist merge array insert failure (#4840)"),
+    SVN_TEST_PASS2(test_rangelist_merge_random_canonical_inputs,
+                   "test rangelist merge random canonical inputs"),
+    SVN_TEST_PASS2(test_rangelist_merge_random_semi_c_inputs,
+                   "test rangelist merge random semi-c inputs"),
+    SVN_TEST_PASS2(test_rangelist_merge_random_non_validated_inputs,
+                   "test rangelist merge random non-validated inputs"),
+    SVN_TEST_PASS2(test_mergeinfo_merge_random_non_validated_inputs,
+                   "test mergeinfo merge random non-validated inputs"),
     SVN_TEST_NULL
   };
 
diff --git a/subversion/tests/libsvn_wc/conflict-data-test.c b/subversion/tests/libsvn_wc/conflict-data-test.c
index 239c18f..ad41f72 100644
--- a/subversion/tests/libsvn_wc/conflict-data-test.c
+++ b/subversion/tests/libsvn_wc/conflict-data-test.c
@@ -911,7 +911,7 @@ test_prop_conflict_resolving(const svn_test_opts_t *opts,
   SVN_TEST_STRING_ASSERT(value, "r1");
   value = svn_prop_get_value(props, "prop-3");
   SVN_TEST_STRING_ASSERT(value, "mod");
-  
+
   return SVN_NO_ERROR;
 }
 
diff --git a/subversion/tests/libsvn_wc/op-depth-test.c b/subversion/tests/libsvn_wc/op-depth-test.c
index 66e5928..84bd41c 100644
--- a/subversion/tests/libsvn_wc/op-depth-test.c
+++ b/subversion/tests/libsvn_wc/op-depth-test.c
@@ -1770,7 +1770,7 @@ test_db_make_copy(const svn_test_opts_t *opts, apr_pool_t *pool)
     };
 
     SVN_ERR(insert_dirs(&b, before));
-    SVN_ERR(svn_wc__db_op_make_copy(b.wc_ctx->db, sbox_wc_path(&b, "A"), 
+    SVN_ERR(svn_wc__db_op_make_copy(b.wc_ctx->db, sbox_wc_path(&b, "A"),
                                     NULL, NULL, pool));
 
     SVN_ERR(check_db_rows(&b, "", after));
diff --git a/subversion/tests/libsvn_wc/wc-queries-test.c b/subversion/tests/libsvn_wc/wc-queries-test.c
index 16bb877..cc03d4c 100644
--- a/subversion/tests/libsvn_wc/wc-queries-test.c
+++ b/subversion/tests/libsvn_wc/wc-queries-test.c
@@ -323,7 +323,7 @@ parse_explanation_item(struct explanation_item **parsed_item,
         }
       else if (MATCH_TOKEN(token, "CONSTANT"))
         {
-          item->table = "sqlite_master"; /* not worth checking. 
+          item->table = "sqlite_master"; /* not worth checking.
                                             Just a lookup */
           token = apr_strtok(NULL, " ", &last);
           if (!MATCH_TOKEN(token, "ROW"))
@@ -512,7 +512,7 @@ parse_explanation_item(struct explanation_item **parsed_item,
     }
   else if (MATCH_TOKEN(item->operation, "INDEX"))
     {
-      
+
     }
   else if (MATCH_TOKEN(item->operation, "MULTI-INDEX"))
     {
@@ -537,7 +537,7 @@ parse_explanation_item(struct explanation_item **parsed_item,
     {
     }
   else if (MATCH_TOKEN(item->operation, "SCALAR"))
-    {      
+    {
     }
   else if (MATCH_TOKEN(item->operation, "LEFT-MOST"))
     {
diff --git a/tools/backup/hot-backup.py.in b/tools/backup/hot-backup.py.in
index f497ce2..cab602a 100755
--- a/tools/backup/hot-backup.py.in
+++ b/tools/backup/hot-backup.py.in
@@ -28,7 +28,7 @@
 #    under the License.
 # ====================================================================
 
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/backup/hot-backup.py.in $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/tools/backup/hot-backup.py.in $
 # $LastChangedDate: 2015-12-21 15:02:31 +0000 (Mon, 21 Dec 2015) $
 # $LastChangedBy: danielsh $
 # $LastChangedRevision: 1721179 $
diff --git a/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh b/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
index e68775b..3a15239 100755
--- a/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
+++ b/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
@@ -27,6 +27,7 @@ branch="${url##*/}"
 export MALLOC_OPTIONS=S
 (cd .. && gmake BRANCH="$branch" THREADING="no" JAVA="no" svn-check-bindings)
 grep -q "^Result: PASS$" tests.log.bindings.pl || exit 1
-grep -q "^OK$" tests.log.bindings.py || exit 1
+grep -q "^OK$" tests.log.bindings.py || \
+  grep -q "^OK (skipped=[0-9]" tests.log.bindings.py || exit 1
 grep -q ", 0 failures, 0 errors" tests.log.bindings.rb || exit 1
 exit 0
diff --git a/tools/buildbot/slaves/bb-openbsd/svnclean.sh b/tools/buildbot/slaves/bb-openbsd/svnclean.sh
index a2f86e0..553e0f4 100755
--- a/tools/buildbot/slaves/bb-openbsd/svnclean.sh
+++ b/tools/buildbot/slaves/bb-openbsd/svnclean.sh
@@ -22,11 +22,13 @@
 set -e
 set -x
 
+svn cleanup ../build
 (test -h ../svn-trunk || ln -s build ../svn-trunk)
 for i in $(jot - 6 12); do
   (test -h ../svn-1.${i}.x || ln -s build ../svn-1.${i}.x)
 done
 lastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)"
+svn cleanup ../../unix-build
 svn update ../../unix-build
 newlastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)"
 (test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile)
diff --git a/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh b/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh
index 284f320..1861644 100755
--- a/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh
+++ b/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh
@@ -24,17 +24,51 @@ scripts=$(cd $(dirname "$0") && pwd)
 
 . ${scripts}/setenv.sh
 
+# Parse arguments to find out which bindings we should build
+if [ -z "$1"  ]; then
+    use_python3=false
+    build_swig_py=true
+    build_swig_pl=true
+    build_swig_rb=true
+    build_javahl=true
+else
+    use_python3=false
+    build_swig_py=false
+    build_swig_pl=false
+    build_swig_rb=false
+    build_javahl=false
+
+    while [ ! -z "$1" ]; do
+        case "$1" in
+            python3) use_python3=true;;
+            swig-py) build_swig_py=true;;
+            swig-pl) build_swig_pl=true;;
+            swig-rb) build_swig_rb=true;;
+            javahl)  build_javahl=true;;
+            *)       exit 1;;
+        esac
+        shift
+    done
+fi
+
+${use_python3} \
+    && test -n "${SVNBB_PYTHON3ENV}" \
+    && . ${SVNBB_PYTHON3ENV}/bin/activate \
+    && export PYTHON="$(which python)"
+
 #
-# Step 4: build bindings
+# Step 1: build bindings
 #
 
 build_bindings() {
     echo "============ make $1"
     cd ${absbld}
-    make $1
+    make $1 || exit 1
 }
 
-build_bindings swig-py
-build_bindings swig-pl
-build_bindings swig-rb
-build_bindings javahl
+${build_swig_py} && build_bindings swig-py
+${build_swig_pl} && build_bindings swig-pl
+${build_swig_rb} && build_bindings swig-rb
+${build_javahl} && build_bindings javahl
+
+exit 0
diff --git a/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh b/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
index 8d70769..0918dbc 100755
--- a/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
+++ b/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
@@ -54,6 +54,13 @@ else
     parallel=${SVNBB_PARALLEL}
 fi
 
+# An optional parameter tells us if this build should use Python 3.
+if [ "$3" = "python3" ]; then
+    test -n "${SVNBB_PYTHON3ENV}" \
+        && . ${SVNBB_PYTHON3ENV}/bin/activate \
+        && export PYTHON="$(which python)"
+fi
+
 #
 # Step 0: Create a directory for the test log files
 #
diff --git a/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh b/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
index 4810408..f1fca22 100755
--- a/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
+++ b/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
@@ -37,6 +37,7 @@ scripts=$(cd $(dirname "$0") && pwd)
 . ${scripts}/setenv.sh
 
 # Parse arguments to find out which tests we should run
+use_python3=false
 check_swig_py=false
 check_swig_pl=false
 check_swig_rb=false
@@ -44,15 +45,21 @@ check_javahl=false
 
 while [ ! -z "$1" ]; do
     case "$1" in
+        python3) use_python3=true;;
         swig-py) check_swig_py=true;;
         swig-pl) check_swig_pl=true;;
         swig-rb) check_swig_rb=true;;
         javahl)  check_javahl=true;;
-        *)     exit 1;;
+        *)       exit 1;;
     esac
     shift
 done
 
+${use_python3} \
+    && test -n "${SVNBB_PYTHON3ENV}" \
+    && . ${SVNBB_PYTHON3ENV}/bin/activate \
+    && export PYTHON="$(which python)"
+
 ${check_swig_py} && run_tests swig-py
 ${check_swig_pl} && run_tests swig-pl
 ${check_swig_rb} && run_tests swig-rb
diff --git a/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh b/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
index 9465d3f..f276e2d 100755
--- a/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
+++ b/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
@@ -98,7 +98,10 @@ while [ ! -z "$1" ]; do
     shift
 done
 
-${use_python3} && test -n "${SVNBB_PYTHON3ENV}" && . ${SVNBB_PYTHON3ENV}/bin/activate
+${use_python3} \
+    && test -n "${SVNBB_PYTHON3ENV}" \
+    && . ${SVNBB_PYTHON3ENV}/bin/activate \
+    && export PYTHON="$(which python)"
 
 ${check_local} && check_tests local
 ${check_svn} && check_tests svn
diff --git a/tools/client-side/bash_completion b/tools/client-side/bash_completion
index 44d15bb..2d06d8f 100644
--- a/tools/client-side/bash_completion
+++ b/tools/client-side/bash_completion
@@ -1137,7 +1137,7 @@ _svnadmin ()
 	cur=${COMP_WORDS[COMP_CWORD]}
 
 	# Possible expansions, without pure-prefix abbreviations such as "h".
-	cmds='crashtest create delrevprop deltify dump dump-revprops freeze \
+	cmds='build-repcache crashtest create delrevprop deltify dump dump-revprops freeze \
 	      help hotcopy info list-dblogs list-unused-dblogs \
 	      load load-revprops lock lslocks lstxns pack recover rev-size rmlocks \
 	      rmtxns setlog setrevprop setuuid unlock upgrade verify --version'
@@ -1163,6 +1163,9 @@ _svnadmin ()
 
 	cmdOpts=
 	case ${COMP_WORDS[1]} in
+	build-repcache)
+		cmdOpts="-r --revision -q --quiet -M --memory-cache-size"
+		;;
 	create)
 		cmdOpts="--bdb-txn-nosync --bdb-log-keep --config-dir \
 		         --fs-type --compatible-version"
diff --git a/tools/client-side/svn-mergeinfo-normalizer/log.c b/tools/client-side/svn-mergeinfo-normalizer/log.c
index c73d101..5eb609a 100644
--- a/tools/client-side/svn-mergeinfo-normalizer/log.c
+++ b/tools/client-side/svn-mergeinfo-normalizer/log.c
@@ -866,7 +866,7 @@ svn_min__get_copies(svn_min__log_t *log,
       if (copies[idx]->copyfrom_revision <= start_rev)
         APR_ARRAY_PUSH(result, const svn_min__copy_t *) = copies[idx];
     }
- 
+
   /* Find all parent copies. */
   while (!svn_fspath__is_root(to_find->copyfrom_path,
                               strlen(to_find->copyfrom_path)))
diff --git a/tools/client-side/svn-mergeinfo-normalizer/logic.c b/tools/client-side/svn-mergeinfo-normalizer/logic.c
index 4911c08..ae2d09d 100644
--- a/tools/client-side/svn-mergeinfo-normalizer/logic.c
+++ b/tools/client-side/svn-mergeinfo-normalizer/logic.c
@@ -436,7 +436,7 @@ find_surviving_copy(svn_min__log_t *log,
           survivor = apr_pstrdup(result_pool, copy_target);
         }
     }
- 
+
   svn_pool_destroy(iterpool);
 
   return survivor;
@@ -488,7 +488,7 @@ find_surviving_copies(apr_array_header_t *survivors,
                                                                 copy_target);
         }
     }
- 
+
   svn_pool_destroy(iterpool);
 }
 
@@ -1351,7 +1351,7 @@ progress_string(const progress_t *progress,
 
 /* Depending on the options in OPT_STATE, print the header to be shown
  * before processing the m/i at REL_PATH relative to the parent mergeinfo
- * at PARENT_PATH.  If there is no parent m/i, RELPATH is empty. 
+ * at PARENT_PATH.  If there is no parent m/i, RELPATH is empty.
  * Use SCRATCH_POOL temporary allocations.*/
 static svn_error_t *
 show_elision_header(const char *parent_path,
@@ -1651,7 +1651,7 @@ eliminate_subpaths(apr_array_header_t *paths)
 }
 
 /* If enabled by OPT_STATE, show the list of missing paths encountered by
- * LOOKUP and use LOG to determine their fate.  LOG may be NULL. 
+ * LOOKUP and use LOG to determine their fate.  LOG may be NULL.
  * Use SCRATCH_POOL for temporary allocations. */
 static svn_error_t *
 show_obsoletes_summary(svn_min__branch_lookup_t *lookup,
@@ -1702,7 +1702,7 @@ show_obsoletes_summary(svn_min__branch_lookup_t *lookup,
                                                 SVN_INVALID_REVNUM,
                                                 creation_rev, iterpool);
           find_surviving_copies(surviving_copies, log, path,
-                                SVN_IS_VALID_REVNUM(deletion_rev) 
+                                SVN_IS_VALID_REVNUM(deletion_rev)
                                   ? deletion_rev - 1
                                   : deletion_rev,
                                 creation_rev,
diff --git a/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c b/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
index edc2208..a055844 100644
--- a/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
+++ b/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
@@ -130,7 +130,7 @@ get_urls(void *baton,
   apr_pool_t *target_pool = apr_hash_pool_get(mi->mergeinfo);
   const char *rel_path = svn_uri_skip_ancestor(info->repos_root_URL,
                                                info->URL, pool);
- 
+
   mi->url = apr_pstrdup(target_pool, info->URL);
   mi->fs_path = svn_fspath__canonicalize(rel_path, target_pool);
 
diff --git a/tools/client-side/svnconflict/svnconflict.c b/tools/client-side/svnconflict/svnconflict.c
index afbedf4..dcc7576 100644
--- a/tools/client-side/svnconflict/svnconflict.c
+++ b/tools/client-side/svnconflict/svnconflict.c
@@ -373,7 +373,7 @@ svnconflict_list(apr_getopt_t *os, void *baton, apr_pool_t *pool)
 
   for (i = 0; i < props_conflicted->nelts; i++)
     {
-      const char *propname = APR_ARRAY_IDX(props_conflicted, i, const char *); 
+      const char *propname = APR_ARRAY_IDX(props_conflicted, i, const char *);
       SVN_ERR(svn_cmdline_printf(pool, "prop-conflict: %s\n", propname));
     }
 
diff --git a/tools/dev/contribulyze.py b/tools/dev/contribulyze.py
index 8afc608..6789056 100755
--- a/tools/dev/contribulyze.py
+++ b/tools/dev/contribulyze.py
@@ -56,6 +56,7 @@
 # a lot easier to whip up for straight 'svn log' output.  I'd have no
 # objection to it being rewritten to take XML input.
 
+import functools
 import os
 import sys
 import re
@@ -256,6 +257,9 @@ class Contributor(object):
     else:
       return 0 - result
 
+  def sort_key(self):
+      return (self.is_full_committer, self.score(), self.big_name())
+
   @staticmethod
   def parse(name):
     """Parse NAME, which can be
@@ -398,7 +402,7 @@ class Contributor(object):
     out.write('</table>\n\n')
     out.write('</div>\n\n')
 
-    sorted_logs = sorted(unique_logs.keys())
+    sorted_logs = sorted(unique_logs.keys(), key=LogMessage.sort_key)
     for log in sorted_logs:
       out.write('<hr />\n')
       out.write('<div class="h3" id="%s" title="%s">\n' % (log.revision,
@@ -490,6 +494,9 @@ class LogMessage(object):
     if a < b: return 1
     else:     return 0
 
+  def sort_key(self):
+    return int(self.revision[1:])
+
   def __str__(self):
     s = '=' * 15
     header = ' LOG: %s | %s ' % (self.revision, self.committer)
@@ -661,7 +668,8 @@ def drop(revision_url_pattern):
   # sort by number of contributions, so the most active people appear at
   # the top -- that way we know whom to look at first for commit access
   # proposals.
-  sorted_contributors = sorted(Contributor.all_contributors.values())
+  sorted_contributors = sorted(Contributor.all_contributors.values(),
+                               key = Contributor.sort_key)
   for c in sorted_contributors:
     if c not in seen_contributors:
       if c.score() > 0:
diff --git a/tools/dev/svnmover/scanlog.c b/tools/dev/svnmover/scanlog.c
index ebf8c53..e46d037 100644
--- a/tools/dev/svnmover/scanlog.c
+++ b/tools/dev/svnmover/scanlog.c
@@ -136,7 +136,7 @@ typedef struct scan_moves_log_receiver_baton {
    *   rB: mv b->c
    *   rC: mv c->d
    * we map each revision number to all moves which happened in the
-   * revision, which looks as follows: 
+   * revision, which looks as follows:
    *   rA : [(rA, x->z), (rA, a->b)]
    *   rB : [(rB, b->c)]
    *   rC : [(rC, c->d)]
diff --git a/tools/dev/unix-build/Makefile.svn b/tools/dev/unix-build/Makefile.svn
index b00a074..b92c076 100644
--- a/tools/dev/unix-build/Makefile.svn
+++ b/tools/dev/unix-build/Makefile.svn
@@ -112,7 +112,8 @@ SQLITE_VER	= 3160200
 LIBMAGIC_VER	= 5.30
 RUBY_VER	= 2.4.4
 BZ2_VER	= 1.0.6
-PYTHON_VER	= 2.7.13
+PYTHON_VER	= 3.7.5
+PY3C_VER	= 1.1
 JUNIT_VER	= 4.10
 GETTEXT_VER	= 0.19.8.1
 LZ4_VER		= 1.7.5
@@ -129,6 +130,7 @@ LIBMAGIC_DIST	= file-$(LIBMAGIC_VER).tar.gz
 RUBY_DIST	= ruby-$(RUBY_VER).tar.gz
 BZ2_DIST	= bzip2-$(BZ2_VER).tar.gz
 PYTHON_DIST	= Python-$(PYTHON_VER).tgz
+PY3C_DIST	= py3c-$(PY3C_VER).tar.gz
 JUNIT_DIST	= junit-${JUNIT_VER}.jar
 GETTEXT_DIST	= gettext-$(GETTEXT_VER).tar.gz
 LZ4_DIST	= lz4-$(LZ4_VER).tar.gz
@@ -144,7 +146,8 @@ SHA256_${SQLITE_DIST} = 65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c86
 SHA256_${LIBMAGIC_DIST} = 694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
 SHA256_${RUBY_DIST} = 254f1c1a79e4cc814d1e7320bc5bdd995dc57e08727d30a767664619a9c8ae5a
 SHA256_${BZ2_DIST} = a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-SHA256_${PYTHON_DIST} = a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1
+SHA256_${PYTHON_DIST} = 8ecc681ea0600bbfb366f2b173f727b205bb825d93d2f0b286bc4e58d37693da
+SHA256_${PY3C_DIST} = c7ffc22bc92dded0ca859db53ef3a0b466f89a9f8aad29359c9fe4ff18ebdd20
 SHA256_${JUNIT_DIST} = 36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
 SHA256_${GETTEXT_DIST} = ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43
 SHA256_${LZ4_DIST} = 0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e
@@ -174,6 +177,7 @@ DISTFILES	= $(DISTDIR)/$(NEON_DIST) \
 		$(DISTDIR)/$(RUBY_DIST) \
 		$(DISTDIR)/$(BZ2_DIST) \
 		$(DISTDIR)/$(PYTHON_DIST) \
+		$(DISTDIR)/$(PY3C_DIST) \
 		$(DISTDIR)/$(JUNIT_DIST) \
 		$(DISTDIR)/$(GETTEXT_DIST)
 
@@ -197,6 +201,7 @@ LIBMAGIC_URL	= ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
 RUBY_URL	= https://cache.ruby-lang.org/pub/ruby/2.4/$(RUBY_DIST)
 BZ2_URL		= https://stsp.name/distfiles/$(BZ2_DIST)
 PYTHON_URL	= https://python.org/ftp/python/$(PYTHON_VER)/$(PYTHON_DIST)
+PY3C_URL	= https://stsp.name/distfiles/py3c-${PY3C_VER}.tar.gz
 JUNIT_URL	= https://stsp.name/distfiles/$(JUNIT_DIST)
 GETTEXT_URL	= https://ftp.gnu.org/pub/gnu/gettext/$(GETTEXT_DIST)
 LZ4_URL		= https://github.com/lz4/lz4/archive/v$(LZ4_VER).tar.gz
@@ -218,6 +223,7 @@ LIBMAGIC_SRCDIR	= $(SRCDIR)/file-$(LIBMAGIC_VER)
 RUBY_SRCDIR	= $(SRCDIR)/ruby-$(RUBY_VER)
 BZ2_SRCDIR	= $(SRCDIR)/bzip2-$(BZ2_VER)
 PYTHON_SRCDIR	= $(SRCDIR)/Python-$(PYTHON_VER)
+PY3C_SRCDIR	= $(SRCDIR)/py3c-$(PY3C_VER)
 GETTEXT_SRCDIR	= $(SRCDIR)/gettext-$(GETTEXT_VER)
 LZ4_SRCDIR	= ${SRCDIR}/lz4-$(LZ4_VER)
 SVN_SRCDIR	= $(SVN_WC)
@@ -238,6 +244,7 @@ LIBMAGIC_OBJDIR	= $(OBJDIR)/file-$(LIBMAGIC_VER)
 RUBY_OBJDIR	= $(OBJDIR)/ruby-$(RUBY_VER)
 BZ2_OBJDIR	= $(OBJDIR)/bzip2-$(BZ2_VER)
 PYTHON_OBJDIR	= $(OBJDIR)/python-$(PYTHON_VER)
+PY3C_OBJDIR	= $(OBJDIR)/python-$(PY3C_VER)
 GETTEXT_OBJDIR	= $(OBJDIR)/gettext-$(GETTEXT_VER)
 LZ4_OBJDIR	= ${OBJDIR}/lz4-$(LZ4_VER)
 SVN_OBJDIR	= $(OBJDIR)/$(SVN_REL_WC)
@@ -267,7 +274,7 @@ PKG_CONFIG_PATH=$(PREFIX)/apr/lib/pkgconfig:$(PREFIX)/neon/lib/pkgconfig:$(PREFI
 all: dirs-create bdb-install apr-install iconv-install apr-util-install \
 	pcre-install httpd-install neon-install serf-install serf-old-install \
 	sqlite-install cyrus-sasl-install libmagic-install \
-	ruby-install bz2-install python-install gettext-install \
+	ruby-install bz2-install python-install py3c-retrieve gettext-install \
 	lz4-install svn-install svn-bindings-install
 
 # Use these to start a build from the beginning.
@@ -1199,6 +1206,56 @@ $(RUBY_OBJDIR)/openssl_missing.patch:
 	echo >> $@.tmp ' #if defined(HAVE_AUTHENTICATED_ENCRYPTION) && !defined(EVP_CTRL_AEAD_GET_TAG)'
 	mv -f $@.tmp $@
 
+$(RUBY_OBJDIR)/sparc64_buserror.patch:
+	mkdir -p $(dir $@)
+	echo > $@.tmp '--- compile.c.orig	Thu Mar 12 12:58:26 2020'
+	echo >> $@.tmp '+++ compile.c	Thu Mar 12 16:36:55 2020'
+	echo >> $@.tmp '@@ -751,6 +751,16 @@'
+	echo >> $@.tmp '   #define STRICT_ALIGNMENT'
+	echo >> $@.tmp ' #endif'
+	echo >> $@.tmp ' '
+	echo >> $@.tmp '+/*'
+	echo >> $@.tmp '+ * Some OpenBSD platforms (including sparc64) require strict alignment.'
+	echo >> $@.tmp '+ */'
+	echo >> $@.tmp '+#if defined(__OpenBSD__)'
+	echo >> $@.tmp '+  #include <sys/endian.h>'
+	echo >> $@.tmp '+  #ifdef __STRICT_ALIGNMENT'
+	echo >> $@.tmp '+    #define STRICT_ALIGNMENT'
+	echo >> $@.tmp '+  #endif'
+	echo >> $@.tmp '+#endif'
+	echo >> $@.tmp '+'
+	echo >> $@.tmp ' #ifdef STRICT_ALIGNMENT'
+	echo >> $@.tmp '   #if defined(HAVE_TRUE_LONG_LONG) && SIZEOF_LONG_LONG > SIZEOF_VALUE'
+	echo >> $@.tmp '     #define ALIGNMENT_SIZE SIZEOF_LONG_LONG'
+	echo >> $@.tmp '@@ -2094,7 +2104,8 @@'
+	echo >> $@.tmp ' 	    unref_destination(iobj, 0);'
+	echo >> $@.tmp ' 	    REMOVE_ELEM(&iobj->link);'
+	echo >> $@.tmp ' 	}'
+	echo >> $@.tmp '-	else if (iobj != diobj && IS_INSN_ID(diobj, jump) &&'
+	echo >> $@.tmp '+	else if (iobj != diobj && IS_INSN(&diobj->link) &&'
+	echo >> $@.tmp '+		 IS_INSN_ID(diobj, jump) &&'
+	echo >> $@.tmp ' 		 OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {'
+	echo >> $@.tmp ' 	    replace_destination(iobj, diobj);'
+	echo >> $@.tmp ' 	    remove_unreachable_chunk(iseq, iobj->link.next);'
+	echo >> $@.tmp '@@ -2136,6 +2147,7 @@'
+	echo >> $@.tmp ' 	 * L2:'
+	echo >> $@.tmp ' 	 */'
+	echo >> $@.tmp ' 	else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&'
+	echo >> $@.tmp '+		 IS_INSN(&piobj->link) &&'
+	echo >> $@.tmp ' 		 (IS_INSN_ID(piobj, branchif) ||'
+	echo >> $@.tmp ' 		  IS_INSN_ID(piobj, branchunless))) {'
+	echo >> $@.tmp ' 	    if (niobj == (INSN *)get_destination_insn(piobj)) {'
+	echo >> $@.tmp '@@ -2176,7 +2188,7 @@'
+	echo >> $@.tmp ' 	}'
+	echo >> $@.tmp ' '
+	echo >> $@.tmp ' 	for (;;) {'
+	echo >> $@.tmp '-	    if (IS_INSN_ID(nobj, jump)) {'
+	echo >> $@.tmp '+	    if (IS_INSN(&nobj->link) && IS_INSN_ID(nobj, jump)) {'
+	echo >> $@.tmp ' 		replace_destination(iobj, nobj);'
+	echo >> $@.tmp ' 	    }'
+	echo >> $@.tmp ' 	    else if (prev_dup && IS_INSN_ID(nobj, dup) &&'
+	mv -f $@.tmp $@
+
 ifeq ($(UNAME),OpenBSD)
 RUBY_SSL_EX_NEW_DATA_PATCH = sed -i -e '/^have_func("X509_STORE_set_ex_data")$$/ { p; s/^.*$$/\have_func("X509_STORE_get_ex_new_index")/; }'
 else
@@ -1207,13 +1264,14 @@ endif
 
 # retrieve ruby
 #
-$(RUBY_OBJDIR)/.retrieved: $(DISTDIR)/$(RUBY_DIST) $(RUBY_OBJDIR)/openssl_missing.patch
+$(RUBY_OBJDIR)/.retrieved: $(DISTDIR)/$(RUBY_DIST) $(RUBY_OBJDIR)/openssl_missing.patch $(RUBY_OBJDIR)/sparc64_buserror.patch
 	$(call do_check_sha256,$(RUBY_DIST))
 	[ -d $(RUBY_OBJDIR) ] || mkdir -p $(RUBY_OBJDIR)
 	tar -C $(SRCDIR) -zxf $(DISTDIR)/$(RUBY_DIST)
 	-which ghead && sed -i -e "s/head -c/ghead -c/" $(RUBY_SRCDIR)/configure
 	$(RUBY_SSL_EX_NEW_DATA_PATCH) $(RUBY_SRCDIR)/ext/openssl/extconf.rb
 	cd $(RUBY_SRCDIR) && patch -p0 < $(RUBY_OBJDIR)/openssl_missing.patch
+	cd $(RUBY_SRCDIR) && patch -p0 < $(RUBY_OBJDIR)/sparc64_buserror.patch
 	touch $@
 
 ifeq ($(THREADING),yes)
@@ -1304,14 +1362,9 @@ python-clean:
 $(DISTDIR)/$(PYTHON_DIST):
 	cd $(DISTDIR) && $(FETCH_CMD) $(PYTHON_URL)
 
-# https://bugs.python.org/issue12560
-$(DISTDIR)/python-issue12560.patch:
-	cd $(DISTDIR) && $(FETCH_CMD) -O "$@" \
-		https://hg.python.org/cpython/raw-rev/32cc37a89b58
-	
 # retrieve python
 #
-$(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/$(PYTHON_DIST) $(DISTDIR)/python-issue12560.patch
+$(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/$(PYTHON_DIST)
 	$(call do_check_sha256,$(PYTHON_DIST))
 	[ -d $(PYTHON_OBJDIR) ] || mkdir -p $(PYTHON_OBJDIR)
 	tar -C $(SRCDIR) -zxf $(DISTDIR)/$(PYTHON_DIST)
@@ -1325,7 +1378,6 @@ $(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/$(PYTHON_DIST) $(DISTDIR)/python-issue12
 		> $(PYTHON_SRCDIR)/setup.py.patched
 	mv $(PYTHON_SRCDIR)/setup.py.patched $(PYTHON_SRCDIR)/setup.py
 	chmod +x $(PYTHON_SRCDIR)/setup.py
-	cd $(PYTHON_SRCDIR) && patch -p1 < $(DISTDIR)/python-issue12560.patch
 	touch $@
 
 # configure python
@@ -1346,6 +1398,7 @@ $(PYTHON_OBJDIR)/.configured: $(PYTHON_OBJDIR)/.retrieved \
 		--enable-shared \
 		--with-system-expat \
 		--with-dbmliborder=bdb \
+		--without-pymalloc \
 		$(PYTHON_PROFILING)
 	touch $@
 
@@ -1365,6 +1418,25 @@ $(PYTHON_OBJDIR)/.installed: $(PYTHON_OBJDIR)/.compiled
 		make install)
 	touch $@
 
+#######################################################################
+# py3c
+#######################################################################
+
+py3c-retrieve:	$(PY3C_OBJDIR)/.retrieved
+py3c-reset:
+	$(foreach f, .retrieved .configured .compiled .installed, \
+		rm -f $(PY3C_OBJDIR)/$(f);)
+
+# fetch distfile for py3c
+$(DISTDIR)/$(PY3C_DIST):
+	cd $(DISTDIR) && $(FETCH_CMD) $(PY3C_URL)
+
+# retrieve py3c
+$(PY3C_OBJDIR)/.retrieved: $(DISTDIR)/$(PY3C_DIST)
+	$(call do_check_sha256,$(PY3C_DIST))
+	[ -d $(PY3C_OBJDIR) ] || mkdir -p $(PY3C_OBJDIR)
+	tar -C $(SRCDIR) -zxf $(DISTDIR)/$(PY3C_DIST)
+	touch $@
 
 #######################################################################
 # junit
@@ -1625,6 +1697,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved $(DISTDIR)/$(JUNIT_DIST) \
 			CXXFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG" \
 			LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \
 			PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+			PYTHON=$(PREFIX)/python/bin/python3 \
 			GREP="`which grep`" \
 			PATH=$(PREFIX)/ruby/bin:$(PREFIX)/python/bin:$(PREFIX)/gettext/bin:$$PATH \
 			$(SVN_SRCDIR)/configure \
@@ -1641,6 +1714,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved $(DISTDIR)/$(JUNIT_DIST) \
 			--without-gnome-keyring \
 			--with-berkeley-db="$(BDB_FLAG)" \
 			--with-ruby-sitedir="$(SVN_PREFIX)/lib/ruby/site_ruby" \
+			--with-py3c="$(SRCDIR)/py3c-${PY3C_VER}" \
 			--disable-mod-activation \
 			$(JAVAHL_FLAG) \
 			$(LIBMAGIC_FLAG) \
@@ -2142,6 +2216,7 @@ define do_check
     env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(LIB_PTHREAD_HACK) \
         env MAKEFLAGS= make check PARALLEL=$(PARALLEL) CLEANUP=$(CLEANUP) \
 	  EXCLUSIVE_WC_LOCKS=$(EXCLUSIVE_WC_LOCKS) \
+	  THREADED=$(THREADED) \
 	  SVN_BIN_DIR=$(SVN_PREFIX)/bin \
 	  MEMCACHED_SERVER=$(MEMCACHED_SERVER) $1 FS_TYPE=$$fs; \
     for log in tests.log fails.log; do \
diff --git a/tools/dev/unix-build/README b/tools/dev/unix-build/README
index 8a3780c..949f389 100644
--- a/tools/dev/unix-build/README
+++ b/tools/dev/unix-build/README
@@ -1,7 +1,7 @@
 Introduction
 ============
 Makefile.svn aids Subversion developers on unix-like systems set up an
-SVN development environment without requiring root priviliges. It does
+SVN development environment without requiring root privileges. It does
 this by fetching Subversion along with many of its dependencies from
 the internet and building them using sane defaults suitable for
 development (for example, it invokes --enable-maintainer-mode while
diff --git a/tools/dev/which-error.py b/tools/dev/which-error.py
index b8e3800..ba02bb9 100755
--- a/tools/dev/which-error.py
+++ b/tools/dev/which-error.py
@@ -23,7 +23,7 @@
 #    under the License.
 # ====================================================================
 #
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/dev/which-error.py $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/tools/dev/which-error.py $
 # $LastChangedDate: 2016-04-30 08:16:53 +0000 (Sat, 30 Apr 2016) $
 # $LastChangedBy: stefan2 $
 # $LastChangedRevision: 1741723 $
diff --git a/tools/dist/backport.pl b/tools/dist/backport.pl
index df3da22..32c62e5 100755
--- a/tools/dist/backport.pl
+++ b/tools/dist/backport.pl
@@ -9,11 +9,11 @@ use v5.10.0; # needed for $^V
 # experimental and "subject to change" in v5.18 (see perl5180delta).  Every
 # use of it now triggers a warning.
 #
-# As of Perl v5.26.1, the semantics of given/when provided by Perl are
+# As of Perl v5.30.0, the semantics of given/when provided by Perl are
 # compatible with those expected by the script, so disable the warning for
 # those Perls.  But don't try to disable the the warning category on Perls
 # that don't know that category, since that breaks compilation.
-no if (v5.17.0 le $^V and $^V le v5.26.1),
+no if (v5.17.0 le $^V and $^V le v5.30.0),
    warnings => 'experimental::smartmatch';
 
 # Licensed to the Apache Software Foundation (ASF) under one
@@ -157,7 +157,7 @@ N:   Move to the next entry.  Do not prompt for the current entry again, even
      revisions added, justification changed) in the repository.
      (This is a local action that will not affect other people or bots.)
  :   Move to the next entry.  Prompt for the current entry again in the next
-     run of backport.pl. 
+     run of backport.pl.
      (That's a space character, ASCII 0x20.)
 ?:   Display this list.
 EOF
@@ -231,7 +231,7 @@ Both batch modes also perform a basic sanity-check on entries that declare
 backport branches (via the "Branch:" header): if a backport branch is used, but
 at least one of the revisions enumerated in the entry title had neither been
 merged from $TRUNK to the branch root, nor been committed
-directly to the backport branch, the hourly bot will turn red and 
+directly to the backport branch, the hourly bot will turn red and
 nightly bot will skip the entry and email its admins.  (The nightly bot does
 not email the list on failure, since it doesn't use buildbot.)
 
@@ -262,6 +262,9 @@ numbers); it will be ignored.  For example,
     $0 "Committed revision 42." "\$Some_justification"
 will nominate r42.
 
+Revision numbers within the last thousand revisions may be specified using
+the last three digits only.
+
 The justification can be an arbitrarily-long string; if it is wider than the
 available width, this script will wrap it for you (and allow you to review
 the result before committing).
@@ -1238,6 +1241,20 @@ sub nominate_main {
 
   die "Unable to proceed." if warned_cannot_commit "Nominating failed";
 
+  # To save typing, require just the last three digits if they're unambiguous.
+  my $BASE_revision = `$SVN info --show-item=revision` + 0;
+  if ($BASE_revision > 1000) {
+    my $residue = $BASE_revision % 1000;
+    my $thousands = $BASE_revision - $residue;
+    @revnums = map {
+      $_ >= 1000
+        ? $_
+        : $thousands + $_ - 1000 * ($_ > $residue)
+      }
+      @revnums;
+  }
+
+  # Deduplicate and sort
   @revnums = sort { $a <=> $b } keys %{{ map { $_ => 1 } @revnums }};
   die "No revision numbers specified" unless @revnums;
 
diff --git a/tools/dist/backport/merger.py b/tools/dist/backport/merger.py
index 863750c..9a556c0 100644
--- a/tools/dist/backport/merger.py
+++ b/tools/dist/backport/merger.py
@@ -151,13 +151,13 @@ def log_message_file(logmsg):
     logmsg_file.write(logmsg)
     logmsg_file.flush()
     yield logmsg_file.name
-  
+
 def merge(entry, expected_stderr=None, *, commit=False):
   """Merges ENTRY into the working copy at cwd.
 
   Do not commit the result, unless COMMIT is true.  When committing,
   remove ENTRY from its STATUS file prior to committing.
-  
+
   EXPECTED_STDERR will be passed to run_svn() for the actual 'merge' command."""
 
   assert isinstance(entry, backport.status.StatusEntry)
@@ -225,7 +225,7 @@ def merge(entry, expected_stderr=None, *, commit=False):
 
   if entry.branch:
     revnum = last_changed_revision('./STATUS')
-    
+
     if commit:
       # Sleep to avoid out-of-order commit notifications
       if not os.getenv("SVN_BACKPORT_DONT_SLEEP"): # enabled by the test suite
diff --git a/tools/dist/backport/status.py b/tools/dist/backport/status.py
index 7ec378d..e7a4edd 100644
--- a/tools/dist/backport/status.py
+++ b/tools/dist/backport/status.py
@@ -85,7 +85,7 @@ class Paragraph:
 
   def __init__(self, kind, text, entry, containing_section):
     """Constructor.
-    
+
     KIND is one of the Kind.* enumerators.
 
     TEXT is the physical text in the file, used by unparsing.
@@ -109,7 +109,7 @@ class Paragraph:
   @classmethod
   def is_header(cls, para_text):
     """PARA_TEXT is a single physical paragraph, as a bare multiline string.
-    
+
     If PARA_TEXT is a section header, return the header text; else, return
     False."""
     lines = para_text.split('\n', 2)
@@ -135,7 +135,7 @@ class Paragraph:
 
   def approved(self):
     "TRUE if this paragraph is in the approved section, false otherwise."
-    assert self.kind 
+    assert self.kind
     # ### backport.pl used to check just .startswith() here.
     return self.section() == "Approved changes"
 
@@ -335,7 +335,7 @@ class StatusEntry:
   def __init__(self, para_text, status_file=None):
     """Parse an entry from PARA_TEXT, and add it to SELF.  PARA_TEXT must
     contain exactly one entry, as a single multiline string.
-    
+
     STATUS_FILE is the StatusFile object containing this entry, if any.
     """
     self.branch = None
@@ -499,7 +499,7 @@ class StatusEntry:
     assert self.valid()
     suffix = "" if len(self.logsummary) == 1 else " [...]"
     return self.logsummary[0] + suffix
-             
+
   # Private for is_vetoed()
   _re_vetoed = re.compile(r'^\s*(-1:|-1\s*[()])', re.MULTILINE)
   def is_vetoed(self):
diff --git a/tools/dist/backport_tests.py b/tools/dist/backport_tests.py
index 27df294..26de6f0 100644
--- a/tools/dist/backport_tests.py
+++ b/tools/dist/backport_tests.py
@@ -528,7 +528,7 @@ def backport_double_conflict(sbox):
   #    ...
   #    Warning summary
   #    ===============
-  #    
+  #
   #    r4 (default logsummary): subshell exited with code 256
   # And backport.pl would exit with exit code 1.
 
diff --git a/tools/dist/checksums.py b/tools/dist/checksums.py
index 6ac7231..f00ed46 100755
--- a/tools/dist/checksums.py
+++ b/tools/dist/checksums.py
@@ -19,7 +19,7 @@
 # under the License.
 #
 #
-# Check MD5 and SHA-1 and SHA-2 signatures of files, using 
+# Check MD5 and SHA-1 and SHA-2 signatures of files, using
 # md5sums, sha1sums, and/or sha512sums as manifests
 # Replaces the 'md5sum', 'sha1sum', and 'sha512sums' commands
 # on systems that do not have them, such as Mac OS X or Windows.
diff --git a/tools/dist/create-minor-release-branch.py b/tools/dist/create-minor-release-branch.py
deleted file mode 100755
index a68fa23..0000000
--- a/tools/dist/create-minor-release-branch.py
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/usr/bin/env python
-# python: coding=utf-8
-#
-# 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.
-#
-
-
-# About this script:
-#   This script is intended to automate steps in creating a new Subversion
-#   minor release.
-
-import os
-import re
-import sys
-import logging
-import subprocess
-import argparse       # standard in Python 2.7
-
-from release import Version
-
-
-# Some constants
-repos = 'https://svn.apache.org/repos/asf/subversion'
-secure_repos = 'https://svn.apache.org/repos/asf/subversion'
-buildbot_repos = 'https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster'
-
-# Parameters
-dry_run = False
-
-# Local working copies
-base_dir = None  # set by main()
-
-def get_trunk_wc_path(path=None):
-    trunk_wc_path = os.path.join(base_dir, 'svn-trunk')
-    if path is None: return trunk_wc_path
-    return os.path.join(trunk_wc_path, path)
-def get_branch_wc_path(ver, path=None):
-    branch_wc_path = os.path.join(base_dir, ver.branch + '.x')
-    if path is None: return branch_wc_path
-    return os.path.join(branch_wc_path, path)
-def get_buildbot_wc_path(path=None):
-    buildbot_wc_path = os.path.join(base_dir, 'svn-buildmaster')
-    if path is None: return buildbot_wc_path
-    return os.path.join(buildbot_wc_path, path)
-
-def get_trunk_url():
-    return secure_repos + '/trunk'
-def get_branch_url(ver):
-    return secure_repos + '/branches/' + ver.branch + '.x'
-def get_tag_url(ver):
-    return secure_repos + '/tags/' + ver.base
-def get_buildbot_url():
-    return buildbot_repos
-
-#----------------------------------------------------------------------
-# Utility functions
-
-def run(cmd, dry_run=False):
-    print('+ ' + ' '.join(cmd))
-    if not dry_run:
-        stdout = subprocess.check_output(cmd)
-        print(stdout)
-    else:
-        print('  ## dry-run; not executed')
-
-def run_svn(cmd, dry_run=False):
-    run(['svn'] + cmd, dry_run)
-
-def svn_commit(cmd):
-    run_svn(['commit'] + cmd, dry_run=dry_run)
-
-def svn_copy_branch(src, dst, message):
-    args = ['copy', src, dst, '-m', message]
-    run_svn(args, dry_run=dry_run)
-
-def svn_checkout(url, wc, *args):
-    args = ['checkout', url, wc] + list(args)
-    run_svn(args)
-
-#----------------------------------------------------------------------
-def edit_file(path, pattern, replacement):
-    print("Editing '%s'" % (path,))
-    print("  pattern='%s'" % (pattern,))
-    print("  replace='%s'" % (replacement,))
-    old_text = open(path, 'r').read()
-    new_text = re.sub(pattern, replacement, old_text)
-    assert new_text != old_text
-    open(path, 'w').write(new_text)
-
-def edit_changes_file(path, newtext):
-    """Insert NEWTEXT in the 'CHANGES' file found at PATH,
-       just before the first line that starts with 'Version '.
-    """
-    print("Prepending to '%s'" % (path,))
-    print("  text='%s'" % (newtext,))
-    lines = open(path, 'r').readlines()
-    for i, line in enumerate(lines):
-      if line.startswith('Version '):
-        with open(path, 'w') as newfile:
-          newfile.writelines(lines[:i])
-          newfile.write(newtext)
-          newfile.writelines(lines[i:])
-        break
-
-#----------------------------------------------------------------------
-def make_release_branch(ver, revnum):
-    svn_copy_branch(get_trunk_url() + '@' + (str(revnum) if revnum else ''),
-                    get_branch_url(ver),
-                    'Create the ' + ver.branch + '.x release branch.')
-
-#----------------------------------------------------------------------
-def update_minor_ver_in_trunk(ver, revnum):
-    """Change the minor version in trunk to the next (future) minor version.
-    """
-    trunk_wc = get_trunk_wc_path()
-    trunk_url = get_trunk_url()
-    svn_checkout(trunk_url + '@' + (str(revnum) if revnum else ''),
-                 trunk_wc)
-
-    prev_ver = Version('1.%d.0' % (ver.minor - 1,))
-    next_ver = Version('1.%d.0' % (ver.minor + 1,))
-    relpaths = []
-
-    relpath = 'subversion/include/svn_version.h'
-    relpaths.append(relpath)
-    edit_file(get_trunk_wc_path(relpath),
-              r'(#define SVN_VER_MINOR *)%s' % (ver.minor,),
-              r'\g<1>%s' % (next_ver.minor,))
-
-    relpath = 'subversion/tests/cmdline/svntest/main.py'
-    relpaths.append(relpath)
-    edit_file(get_trunk_wc_path(relpath),
-              r'(SVN_VER_MINOR = )%s' % (ver.minor,),
-              r'\g<1>%s' % (next_ver.minor,))
-
-    relpath = 'subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java'
-    relpaths.append(relpath)
-    try:
-        # since r1817921 (just after branching 1.10)
-        edit_file(get_trunk_wc_path(relpath),
-                  r'SVN_VER_MINOR = %s;' % (ver.minor,),
-                  r'SVN_VER_MINOR = %s;' % (next_ver.minor,))
-    except:
-        # before r1817921: two separate places
-        edit_file(get_trunk_wc_path(relpath),
-                  r'version.isAtLeast\(1, %s, 0\)' % (ver.minor,),
-                  r'version.isAtLeast\(1, %s, 0\)' % (next_ver.minor,))
-        edit_file(get_trunk_wc_path(relpath),
-                  r'1.%s.0, but' % (ver.minor,),
-                  r'1.%s.0, but' % (next_ver.minor,))
-
-    relpath = 'CHANGES'
-    relpaths.append(relpath)
-    # insert at beginning of CHANGES file
-    edit_changes_file(get_trunk_wc_path(relpath),
-                 'Version ' + next_ver.base + '\n'
-                 + '(?? ??? 20XX, from /branches/' + next_ver.branch + '.x)\n'
-                 + get_tag_url(next_ver) + '\n'
-                 + '\n')
-
-    log_msg = '''\
-Increment the trunk version number to %s, and introduce a new CHANGES
-section, following the creation of the %s.x release branch.
-
-* subversion/include/svn_version.h,
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,
-  subversion/tests/cmdline/svntest/main.py
-    (SVN_VER_MINOR): Increment to %s.
-
-* CHANGES: New section for %s.0.
-''' % (next_ver.branch, ver.branch, next_ver.minor, next_ver.branch)
-    commit_paths = [get_trunk_wc_path(p) for p in relpaths]
-    svn_commit(commit_paths + ['-m', log_msg])
-
-#----------------------------------------------------------------------
-def create_status_file_on_branch(ver):
-    branch_wc = get_branch_wc_path(ver)
-    branch_url = get_branch_url(ver)
-    svn_checkout(branch_url, branch_wc, '--depth=immediates')
-
-    status_local_path = os.path.join(branch_wc, 'STATUS')
-    text='''\
-      * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-      *                                                     *
-      *  THIS RELEASE STREAM IS OPEN FOR STABILIZATION.     *
-      *                                                     *
-      * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-This file tracks the status of releases in the %s.x line.
-
-See http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
-for details on how release lines and voting work, what kinds of bugs can
-delay a release, etc.
-
-Status of %s:
-
-Candidate changes:
-==================
-
-
-Veto-blocked changes:
-=====================
-
-
-Approved changes:
-=================
-''' % (ver.branch, ver.base)
-    open(status_local_path, 'wx').write(text)
-    run_svn(['add', status_local_path])
-    svn_commit([status_local_path,
-                '-m', '* branches/' + ver.branch + '.x/STATUS: New file.'])
-
-#----------------------------------------------------------------------
-def update_backport_bot(ver):
-    print("""MANUAL STEP: Fork & edit & pull-request on GitHub:
-https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnqavm_pvm_asf/manifests/init.pp
-"Add new %s.x branch to list of backport branches"
-""" % (ver.branch,))
-    print("""Someone needs to run the 'svn checkout' manually.
-The exact checkout command is documented in machines/svn-qavm2/notes.txt
-in the private repository (need to use a trunk client and the svn-master.a.o
-hostname).
-""")
-
-#----------------------------------------------------------------------
-def update_buildbot_config(ver):
-    """Add the new branch to the list of branches monitored by the buildbot
-       master.
-    """
-    buildbot_wc = get_buildbot_wc_path()
-    buildbot_url = get_buildbot_url()
-    svn_checkout(buildbot_url, buildbot_wc)
-
-    prev_ver = Version('1.%d.0' % (ver.minor - 1,))
-    next_ver = Version('1.%d.0' % (ver.minor + 1,))
-
-    relpath = 'master1/projects/subversion.conf'
-    edit_file(get_buildbot_wc_path(relpath),
-              r'(MINOR_LINES=\[.*%s)(\])' % (prev_ver.minor,),
-              r'\1, %s\2' % (ver.minor,))
-
-    log_msg = '''\
-Subversion: start monitoring the %s branch.
-''' % (ver.branch)
-    commit_paths = [get_buildbot_wc_path(relpath)]
-    svn_commit(commit_paths + ['-m', log_msg])
-
-#----------------------------------------------------------------------
-def create_release_branch(args):
-    make_release_branch(args.version, args.revnum)
-    update_minor_ver_in_trunk(args.version, args.revnum)
-    create_status_file_on_branch(args.version)
-    update_backport_bot(args.version)
-    update_buildbot_config(args.version)
-
-
-#----------------------------------------------------------------------
-# Main entry point for argument parsing and handling
-
-def main():
-    'Parse arguments, and drive the appropriate subcommand.'
-
-    # Setup our main parser
-    parser = argparse.ArgumentParser(
-                            description='Create an Apache Subversion release branch.')
-    subparsers = parser.add_subparsers(title='subcommands')
-
-    # Setup the parser for the create-release-branch subcommand
-    subparser = subparsers.add_parser('create-release-branch',
-                    help='''Create a minor release branch: branch from trunk,
-                            update version numbers on trunk, create status
-                            file on branch, update backport bot,
-                            update buildbot config.''')
-    subparser.set_defaults(func=create_release_branch)
-    subparser.add_argument('version', type=Version,
-                    help='''A version number to indicate the branch, such as
-                            '1.7.0' (the '.0' is required).''')
-    subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')),
-                           nargs='?', default=None,
-                    help='''The trunk revision number to base the branch on.
-                            Default is HEAD.''')
-    subparser.add_argument('--dry-run', action='store_true', default=False,
-                   help='Avoid committing any changes to repositories.')
-    subparser.add_argument('--verbose', action='store_true', default=False,
-                   help='Increase output verbosity')
-    subparser.add_argument('--base-dir', default=os.getcwd(),
-                   help='''The directory in which to create needed files and
-                           folders.  The default is the current working
-                           directory.''')
-
-    # Parse the arguments
-    args = parser.parse_args()
-
-    global base_dir, dry_run
-    base_dir = args.base_dir
-    dry_run = args.dry_run
-
-    # Set up logging
-    logger = logging.getLogger()
-    if args.verbose:
-        logger.setLevel(logging.DEBUG)
-    else:
-        logger.setLevel(logging.INFO)
-
-    # Make timestamps in tarballs independent of local timezone
-    os.environ['TZ'] = 'UTC'
-
-    # finally, run the subcommand, and give it the parsed arguments
-    args.func(args)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/dist/release-lines.yaml b/tools/dist/release-lines.yaml
new file mode 100644
index 0000000..4b39aac
--- /dev/null
+++ b/tools/dist/release-lines.yaml
@@ -0,0 +1,30 @@
+# This file specifies metadata that may vary between release lines, that
+# is usually common to all releases in a release line, for all potentially
+# interesting release lines.
+---
+tool_versions:
+  '1.8':
+    autoconf: ['2.69', '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969']
+    libtool: ['2.4.3', '36b4881c1843d7585de9c66c4c3d9a067ed3a3f792bc670beba21f5a4960acdf']
+    swig: ['2.0.9', '586954000d297fafd7e91d1ad31089cc7e249f658889d11a44605d3662569539']
+  '1.9':
+    autoconf: ['2.69', '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969']
+    libtool: ['2.4.6', 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3']
+    swig: ['2.0.12', '65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7']
+  '1.10': &TOOL_VERSIONS_1_10
+    autoconf: ['2.69', '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969']
+    libtool: ['2.4.6', 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3']
+    swig: ['3.0.12', '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d']
+  '1.11': *TOOL_VERSIONS_1_10
+  '1.12': *TOOL_VERSIONS_1_10
+  '1.13': *TOOL_VERSIONS_1_10
+  '1.14': *TOOL_VERSIONS_1_10
+  'trunk': *TOOL_VERSIONS_1_10
+
+# The version that is our current recommended release
+recommended_release: '1.13'
+# For clean-dist, a whitelist of artifacts to keep, by version.
+supported_release_lines: ['1.9', '1.10', '1.13']
+# Long-Term Support (LTS) versions
+lts_release_lines: ['1.9', '1.10', '1.14']
+
diff --git a/tools/dist/release.py b/tools/dist/release.py
index 5b12c00..141f937 100755
--- a/tools/dist/release.py
+++ b/tools/dist/release.py
@@ -41,7 +41,10 @@ import sys
 import glob
 import fnmatch
 import shutil
-import urllib2
+try:
+  from urllib.request import urlopen  # Python 3
+except:
+  from urllib2 import urlopen  # Python 2
 import hashlib
 import tarfile
 import logging
@@ -52,6 +55,7 @@ import itertools
 import subprocess
 import argparse       # standard in Python 2.7
 import io
+import yaml
 
 import backport.status
 
@@ -67,78 +71,33 @@ except ImportError:
     sys.path.remove(ezt_path)
 
 
+def get_dist_metadata_file_path():
+    return os.path.join(os.path.abspath(sys.path[0]), 'release-lines.yaml')
+
+# Read the dist metadata (about release lines)
+with open(get_dist_metadata_file_path(), 'r') as stream:
+    dist_metadata = yaml.safe_load(stream)
+
 # Our required / recommended release tool versions by release branch
-tool_versions = {
-  'trunk' : {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.6',
-            'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
-            'swig'     : ['3.0.12',
-            '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
-  },
-  '1.13' : {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.6',
-            'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
-            'swig'     : ['3.0.12',
-            '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
-  },
-  '1.12' : {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.6',
-            'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
-            'swig'     : ['3.0.12',
-            '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
-  },
-  '1.11' : {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.6',
-            'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
-            'swig'     : ['3.0.12',
-            '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
-  },
-  '1.10' : {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.6',
-            'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
-            'swig'     : ['3.0.12',
-            '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
-  },
-  '1.9' : {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.6',
-            'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
-            'swig'     : ['2.0.12',
-            '65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7'],
-  },
-  '1.8' : {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.3',
-            '36b4881c1843d7585de9c66c4c3d9a067ed3a3f792bc670beba21f5a4960acdf'],
-            'swig'     : ['2.0.9',
-            '586954000d297fafd7e91d1ad31089cc7e249f658889d11a44605d3662569539'],
-  },
-}
+tool_versions = dist_metadata['tool_versions']
 
 # The version that is our current recommended release
-# ### TODO: derive this from svn_version.h; see ../../build/getversion.py
-recommended_release = '1.12'
+recommended_release = dist_metadata['recommended_release']
 # For clean-dist, a whitelist of artifacts to keep, by version.
-supported_release_lines = frozenset({"1.9", "1.10", "1.12", "1.13"})
+supported_release_lines = frozenset(dist_metadata['supported_release_lines'])
+# Long-Term Support (LTS) versions
+lts_release_lines = frozenset(dist_metadata['lts_release_lines'])
 
 # Some constants
-svn_repos = 'https://svn.apache.org/repos/asf/subversion'
-dist_repos = 'https://dist.apache.org/repos/dist'
+svn_repos = os.getenv('SVN_RELEASE_SVN_REPOS',
+                      'https://svn.apache.org/repos/asf/subversion')
+dist_repos = os.getenv('SVN_RELEASE_DIST_REPOS',
+                       'https://dist.apache.org/repos/dist')
 dist_dev_url = dist_repos + '/dev/subversion'
 dist_release_url = dist_repos + '/release/subversion'
 dist_archive_url = 'https://archive.apache.org/dist/subversion'
+buildbot_repos = os.getenv('SVN_RELEASE_BUILDBOT_REPOS',
+                           'https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster')
 KEYS = 'https://people.apache.org/keys/group/subversion.asc'
 extns = ['zip', 'tar.gz', 'tar.bz2']
 
@@ -183,18 +142,6 @@ class Version(object):
     def is_prerelease(self):
         return self.pre != None
 
-    def is_recommended(self):
-        return self.branch == recommended_release
-
-    def get_download_anchor(self):
-        if self.is_prerelease():
-            return 'pre-releases'
-        else:
-            if self.is_recommended():
-                return 'recommended-release'
-            else:
-                return 'supported-releases'
-
     def get_ver_tags(self, revnum):
         # These get substituted into svn_version.h
         ver_tag = ''
@@ -212,7 +159,7 @@ class Version(object):
             ver_tag = '" (Nightly Build r%d)"' % revnum
             ver_numtag = '"-nightly-r%d"' % revnum
         else:
-            ver_tag = '" (r%d)"' % revnum 
+            ver_tag = '" (r%d)"' % revnum
             ver_numtag = '""'
         return (ver_tag, ver_numtag)
 
@@ -282,15 +229,12 @@ def get_exportdir(base_dir, version, revnum):
     return os.path.join(get_tempdir(base_dir),
                         'subversion-%s-r%d' % (version, revnum))
 
-def get_deploydir(base_dir):
-    return os.path.join(base_dir, 'deploy')
-
 def get_target(args):
     "Return the location of the artifacts"
     if args.target:
         return args.target
     else:
-        return get_deploydir(args.base_dir)
+        return os.path.join(args.base_dir, 'deploy')
 
 def get_branch_path(args):
     if not args.branch:
@@ -309,12 +253,14 @@ def get_tmplfile(filename):
         return open(os.path.join(get_tmpldir(), filename))
     except IOError:
         # Hmm, we had a problem with the local version, let's try the repo
-        return urllib2.urlopen(svn_repos + '/trunk/tools/dist/templates/' + filename)
+        return urlopen(svn_repos + '/trunk/tools/dist/templates/' + filename)
 
 def get_nullfile():
     return open(os.path.devnull, 'w')
 
-def run_script(verbose, script, hide_stderr=False):
+def run_command(cmd, verbose=True, hide_stderr=False, dry_run=False):
+    if verbose:
+        print("+ " + ' '.join(cmd))
     stderr = None
     if verbose:
         stdout = None
@@ -323,23 +269,62 @@ def run_script(verbose, script, hide_stderr=False):
         if hide_stderr:
             stderr = get_nullfile()
 
+    if not dry_run:
+        subprocess.check_call(cmd, stdout=stdout, stderr=stderr)
+    else:
+        print('  ## dry-run; not executed')
+
+def run_script(verbose, script, hide_stderr=False):
     for l in script.split('\n'):
-        subprocess.check_call(l.split(), stdout=stdout, stderr=stderr)
+        run_command(l.split(), verbose, hide_stderr)
 
 def download_file(url, target, checksum):
-    response = urllib2.urlopen(url)
-    target_file = open(target, 'w+')
+    """Download the file at URL to the local path TARGET.
+    If CHECKSUM is a string, verify the checksum of the downloaded
+    file and raise RuntimeError if it does not match.  If CHECKSUM
+    is None, do not verify the downloaded file.
+    """
+    assert checksum is None or isinstance(checksum, str)
+
+    response = urlopen(url)
+    target_file = open(target, 'w+b')
     target_file.write(response.read())
     target_file.seek(0)
     m = hashlib.sha256()
     m.update(target_file.read())
     target_file.close()
     checksum2 = m.hexdigest()
-    if checksum != checksum2:
+    if checksum is not None and checksum != checksum2:
         raise RuntimeError("Checksum mismatch for '%s': "\
                            "downloaded: '%s'; expected: '%s'" % \
                            (target, checksum, checksum2))
 
+def run_svn(cmd, verbose=True, dry_run=False, username=None):
+    if (username):
+        cmd[:0] = ['--username', username]
+    run_command(['svn'] + cmd, verbose=verbose, dry_run=dry_run)
+
+def run_svnmucc(cmd, verbose=True, dry_run=False, username=None):
+    if (username):
+        cmd[:0] = ['--username', username]
+    run_command(['svnmucc'] + cmd, verbose=verbose, dry_run=dry_run)
+
+#----------------------------------------------------------------------
+def is_lts(version):
+    return version.branch in lts_release_lines
+
+def is_recommended(version):
+    return version.branch == recommended_release
+
+def get_download_anchor(version):
+    if version.is_prerelease():
+        return 'pre-releases'
+    else:
+        if is_recommended(version):
+            return 'recommended-release'
+        else:
+            return 'supported-releases'
+
 #----------------------------------------------------------------------
 # ezt helpers
 
@@ -363,7 +348,7 @@ def cleanup(args):
 
     shutil.rmtree(get_prefix(args.base_dir), True)
     shutil.rmtree(get_tempdir(args.base_dir), True)
-    shutil.rmtree(get_deploydir(args.base_dir), True)
+    shutil.rmtree(get_target(args), True)
 
 
 #----------------------------------------------------------------------
@@ -378,7 +363,8 @@ class RollDep(object):
 
     def _test_version(self, cmd):
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT)
+                                stderr=subprocess.STDOUT,
+                                universal_newlines=True)
         (stdout, stderr) = proc.communicate()
         rc = proc.wait()
         if rc: return ''
@@ -520,13 +506,236 @@ def build_env(args):
 
 
 #----------------------------------------------------------------------
+# Create a new minor release branch
+
+def get_trunk_wc_path(base_dir, path=None):
+    trunk_wc_path = os.path.join(get_tempdir(base_dir), 'svn-trunk')
+    if path is None: return trunk_wc_path
+    return os.path.join(trunk_wc_path, path)
+
+def get_buildbot_wc_path(base_dir, path=None):
+    buildbot_wc_path = os.path.join(get_tempdir(base_dir), 'svn-buildmaster')
+    if path is None: return buildbot_wc_path
+    return os.path.join(buildbot_wc_path, path)
+
+def get_trunk_url(revnum=None):
+    return svn_repos + '/trunk' + '@' + (str(revnum) if revnum else '')
+
+def get_branch_url(ver):
+    return svn_repos + '/branches/' + ver.branch + '.x'
+
+def get_tag_url(ver):
+    return svn_repos + '/tags/' + ver.base
+
+def edit_file(path, pattern, replacement):
+    print("Editing '%s'" % (path,))
+    print("  pattern='%s'" % (pattern,))
+    print("  replace='%s'" % (replacement,))
+    old_text = open(path, 'r').read()
+    new_text = re.sub(pattern, replacement, old_text)
+    assert new_text != old_text
+    open(path, 'w').write(new_text)
+
+def edit_changes_file(path, newtext):
+    """Insert NEWTEXT in the 'CHANGES' file found at PATH,
+       just before the first line that starts with 'Version '.
+    """
+    print("Prepending to '%s'" % (path,))
+    print("  text='%s'" % (newtext,))
+    lines = open(path, 'r').readlines()
+    for i, line in enumerate(lines):
+      if line.startswith('Version '):
+        with open(path, 'w') as newfile:
+          newfile.writelines(lines[:i])
+          newfile.write(newtext)
+          newfile.writelines(lines[i:])
+        break
+
+#----------------------------------------------------------------------
+def make_release_branch(args):
+    ver = args.version
+    run_svn(['copy',
+             get_trunk_url(args.revnum),
+             get_branch_url(ver),
+             '-m', 'Create the ' + ver.branch + '.x release branch.'],
+            dry_run=args.dry_run)
+
+#----------------------------------------------------------------------
+def update_minor_ver_in_trunk(args):
+    """Change the minor version in trunk to the next (future) minor version.
+    """
+    ver = args.version
+    trunk_wc = get_trunk_wc_path(args.base_dir)
+    run_svn(['checkout',
+             get_trunk_url(args.revnum),
+             trunk_wc])
+
+    prev_ver = Version('1.%d.0' % (ver.minor - 1,))
+    next_ver = Version('1.%d.0' % (ver.minor + 1,))
+    relpaths = []
+
+    relpath = 'subversion/include/svn_version.h'
+    relpaths.append(relpath)
+    edit_file(get_trunk_wc_path(args.base_dir, relpath),
+              r'(#define SVN_VER_MINOR *)%s' % (ver.minor,),
+              r'\g<1>%s' % (next_ver.minor,))
+
+    relpath = 'subversion/tests/cmdline/svntest/main.py'
+    relpaths.append(relpath)
+    edit_file(get_trunk_wc_path(args.base_dir, relpath),
+              r'(SVN_VER_MINOR = )%s' % (ver.minor,),
+              r'\g<1>%s' % (next_ver.minor,))
+
+    relpath = 'subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java'
+    relpaths.append(relpath)
+    try:
+        # since r1817921 (just after branching 1.10)
+        edit_file(get_trunk_wc_path(args.base_dir, relpath),
+                  r'SVN_VER_MINOR = %s;' % (ver.minor,),
+                  r'SVN_VER_MINOR = %s;' % (next_ver.minor,))
+    except:
+        # before r1817921: two separate places
+        edit_file(get_trunk_wc_path(args.base_dir, relpath),
+                  r'version.isAtLeast\(1, %s, 0\)' % (ver.minor,),
+                  r'version.isAtLeast\(1, %s, 0\)' % (next_ver.minor,))
+        edit_file(get_trunk_wc_path(args.base_dir, relpath),
+                  r'1.%s.0, but' % (ver.minor,),
+                  r'1.%s.0, but' % (next_ver.minor,))
+
+    relpath = 'CHANGES'
+    relpaths.append(relpath)
+    # insert at beginning of CHANGES file
+    edit_changes_file(get_trunk_wc_path(args.base_dir, relpath),
+                 'Version ' + next_ver.base + '\n'
+                 + '(?? ??? 20XX, from /branches/' + next_ver.branch + '.x)\n'
+                 + get_tag_url(next_ver) + '\n'
+                 + '\n')
+
+    log_msg = '''\
+Increment the trunk version number to %s, and introduce a new CHANGES
+section, following the creation of the %s.x release branch.
+
+* subversion/include/svn_version.h,
+  subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,
+  subversion/tests/cmdline/svntest/main.py
+    (SVN_VER_MINOR): Increment to %s.
+
+* CHANGES: New section for %s.0.
+''' % (next_ver.branch, ver.branch, next_ver.minor, next_ver.branch)
+    commit_paths = [get_trunk_wc_path(args.base_dir, p) for p in relpaths]
+    run_svn(['commit'] + commit_paths + ['-m', log_msg],
+            dry_run=args.dry_run)
+
+#----------------------------------------------------------------------
+def create_status_file_on_branch(args):
+    ver = args.version
+    branch_wc = get_workdir(args.base_dir)
+    branch_url = get_branch_url(ver)
+    run_svn(['checkout', branch_url, branch_wc, '--depth=immediates'])
+
+    status_local_path = os.path.join(branch_wc, 'STATUS')
+    template_filename = 'STATUS.ezt'
+    data = { 'major-minor'          : ver.branch,
+             'major-minor-patch'    : ver.base,
+           }
+
+    template = ezt.Template(compress_whitespace=False)
+    template.parse(get_tmplfile(template_filename).read())
+
+    with open(status_local_path, 'wx') as g:
+        template.generate(g, data)
+    run_svn(['add', status_local_path])
+    run_svn(['commit', status_local_path,
+             '-m', '* branches/' + ver.branch + '.x/STATUS: New file.'],
+            dry_run=args.dry_run)
+
+#----------------------------------------------------------------------
+def update_backport_bot(args):
+    ver = args.version
+    print("""\
+
+*** MANUAL STEP REQUIRED ***
+
+  Ask someone with appropriate access to add the %s.x branch
+  to the backport merge bot.  See
+  http://subversion.apache.org/docs/community-guide/releasing.html#backport-merge-bot
+
+***
+
+""" % (ver.branch,))
+
+#----------------------------------------------------------------------
+def update_buildbot_config(args):
+    """Add the new branch to the list of branches monitored by the buildbot
+       master.
+    """
+    ver = args.version
+    buildbot_wc = get_buildbot_wc_path(args.base_dir)
+    run_svn(['checkout', buildbot_repos, buildbot_wc])
+
+    prev_ver = Version('1.%d.0' % (ver.minor - 1,))
+    next_ver = Version('1.%d.0' % (ver.minor + 1,))
+
+    relpath = 'master1/projects/subversion.conf'
+    edit_file(get_buildbot_wc_path(args.base_dir, relpath),
+              r'(MINOR_LINES=\[.*%s)(\])' % (prev_ver.minor,),
+              r'\1, %s\2' % (ver.minor,))
+
+    log_msg = '''\
+Subversion: start monitoring the %s branch.
+''' % (ver.branch)
+    commit_paths = [get_buildbot_wc_path(args.base_dir, relpath)]
+    run_svn(['commit'] + commit_paths + ['-m', log_msg],
+            dry_run=args.dry_run)
+
+#----------------------------------------------------------------------
+def create_release_branch(args):
+    make_release_branch(args)
+    update_minor_ver_in_trunk(args)
+    create_status_file_on_branch(args)
+    update_backport_bot(args)
+    update_buildbot_config(args)
+
+
+#----------------------------------------------------------------------
+def write_release_notes(args):
+
+    # Create a skeleton release notes file from template
+
+    template_filename = \
+        'release-notes-lts.ezt' if is_lts(args.version) else 'release-notes.ezt'
+
+    prev_ver = Version('%d.%d.0' % (args.version.major, args.version.minor - 1))
+    data = { 'major-minor'          : args.version.branch,
+             'previous-major-minor' : prev_ver.branch,
+           }
+
+    template = ezt.Template(compress_whitespace=False)
+    template.parse(get_tmplfile(template_filename).read())
+
+    if args.edit_html_file:
+        with open(args.edit_html_file, 'w') as g:
+            template.generate(g, data)
+    else:
+        template.generate(sys.stdout, data)
+
+    # Add an "in progress" entry in the release notes index
+    #
+    index_file = os.path.normpath(args.edit_html_file + '/../index.html')
+    marker = '<ul id="release-notes-list">\n'
+    new_item = '<li><a href="%s.html">Subversion %s</a> – <i>in progress</i></li>\n' % (args.version.branch, args.version.branch)
+    edit_file(index_file,
+              re.escape(marker),
+              (marker + new_item).replace('\\', r'\\'))
+
+#----------------------------------------------------------------------
 # Create release artifacts
 
 def compare_changes(repos, branch, revision):
     mergeinfo_cmd = ['svn', 'mergeinfo', '--show-revs=eligible',
                      repos + '/trunk/CHANGES',
                      repos + '/' + branch + '/' + 'CHANGES']
-    stdout = subprocess.check_output(mergeinfo_cmd)
+    stdout = subprocess.check_output(mergeinfo_cmd, universal_newlines=True)
     if stdout:
       # Treat this as a warning since we are now putting entries for future
       # minor releases in CHANGES on trunk.
@@ -544,7 +753,7 @@ def check_copyright_year(repos, branch, revision):
         file_url = (repos + '/' + branch + '/'
                     + branch_relpath + '@' + str(revision))
         cat_cmd = ['svn', 'cat', file_url]
-        stdout = subprocess.check_output(cat_cmd)
+        stdout = subprocess.check_output(cat_cmd, universal_newlines=True)
         m = _copyright_re.search(stdout)
         if m:
             year = m.group('year')
@@ -596,17 +805,18 @@ def roll_tarballs(args):
         compare_changes(svn_repos, branch, args.revnum)
 
     # Ensure the output directory doesn't already exist
-    if os.path.exists(get_deploydir(args.base_dir)):
+    if os.path.exists(get_target(args)):
         raise RuntimeError('output directory \'%s\' already exists'
-                                            % get_deploydir(args.base_dir))
+                                            % get_target(args))
 
-    os.mkdir(get_deploydir(args.base_dir))
+    os.mkdir(get_target(args))
 
     logging.info('Preparing working copy source')
     shutil.rmtree(get_workdir(args.base_dir), True)
-    run_script(args.verbose, 'svn checkout %s %s'
-               % (svn_repos + '/' + branch + '@' + str(args.revnum),
-                  get_workdir(args.base_dir)))
+    run_svn(['checkout',
+             svn_repos + '/' + branch + '@' + str(args.revnum),
+             get_workdir(args.base_dir)],
+            verbose=args.verbose)
 
     # Exclude stuff we don't want in the tarball, it will not be present
     # in the exported tree.
@@ -617,8 +827,8 @@ def roll_tarballs(args):
             exclude += ['packages', 'www']
     cwd = os.getcwd()
     os.chdir(get_workdir(args.base_dir))
-    run_script(args.verbose,
-               'svn update --set-depth exclude %s' % " ".join(exclude))
+    run_svn(['update', '--set-depth=exclude'] + exclude,
+            verbose=args.verbose)
     os.chdir(cwd)
 
     if args.patches:
@@ -628,10 +838,10 @@ def roll_tarballs(args):
         for name in os.listdir(args.patches):
             if name.find(majmin) != -1 and name.endswith('patch'):
                 logging.info('Applying patch %s' % name)
-                run_script(args.verbose,
-                           '''svn patch %s %s'''
-                           % (os.path.join(args.patches, name),
-                              get_workdir(args.base_dir)))
+                run_svn(['patch',
+                         os.path.join(args.patches, name),
+                         get_workdir(args.base_dir)],
+                        verbose=args.verbose)
 
     # Massage the new version number into svn_version.h.
     ver_tag, ver_numtag = args.version.get_ver_tags(args.revnum)
@@ -666,11 +876,12 @@ def roll_tarballs(args):
     def export(windows):
         shutil.rmtree(exportdir, True)
         if windows:
-            eol_style = "--native-eol CRLF"
+            eol_style = "--native-eol=CRLF"
         else:
-            eol_style = "--native-eol LF"
-        run_script(args.verbose, "svn export %s %s %s"
-                   % (eol_style, get_workdir(args.base_dir), exportdir))
+            eol_style = "--native-eol=LF"
+        run_svn(['export',
+                 eol_style, get_workdir(args.base_dir), exportdir],
+                verbose=args.verbose)
 
     def transform_sql():
         for root, dirs, files in os.walk(exportdir):
@@ -744,25 +955,33 @@ def roll_tarballs(args):
     for e in extns:
         filename = basename + '.' + e
         filepath = os.path.join(get_tempdir(args.base_dir), filename)
-        shutil.move(filepath, get_deploydir(args.base_dir))
-        filepath = os.path.join(get_deploydir(args.base_dir), filename)
+        shutil.move(filepath, get_target(args))
+        filepath = os.path.join(get_target(args), filename)
         if args.version < Version("1.11.0-alpha1"):
             # 1.10 and earlier generate *.sha1 files for compatibility reasons.
             # They are deprecated, however, so we don't publicly link them in
             # the announcements any more.
             m = hashlib.sha1()
-            m.update(open(filepath, 'r').read())
+            m.update(open(filepath, 'rb').read())
             open(filepath + '.sha1', 'w').write(m.hexdigest())
         m = hashlib.sha512()
-        m.update(open(filepath, 'r').read())
+        m.update(open(filepath, 'rb').read())
         open(filepath + '.sha512', 'w').write(m.hexdigest())
 
     # Nightlies do not get tagged so do not need the header
     if args.version.pre != 'nightly':
         shutil.copy(os.path.join(get_workdir(args.base_dir),
                                  'subversion', 'include', 'svn_version.h'),
-                    os.path.join(get_deploydir(args.base_dir),
-                                 'svn_version.h.dist-%s' % str(args.version)))
+                    os.path.join(get_target(args),
+                                 'svn_version.h.dist-%s'
+                                   % (str(args.version),)))
+
+        # Download and "tag" the KEYS file (in case a signing key is removed
+        # from a committer's LDAP profile down the road)
+        basename = 'subversion-%s.KEYS' % (str(args.version),)
+        filepath = os.path.join(get_tempdir(args.base_dir), basename)
+        download_file(KEYS, filepath, None)
+        shutil.move(filepath, get_target(args))
 
     # And we're done!
 
@@ -804,14 +1023,12 @@ def post_candidates(args):
 
     logging.info('Importing tarballs to %s' % dist_dev_url)
     ver = str(args.version)
-    svn_cmd = ['svn', 'import', '-m',
+    svn_cmd = ['import', '-m',
                'Add Subversion %s candidate release artifacts' % ver,
                '--auto-props', '--config-option',
                'config:auto-props:*.asc=svn:eol-style=native;svn:mime-type=text/plain',
                target, dist_dev_url]
-    if (args.username):
-        svn_cmd += ['--username', args.username]
-    subprocess.check_call(svn_cmd)
+    run_svn(svn_cmd, verbose=args.verbose, username=args.username)
 
 #----------------------------------------------------------------------
 # Create tag
@@ -828,10 +1045,7 @@ def create_tag_only(args):
 
     tag = svn_repos + '/tags/' + str(args.version)
 
-    svnmucc_cmd = ['svnmucc', '-m',
-                   'Tagging release ' + str(args.version)]
-    if (args.username):
-        svnmucc_cmd += ['--username', args.username]
+    svnmucc_cmd = ['-m', 'Tagging release ' + str(args.version)]
     svnmucc_cmd += ['cp', str(args.revnum), branch_url, tag]
     svnmucc_cmd += ['put', os.path.join(target, 'svn_version.h.dist' + '-' +
                                         str(args.version)),
@@ -839,7 +1053,7 @@ def create_tag_only(args):
 
     # don't redirect stdout/stderr since svnmucc might ask for a password
     try:
-        subprocess.check_call(svnmucc_cmd)
+        run_svnmucc(svnmucc_cmd, verbose=args.verbose, username=args.username)
     except subprocess.CalledProcessError:
         if args.version.is_prerelease():
             logging.error("Do you need to pass --branch=trunk?")
@@ -878,7 +1092,8 @@ def bump_versions_on_branch(args):
                            args.version.patch + 1))
 
     HEAD = subprocess.check_output(['svn', 'info', '--show-item=revision',
-                                    '--', branch_url]).strip()
+                                    '--', branch_url],
+                                   universal_newlines=True).strip()
     HEAD = int(HEAD)
     def file_object_for(relpath):
         fd = tempfile.NamedTemporaryFile()
@@ -898,13 +1113,14 @@ def bump_versions_on_branch(args):
 
     svn_version_h.seek(0, os.SEEK_SET)
     STATUS.seek(0, os.SEEK_SET)
-    subprocess.check_call(['svnmucc', '-r', str(HEAD),
-                           '-m', 'Post-release housekeeping: '
-                                 'bump the %s branch to %s.'
-                           % (branch_url.split('/')[-1], str(new_version)),
-                           'put', svn_version_h.name, svn_version_h.url,
-                           'put', STATUS.name, STATUS.url,
-                          ])
+    run_svnmucc(['-r', str(HEAD),
+                 '-m', 'Post-release housekeeping: '
+                       'bump the %s branch to %s.'
+                 % (branch_url.split('/')[-1], str(new_version)),
+                 'put', svn_version_h.name, svn_version_h.url,
+                 'put', STATUS.name, STATUS.url,
+                ],
+                verbose=args.verbose, username=args.username)
     del svn_version_h
     del STATUS
 
@@ -924,7 +1140,8 @@ def clean_dist(args):
     '''Clean the distribution directory of release artifacts of
     no-longer-supported minor lines.'''
 
-    stdout = subprocess.check_output(['svn', 'list', dist_release_url])
+    stdout = subprocess.check_output(['svn', 'list', dist_release_url],
+                                     universal_newlines=True)
 
     def minor(version):
         """Return the minor release line of the parameter, which must be
@@ -946,10 +1163,8 @@ def clean_dist(args):
     for i in sorted(to_keep):
         logging.info("Saving release '%s'", i)
 
-    svnmucc_cmd = ['svnmucc', '-m', 'Remove old Subversion releases.\n' +
+    svnmucc_cmd = ['-m', 'Remove old Subversion releases.\n' +
                    'They are still available at ' + dist_archive_url]
-    if (args.username):
-        svnmucc_cmd += ['--username', args.username]
     for filename in filenames:
         if Version(filename) not in to_keep:
             logging.info("Removing %r", filename)
@@ -957,7 +1172,7 @@ def clean_dist(args):
 
     # don't redirect stdout/stderr since svnmucc might ask for a password
     if 'rm' in svnmucc_cmd:
-        subprocess.check_call(svnmucc_cmd)
+        run_svnmucc(svnmucc_cmd, verbose=args.verbose, username=args.username)
     else:
         logging.info("Nothing to remove")
 
@@ -967,16 +1182,15 @@ def clean_dist(args):
 def move_to_dist(args):
     'Move candidate artifacts to the distribution directory.'
 
-    stdout = subprocess.check_output(['svn', 'list', dist_dev_url])
+    stdout = subprocess.check_output(['svn', 'list', dist_dev_url],
+                                     universal_newlines=True)
 
     filenames = []
     for entry in stdout.split('\n'):
       if fnmatch.fnmatch(entry, 'subversion-%s.*' % str(args.version)):
         filenames.append(entry)
-    svnmucc_cmd = ['svnmucc', '-m',
+    svnmucc_cmd = ['-m',
                    'Publish Subversion-%s.' % str(args.version)]
-    if (args.username):
-        svnmucc_cmd += ['--username', args.username]
     svnmucc_cmd += ['rm', dist_dev_url + '/' + 'svn_version.h.dist'
                           + '-' + str(args.version)]
     for filename in filenames:
@@ -985,20 +1199,24 @@ def move_to_dist(args):
 
     # don't redirect stdout/stderr since svnmucc might ask for a password
     logging.info('Moving release artifacts to %s' % dist_release_url)
-    subprocess.check_call(svnmucc_cmd)
+    run_svnmucc(svnmucc_cmd, verbose=args.verbose, username=args.username)
 
 #----------------------------------------------------------------------
 # Write announcements
 
 def write_news(args):
     'Write text for the Subversion website.'
-    data = { 'date' : datetime.date.today().strftime('%Y%m%d'),
-             'date_pres' : datetime.date.today().strftime('%Y-%m-%d'),
+    if args.news_release_date:
+        release_date = datetime.datetime.strptime(args.news_release_date, '%Y-%m-%d')
+    else:
+        release_date = datetime.date.today()
+    data = { 'date' : release_date.strftime('%Y%m%d'),
+             'date_pres' : release_date.strftime('%Y-%m-%d'),
              'major-minor' : args.version.branch,
              'version' : str(args.version),
              'version_base' : args.version.base,
-             'anchor': args.version.get_download_anchor(),
-             'is_recommended': ezt_bool(args.version.is_recommended()),
+             'anchor': get_download_anchor(args.version),
+             'is_recommended': ezt_bool(is_recommended(args.version)),
              'announcement_url': args.announcement_url,
            }
 
@@ -1058,7 +1276,7 @@ def write_announcement(args):
              'siginfo'              : "\n".join(siginfo) + "\n",
              'major-minor'          : args.version.branch,
              'major-minor-patch'    : args.version.base,
-             'anchor'               : args.version.get_download_anchor(),
+             'anchor'               : get_download_anchor(args.version),
            }
 
     if args.version.is_prerelease():
@@ -1153,9 +1371,9 @@ def get_siginfo(args, quiet=False):
                                  % (n, filename, key_end))
                 sys.exit(1)
 
-            fd, fn = tempfile.mkstemp()
-            os.write(fd, key_start + key)
-            os.close(fd)
+            fd, fn = tempfile.mkstemp(text=True)
+            with os.fdopen(fd, 'w') as key_file:
+              key_file.write(key_start + key)
             verified = gpg.verify_file(open(fn, 'rb'), filename[:-4])
             os.unlink(fn)
 
@@ -1177,6 +1395,7 @@ def get_siginfo(args, quiet=False):
         gpg_output = subprocess.check_output(
             ['gpg', '--fixed-list-mode', '--with-colons', '--fingerprint', id],
             stderr=subprocess.STDOUT,
+            universal_newlines=True,
         )
         gpg_output = gpg_output.splitlines()
 
@@ -1244,7 +1463,7 @@ def get_keys(args):
     'Import the LDAP-based KEYS file to gpg'
     # We use a tempfile because urlopen() objects don't have a .fileno()
     with tempfile.SpooledTemporaryFile() as fd:
-        fd.write(urllib2.urlopen(KEYS).read())
+        fd.write(urlopen(KEYS).read())
         fd.flush()
         fd.seek(0)
         subprocess.check_call(['gpg', '--import'], stdin=fd)
@@ -1256,18 +1475,18 @@ def add_to_changes_dict(changes_dict, audience, section, change, revision):
     if section:
         section = section.lower()
     change = change.strip()
-    
+
     if not audience in changes_dict:
         changes_dict[audience] = dict()
     if not section in changes_dict[audience]:
         changes_dict[audience][section] = dict()
-    
+
     changes = changes_dict[audience][section]
     if change in changes:
         changes[change].add(revision)
     else:
         changes[change] = set([revision])
-        
+
 def print_section(changes_dict, audience, section, title, mandatory=False):
     if audience in changes_dict:
         audience_changes = changes_dict[audience]
@@ -1304,7 +1523,7 @@ def write_changelog(args):
     # Putting [skip], [ignore], [c:skip] or [c:ignore] somewhere in the
     # log message means this commit must be ignored for Changelog processing
     # (ignored even with the --include-unlabeled-summaries option).
-    # 
+    #
     # If there is no changes label anywhere in the commit message, and the
     # --include-unlabeled-summaries option is used, we'll consider the summary
     # line of the commit message (= first line except if it starts with a *)
@@ -1323,9 +1542,10 @@ def write_changelog(args):
     previous = svn_repos + '/' + args.previous
     include_unlabeled = args.include_unlabeled
     separator_line = ('-' * 72) + '\n'
-    
+
     mergeinfo = subprocess.check_output(['svn', 'mergeinfo', '--show-revs',
-                    'eligible', '--log', branch_url, previous])
+                    'eligible', '--log', branch_url, previous],
+                                        universal_newlines=True)
     log_messages_dict = {
         # This is a dictionary mapping revision numbers to their respective
         # log messages.  The expression in the "key:" part of the dict
@@ -1336,7 +1556,7 @@ def write_changelog(args):
         for log_message in mergeinfo.split(separator_line)[1:-1]
     }
     mergeinfo = mergeinfo.splitlines()
-    
+
     separator_pattern = re.compile('^-{72}$')
     revline_pattern = re.compile('^r(\d+) \| [^\|]+ \| [^\|]+ \| \d+ lines?$')
     changes_prefix_pattern = re.compile(r'^\[(U|D)?:?([^\]]+)?\](.+)$')
@@ -1353,7 +1573,7 @@ def write_changelog(args):
     audience = None
     section = None
     message = None
-    
+
     for line in mergeinfo:
         if separator_pattern.match(line):
             # New revision section. Reset variables.
@@ -1370,7 +1590,7 @@ def write_changelog(args):
                     #      logic, in order to extract CHANGES_PREFIX_PATTERN
                     #      and CHANGES_SUFFIX_PATTERN lines from the trunk log
                     #      message.
-                    
+
                     # 2. Parse the STATUS entry
                     this_log_message = log_messages_dict[revision]
                     status_paragraph = this_log_message.split('\n\n')[2]
@@ -1411,7 +1631,7 @@ def write_changelog(args):
 
         if re.search(r'\[(c:)?(skip|ignore)\]', line, re.IGNORECASE):
             changes_ignore = True
-            
+
         prefix_match = changes_prefix_pattern.match(line)
         if prefix_match:
             audience = prefix_match.group(1)
@@ -1459,17 +1679,25 @@ def main():
     parser = argparse.ArgumentParser(
                             description='Create an Apache Subversion release.')
     parser.add_argument('--clean', action='store_true', default=False,
-                   help='Remove any directories previously created by %(prog)s')
+                   help='''Remove any directories previously created by %(prog)s,
+                           including the 'prefix' dir, the 'temp' dir, and the
+                           default or specified target dir.''')
     parser.add_argument('--verbose', action='store_true', default=False,
                    help='Increase output verbosity')
     parser.add_argument('--base-dir', default=os.getcwd(),
                    help='''The directory in which to create needed files and
                            folders.  The default is the current working
                            directory.''')
+    parser.add_argument('--target',
+                   help='''The full path to the directory containing
+                           release artifacts. Default: <BASE_DIR>/deploy''')
     parser.add_argument('--branch',
                    help='''The branch to base the release on,
                            as a path relative to ^/subversion/.
                            Default: 'branches/MAJOR.MINOR.x'.''')
+    parser.add_argument('--username',
+                   help='Username for committing to ' + svn_repos +
+                        ' or ' + dist_repos + '.')
     subparsers = parser.add_subparsers(title='subcommands')
 
     # Setup the parser for the build-env subcommand
@@ -1487,6 +1715,40 @@ def main():
                     help='''Attempt to use existing build dependencies before
                             downloading and building a private set.''')
 
+    # Setup the parser for the create-release-branch subcommand
+    subparser = subparsers.add_parser('create-release-branch',
+                    help='''Create a minor release branch: branch from trunk,
+                            update version numbers on trunk, create status
+                            file on branch, update backport bot,
+                            update buildbot config.''')
+    subparser.set_defaults(func=create_release_branch)
+    subparser.add_argument('version', type=Version,
+                    help='''A version number to indicate the branch, such as
+                            '1.7.0' (the '.0' is required).''')
+    subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')),
+                           nargs='?', default=None,
+                    help='''The trunk revision number to base the branch on.
+                            Default is HEAD.''')
+    subparser.add_argument('--dry-run', action='store_true', default=False,
+                   help='Avoid committing any changes to repositories.')
+
+    # Setup the parser for the create-release-branch subcommand
+    subparser = subparsers.add_parser('write-release-notes',
+                    help='''Write a template release-notes file.''')
+    subparser.set_defaults(func=write_release_notes)
+    subparser.add_argument('version', type=Version,
+                    help='''A version number to indicate the branch, such as
+                            '1.7.0' (the '.0' is required).''')
+    subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')),
+                           nargs='?', default=None,
+                    help='''The trunk revision number to base the branch on.
+                            Default is HEAD.''')
+    subparser.add_argument('--edit-html-file',
+                    help='''Write the template release-notes to this file,
+                            and update 'index.html' in the same directory.''')
+    subparser.add_argument('--dry-run', action='store_true', default=False,
+                   help='Avoid committing any changes to repositories.')
+
     # Setup the parser for the roll subcommand
     subparser = subparsers.add_parser('roll',
                     help='''Create the release artifacts.''')
@@ -1504,9 +1766,6 @@ def main():
     subparser.set_defaults(func=sign_candidates)
     subparser.add_argument('version', type=Version,
                     help='''The release label, such as '1.7.0-alpha1'.''')
-    subparser.add_argument('--target',
-                    help='''The full path to the directory containing
-                            release artifacts.''')
     subparser.add_argument('--userid',
                     help='''The (optional) USER-ID specifying the key to be
                             used for signing, such as '110B1C95' (Key-ID). If
@@ -1519,11 +1778,6 @@ def main():
     subparser.set_defaults(func=post_candidates)
     subparser.add_argument('version', type=Version,
                     help='''The release label, such as '1.7.0-alpha1'.''')
-    subparser.add_argument('--username',
-                    help='''Username for ''' + dist_repos + '''.''')
-    subparser.add_argument('--target',
-                    help='''The full path to the directory containing
-                            release artifacts.''')
 
     # Setup the parser for the create-tag subcommand
     subparser = subparsers.add_parser('create-tag',
@@ -1534,11 +1788,6 @@ def main():
                     help='''The release label, such as '1.7.0-alpha1'.''')
     subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')),
                     help='''The revision number to base the release on.''')
-    subparser.add_argument('--username',
-                    help='''Username for ''' + svn_repos + '''.''')
-    subparser.add_argument('--target',
-                    help='''The full path to the directory containing
-                            release artifacts.''')
 
     # Setup the parser for the bump-versions-on-branch subcommand
     subparser = subparsers.add_parser('bump-versions-on-branch',
@@ -1548,11 +1797,6 @@ def main():
                     help='''The release label, such as '1.7.0-alpha1'.''')
     subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')),
                     help='''The revision number to base the release on.''')
-    subparser.add_argument('--username',
-                    help='''Username for ''' + svn_repos + '''.''')
-    subparser.add_argument('--target',
-                    help='''The full path to the directory containing
-                            release artifacts.''')
 
     # The clean-dist subcommand
     subparser = subparsers.add_parser('clean-dist',
@@ -1560,8 +1804,6 @@ def main():
     subparser.set_defaults(func=clean_dist)
     subparser.add_argument('--dist-dir',
                     help='''The directory to clean.''')
-    subparser.add_argument('--username',
-                    help='''Username for ''' + dist_repos + '''.''')
 
     # The move-to-dist subcommand
     subparser = subparsers.add_parser('move-to-dist',
@@ -1571,8 +1813,6 @@ def main():
     subparser.set_defaults(func=move_to_dist)
     subparser.add_argument('version', type=Version,
                     help='''The release label, such as '1.7.0-alpha1'.''')
-    subparser.add_argument('--username',
-                    help='''Username for ''' + dist_repos + '''.''')
 
     # The write-news subcommand
     subparser = subparsers.add_parser('write-news',
@@ -1581,6 +1821,9 @@ def main():
     subparser.set_defaults(func=write_news)
     subparser.add_argument('--announcement-url',
                     help='''The URL to the archived announcement email.''')
+    subparser.add_argument('--news-release-date',
+                    help='''The release date for the news, as YYYY-MM-DD.
+                            Default: today.''')
     subparser.add_argument('--edit-html-file',
                     help='''Insert the text into this file
                             news.html, index.html).''')
@@ -1595,9 +1838,6 @@ def main():
     subparser.add_argument('--security', action='store_true', default=False,
                     help='''The release being announced includes security
                             fixes.''')
-    subparser.add_argument('--target',
-                    help='''The full path to the directory containing
-                            release artifacts.''')
     subparser.add_argument('version', type=Version,
                     help='''The release label, such as '1.7.0-alpha1'.''')
 
@@ -1606,9 +1846,6 @@ def main():
                     help='''Output to stdout template text for the download
                             table for subversion.apache.org''')
     subparser.set_defaults(func=write_downloads)
-    subparser.add_argument('--target',
-                    help='''The full path to the directory containing
-                            release artifacts.''')
     subparser.add_argument('version', type=Version,
                     help='''The release label, such as '1.7.0-alpha1'.''')
 
@@ -1619,9 +1856,6 @@ def main():
     subparser.set_defaults(func=check_sigs)
     subparser.add_argument('version', type=Version,
                     help='''The release label, such as '1.7.0-alpha1'.''')
-    subparser.add_argument('--target',
-                    help='''The full path to the directory containing
-                            release artifacts.''')
 
     # get-keys
     subparser = subparsers.add_parser('get-keys',
@@ -1641,7 +1875,7 @@ def main():
                             like [U:client], [D:api], [U], ...''')
     subparser.set_defaults(func=write_changelog)
     subparser.add_argument('previous',
-                    help='''The "previous" branch or tag, relative to 
+                    help='''The "previous" branch or tag, relative to
                             ^/subversion/, to compare "branch" against.''')
     subparser.add_argument('--include-unlabeled-summaries',
                     dest='include_unlabeled',
@@ -1652,7 +1886,7 @@ def main():
                             summary line contains 'STATUS', 'CHANGES',
                             'Post-release housekeeping', 'Follow-up' or starts
                             with '*').''')
-    
+
     # Parse the arguments
     args = parser.parse_args()
 
diff --git a/tools/dist/security/_gnupg.py b/tools/dist/security/_gnupg.py
index 037dbf3..a19e4e1 100644
--- a/tools/dist/security/_gnupg.py
+++ b/tools/dist/security/_gnupg.py
@@ -1,9 +1,9 @@
 # Copyright (c) 2008-2014 by Vinay Sajip.
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 #    * Redistributions of source code must retain the above copyright notice,
 #      this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above copyright notice,
diff --git a/tools/dist/templates/STATUS.ezt b/tools/dist/templates/STATUS.ezt
new file mode 100644
index 0000000..a896ff4
--- /dev/null
+++ b/tools/dist/templates/STATUS.ezt
@@ -0,0 +1,24 @@
+      * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+      *                                                     *
+      *  THIS RELEASE STREAM IS OPEN FOR STABILIZATION.     *
+      *                                                     *
+      * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+This file tracks the status of releases in the [major-minor].x line.
+
+See http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
+for details on how release lines and voting work, what kinds of bugs can
+delay a release, etc.
+
+Status of [major-minor-patch]:
+
+Candidate changes:
+==================
+
+
+Veto-blocked changes:
+=====================
+
+
+Approved changes:
+=================
diff --git a/tools/dist/templates/download.ezt b/tools/dist/templates/download.ezt
index 19dac3d..3043b2b 100644
--- a/tools/dist/templates/download.ezt
+++ b/tools/dist/templates/download.ezt
@@ -4,12 +4,12 @@
   <th>File</th>
   <th>Checksum (SHA512)</th>
   <th>Signatures</th>
+  <th>PGP Public Keys</th>
 </tr>
 [for fileinfo]<tr>
   <td><a href="[[]preferred]subversion/[fileinfo.filename]">[fileinfo.filename]</a></td>
-  <!-- The sha512 line does not have a class="checksum" since the link needn't
-       be rendered in monospace. -->
   <td>[<a href="https://www.apache.org/dist/subversion/[fileinfo.filename].sha512">SHA-512</a>]</td>
-  <td>[<a href="https://www.apache.org/dist/subversion/[fileinfo.filename].asc">PGP</a>]</td>
+  <td>[<a href="https://www.apache.org/dist/subversion/[fileinfo.filename].asc">PGP signatures</a>]</td>
+  <td>[<a href="https://www.apache.org/dist/subversion/subversion-[version].KEYS">PGP keyring</a>]</td>
 </tr>[end]
 </table>
diff --git a/tools/dist/templates/rc-release-ann.ezt b/tools/dist/templates/rc-release-ann.ezt
index a8bb0f5..ea8e673 100644
--- a/tools/dist/templates/rc-release-ann.ezt
+++ b/tools/dist/templates/rc-release-ann.ezt
@@ -23,6 +23,10 @@ PGP Signatures are available at:
 For this release, the following people have provided PGP signatures:
 
 [siginfo]
+These public keys are available at:
+
+    https://www.apache.org/dist/subversion/subversion-[version].KEYS
+
 This is a pre-release for what will eventually become version [major-minor-patch] of the
 Apache Subversion open source version control system.  It may contain known
 issues, a complete list of [major-minor-patch]-blocking issues can be found
diff --git a/tools/dist/templates/release-notes-lts.ezt b/tools/dist/templates/release-notes-lts.ezt
new file mode 100644
index 0000000..d28c0cf
--- /dev/null
+++ b/tools/dist/templates/release-notes-lts.ezt
@@ -0,0 +1,251 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Apache Subversion [major-minor] LTS Release Notes</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<style type="text/css">
+  @import url("/style/site.css");
+</style>
+</head>
+
+<body>
+<!--#include virtual="/site-banner.html" -->
+<!--#include virtual="/site-nav.html" -->
+<div id="site-content">
+<!--#include virtual="/site-notice.html" -->
+<!-- **************** BEGIN CONTENT ***************** -->
+
+<!-- ************************************************ -->
+<!-- Sections start with "###" are either templates   -->
+<!-- or TODOs.  Remove them before release.           -->
+<!-- ************************************************ -->
+
+<h1 style="text-align: center">Apache Subversion [major-minor] LTS Release Notes</h1>
+
+<div class="notice">
+<p><span style="color: red"><b>This is work in progress.
+  Subversion [major-minor] has not been released yet.</b></span></p>
+</div>
+
+<div class="h2" id="news">
+<h2>What's New in Apache Subversion [major-minor]
+  <a class="sectionlink" href="#news"
+    title="Link to this section">&para;</a>
+</h2>
+
+<ul>
+  <!-- The main changes...
+  <li><a href="#"
+      >###</a></li>
+  -->
+  <li><a href="#enhancements"
+      >Many enhancements and bug fixes</a></li>
+  <li><a href="#issues"
+      >Known issues in the release</a></li>
+  <!--
+  <li><a href="#troubleshooting"
+      >Troubleshooting issues specific to this release</a></li>
+  -->
+</ul>
+
+<p>Apache Subversion [major-minor] is a superset of all previous Subversion
+releases, and is as of the time of its release considered the current
+"best" release.  Any feature or bugfix in 1.0.x through [previous-major-minor].x is also
+in [major-minor], but [major-minor] contains features and bugfixes not present in any
+earlier release.</p>
+
+<p>This page describes only major changes.  For a complete list of
+changes, see the [major-minor] section of the <a
+href="https://svn.apache.org/repos/asf/subversion/trunk/CHANGES" >CHANGES</a>
+file.</p>
+
+</div>  <!-- news -->
+
+<div class="h2" id="compatibility">
+<h2>Compatibility Concerns
+  <a class="sectionlink" href="#compatibility"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Older clients and servers interoperate transparently with [major-minor]
+servers and clients.  However, some of the new [major-minor] features may not be
+available unless both client and server are the latest version.  There are
+also cases where a new feature will work but will run less efficiently if
+the client is new and the server old.</p>
+
+<p>There is <strong>no need</strong> to <a href="http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin"
+>dump and reload</a> your repositories. 
+Subversion [major-minor] servers can read and write to repositories created by
+earlier versions.  To upgrade an existing server installation, just install the
+newest libraries and binaries on top of the older ones.</p>
+
+<p>Subversion [major-minor] maintains API/ABI compatibility with earlier
+releases, by only adding new functions, never removing old ones.  A
+program written to any previous 1.x API can both compile
+and run using [major-minor] libraries.  However, a program written for [major-minor]
+cannot necessarily compile or run against older libraries.</p>
+
+<p>There may be limited cases where the behavior of old APIs has been
+slightly modified from previous releases.  These are cases where edge cases
+of the functionality has been deemed buggy, and therefore improved or removed.
+Please consult the
+<a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/api-errata/[major-minor]/"
+>API errata</a> for more detailed information on what these APIs are
+and what impact these changes may have.</p>
+
+<div class="h3" id="new-feature-compatibility-table">
+<h3>New Feature Compatibility Table
+  <a class="sectionlink" href="#new-feature-compatibility-table"
+    title="Link to this section">&para;</a>
+</h3>
+<table border="1">
+  <tr>
+    <th>New Feature</th>
+    <th>Minimum Client<sup>1</sup></th>
+    <th>Minimum Server</th>
+    <th>Minimum Repository</th>
+    <th>Notes</th></tr>
+</table>
+
+</div>  <!-- new-feature-compatibility-table -->
+
+<div class="h3" id="wc-upgrade">
+<h3>Upgrading the Working Copy
+  <a class="sectionlink" href="#wc-upgrade"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>Subversion [major-minor] uses the same working copy format as Subversion 1.8 through [previous-major-minor].</p>
+
+<p>Before using Subversion [major-minor] with an existing Subversion 1.7 or older
+working copy, users will be required to run the <tt>svn upgrade</tt> command
+to upgrade working copy metadata to the new format. This command may take a
+while in some cases, and for some users, it may be more practical to simply
+checkout a new working copy.</p>
+
+<p><strong>Note:</strong> Subversion [major-minor] cannot upgrade working copies that
+a 1.6 client would have refused to operate upon before an <tt>svn cleanup</tt>
+was run (with a 1.6 client).  In other words, before upgrading to 1.8 or newer,
+a 1.6
+or older client must be used to run <tt>svn cleanup</tt> on all 1.6 or older
+working copies that require cleanup.  Likewise, Subversion [major-minor] cannot upgrade
+corrupt working copies. Unfixable problems can arise from missing or corrupt
+meta-data inside <tt>.svn</tt> directories.  Such damage to the working copy
+is permanent, and cannot be fixed even if <tt>svn cleanup</tt> is run prior
+to the upgrade.</p>
+
+<p>If your working copy does not upgrade cleanly, please check out a new one.
+</p>
+
+</div>  <!-- wc-upgrade -->
+
+<!-- (This section only makes sense when there are some issues listed in it.)
+<div class="h3" id="compat-misc">
+<h3>Miscellaneous Compatibility Notes
+  <a class="sectionlink" href="#compat-misc"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>There are some additional specific areas where changes made in this
+release might necessitate further adjustment by administrators or
+users.  We'll cover those in this section.</p>
+
+</div>  <!- - compat-misc - ->
+-->
+
+</div>  <!-- compatibility -->
+
+<div class="h2" id="new-features">
+<h2>New Features
+  <a class="sectionlink" href="#new-features"
+    title="Link to this section">&para;</a>
+</h2>
+
+</div>  <!-- new-features -->
+
+<div class="h2" id="enhancements">
+<h2>Enhancements and Bugfixes
+  <a class="sectionlink" href="#enhancements"
+    title="Link to this section">&para;</a>
+</h2>
+
+<!-- Don't need to highlight every bugfix, just major ones which aren't in
+     any patch release. -->
+
+<div class="h3" id="cmdline">
+<h3>Command-line client improvements (<em>client</em>)
+  <a class="sectionlink" href="#cmdline"
+    title="Link to this section">&para;</a>
+</h3>
+
+</div> <!-- cmdline -->
+
+<div class="h3" id="server-side-improvements">
+<h3>Server-side improvements
+  <a class="sectionlink" href="#server-side-improvements"
+     title="Link to this section">&para;</a>
+</h3>
+
+</div> <!-- server-side-improvements -->
+
+<div class="h3" id="client-server-improvements">
+<h3>Client- and server-side improvements
+  <a class="sectionlink" href="#client-server-improvements"
+     title="Link to this section">&para;</a>
+</h3>
+
+</div> <!-- client-server-improvements -->
+
+</div>  <!-- enhancements -->
+
+<div class="h2" id="issues">
+<h2>Known issues in the release
+  <a class="sectionlink" href="#issues"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>There are no known issues specific to this release at the moment.</p>
+
+<!--
+<p>There are some known issues in the Subversion [major-minor] releases.  These
+may be fixed in later [major-minor].x releases.</p>
+-->
+
+</div>  <!-- issues -->
+
+<!-- (This section only makes sense when there are some issues listed in it.)
+<div class="h2" id="troubleshooting">
+<h2>Troubleshooting issues specific to this release
+  <a class="sectionlink" href="#troubleshooting"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Subversion [major-minor] introduces new features and makes use of new techniques
+which can trigger problems not encountered in previous versions. In contrast to
+known issues, things listed here are not due to some bug or issue in Subversion
+itself and therefore cannot be fixed with a new patch release.
+This section lists all known problems and provides instructions to solve them,
+if they occur.</p>
+
+<p>There are no known issues specific to this release at the moment.</p>
+
+</div>  <!- - troubleshooting - ->
+-->
+
+<div class="h2" id="lts-release">
+<h2>Subversion [major-minor].x is a Long-Term Support (LTS) Release
+  <a class="sectionlink" href="#lts-release"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>[major-minor] is a Long-Term Support (LTS) release.
+   See <a href="/docs/release-notes/#supported-versions">Supported Versions</a>
+   and <a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
+
+</div>  <!-- lts-release -->
+
+<!-- ***************** END CONTENT ****************** -->
+</div> <!-- #site-content -->
+</body>
+</html>
diff --git a/tools/dist/templates/release-notes.ezt b/tools/dist/templates/release-notes.ezt
new file mode 100644
index 0000000..b07193d
--- /dev/null
+++ b/tools/dist/templates/release-notes.ezt
@@ -0,0 +1,251 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Apache Subversion [major-minor] Release Notes</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<style type="text/css">
+  @import url("/style/site.css");
+</style>
+</head>
+
+<body>
+<!--#include virtual="/site-banner.html" -->
+<!--#include virtual="/site-nav.html" -->
+<div id="site-content">
+<!--#include virtual="/site-notice.html" -->
+<!-- **************** BEGIN CONTENT ***************** -->
+
+<!-- ************************************************ -->
+<!-- Sections start with "###" are either templates   -->
+<!-- or TODOs.  Remove them before release.           -->
+<!-- ************************************************ -->
+
+<h1 style="text-align: center">Apache Subversion [major-minor] Release Notes</h1>
+
+<div class="notice">
+<p><span style="color: red"><b>This is work in progress.
+  Subversion [major-minor] has not been released yet.</b></span></p>
+</div>
+
+<div class="h2" id="news">
+<h2>What's New in Apache Subversion [major-minor]
+  <a class="sectionlink" href="#news"
+    title="Link to this section">&para;</a>
+</h2>
+
+<ul>
+  <!-- The main changes...
+  <li><a href="#"
+      >###</a></li>
+  -->
+  <li><a href="#enhancements"
+      >Many enhancements and bug fixes</a></li>
+  <li><a href="#issues"
+      >Known issues in the release</a></li>
+  <!--
+  <li><a href="#troubleshooting"
+      >Troubleshooting issues specific to this release</a></li>
+  -->
+</ul>
+
+<p>Apache Subversion [major-minor] is a superset of all previous Subversion
+releases, and is as of the time of its release considered the current
+"best" release.  Any feature or bugfix in 1.0.x through [previous-major-minor].x is also
+in [major-minor], but [major-minor] contains features and bugfixes not present in any
+earlier release.</p>
+
+<p>This page describes only major changes.  For a complete list of
+changes, see the [major-minor] section of the <a
+href="https://svn.apache.org/repos/asf/subversion/trunk/CHANGES" >CHANGES</a>
+file.</p>
+
+</div>  <!-- news -->
+
+<div class="h2" id="compatibility">
+<h2>Compatibility Concerns
+  <a class="sectionlink" href="#compatibility"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Older clients and servers interoperate transparently with [major-minor]
+servers and clients.  However, some of the new [major-minor] features may not be
+available unless both client and server are the latest version.  There are
+also cases where a new feature will work but will run less efficiently if
+the client is new and the server old.</p>
+
+<p>There is <strong>no need</strong> to <a href="http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin"
+>dump and reload</a> your repositories. 
+Subversion [major-minor] servers can read and write to repositories created by
+earlier versions.  To upgrade an existing server installation, just install the
+newest libraries and binaries on top of the older ones.</p>
+
+<p>Subversion [major-minor] maintains API/ABI compatibility with earlier
+releases, by only adding new functions, never removing old ones.  A
+program written to any previous 1.x API can both compile
+and run using [major-minor] libraries.  However, a program written for [major-minor]
+cannot necessarily compile or run against older libraries.</p>
+
+<p>There may be limited cases where the behavior of old APIs has been
+slightly modified from previous releases.  These are cases where edge cases
+of the functionality has been deemed buggy, and therefore improved or removed.
+Please consult the
+<a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/api-errata/[major-minor]/"
+>API errata</a> for more detailed information on what these APIs are
+and what impact these changes may have.</p>
+
+<div class="h3" id="new-feature-compatibility-table">
+<h3>New Feature Compatibility Table
+  <a class="sectionlink" href="#new-feature-compatibility-table"
+    title="Link to this section">&para;</a>
+</h3>
+<table border="1">
+  <tr>
+    <th>New Feature</th>
+    <th>Minimum Client<sup>1</sup></th>
+    <th>Minimum Server</th>
+    <th>Minimum Repository</th>
+    <th>Notes</th></tr>
+</table>
+
+</div>  <!-- new-feature-compatibility-table -->
+
+<div class="h3" id="wc-upgrade">
+<h3>Upgrading the Working Copy
+  <a class="sectionlink" href="#wc-upgrade"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>Subversion [major-minor] uses the same working copy format as Subversion 1.8 through [previous-major-minor].</p>
+
+<p>Before using Subversion [major-minor] with an existing Subversion 1.7 or older
+working copy, users will be required to run the <tt>svn upgrade</tt> command
+to upgrade working copy metadata to the new format. This command may take a
+while in some cases, and for some users, it may be more practical to simply
+checkout a new working copy.</p>
+
+<p><strong>Note:</strong> Subversion [major-minor] cannot upgrade working copies that
+a 1.6 client would have refused to operate upon before an <tt>svn cleanup</tt>
+was run (with a 1.6 client).  In other words, before upgrading to 1.8 or newer,
+a 1.6
+or older client must be used to run <tt>svn cleanup</tt> on all 1.6 or older
+working copies that require cleanup.  Likewise, Subversion [major-minor] cannot upgrade
+corrupt working copies. Unfixable problems can arise from missing or corrupt
+meta-data inside <tt>.svn</tt> directories.  Such damage to the working copy
+is permanent, and cannot be fixed even if <tt>svn cleanup</tt> is run prior
+to the upgrade.</p>
+
+<p>If your working copy does not upgrade cleanly, please check out a new one.
+</p>
+
+</div>  <!-- wc-upgrade -->
+
+<!-- (This section only makes sense when there are some issues listed in it.)
+<div class="h3" id="compat-misc">
+<h3>Miscellaneous Compatibility Notes
+  <a class="sectionlink" href="#compat-misc"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>There are some additional specific areas where changes made in this
+release might necessitate further adjustment by administrators or
+users.  We'll cover those in this section.</p>
+
+</div>  <!- - compat-misc - ->
+-->
+
+</div>  <!-- compatibility -->
+
+<div class="h2" id="new-features">
+<h2>New Features
+  <a class="sectionlink" href="#new-features"
+    title="Link to this section">&para;</a>
+</h2>
+
+</div>  <!-- new-features -->
+
+<div class="h2" id="enhancements">
+<h2>Enhancements and Bugfixes
+  <a class="sectionlink" href="#enhancements"
+    title="Link to this section">&para;</a>
+</h2>
+
+<!-- Don't need to highlight every bugfix, just major ones which aren't in
+     any patch release. -->
+
+<div class="h3" id="cmdline">
+<h3>Command-line client improvements (<em>client</em>)
+  <a class="sectionlink" href="#cmdline"
+    title="Link to this section">&para;</a>
+</h3>
+
+</div> <!-- cmdline -->
+
+<div class="h3" id="server-side-improvements">
+<h3>Server-side improvements
+  <a class="sectionlink" href="#server-side-improvements"
+     title="Link to this section">&para;</a>
+</h3>
+
+</div> <!-- server-side-improvements -->
+
+<div class="h3" id="client-server-improvements">
+<h3>Client- and server-side improvements
+  <a class="sectionlink" href="#client-server-improvements"
+     title="Link to this section">&para;</a>
+</h3>
+
+</div> <!-- client-server-improvements -->
+
+</div>  <!-- enhancements -->
+
+<div class="h2" id="issues">
+<h2>Known issues in the release
+  <a class="sectionlink" href="#issues"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>There are no known issues specific to this release at the moment.</p>
+
+<!--
+<p>There are some known issues in the Subversion [major-minor] releases.  These
+may be fixed in later [major-minor].x releases.</p>
+-->
+
+</div>  <!-- issues -->
+
+<!-- (This section only makes sense when there are some issues listed in it.)
+<div class="h2" id="troubleshooting">
+<h2>Troubleshooting issues specific to this release
+  <a class="sectionlink" href="#troubleshooting"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Subversion [major-minor] introduces new features and makes use of new techniques
+which can trigger problems not encountered in previous versions. In contrast to
+known issues, things listed here are not due to some bug or issue in Subversion
+itself and therefore cannot be fixed with a new patch release.
+This section lists all known problems and provides instructions to solve them,
+if they occur.</p>
+
+<p>There are no known issues specific to this release at the moment.</p>
+
+</div>  <!- - troubleshooting - ->
+-->
+
+<div class="h2" id="non-lts-release">
+<h2>Subversion [major-minor].x is a Regular Release
+  <a class="sectionlink" href="#non-lts-release"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>[major-minor] is a regular release, not a Long-Term Support release.
+   See <a href="/docs/release-notes/#supported-versions">Supported Versions</a>
+   and <a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
+
+</div>  <!-- non-lts-release -->
+
+<!-- ***************** END CONTENT ****************** -->
+</div> <!-- #site-content -->
+</body>
+</html>
diff --git a/tools/dist/templates/stable-release-ann.ezt b/tools/dist/templates/stable-release-ann.ezt
index dea8c88..06a8cad 100644
--- a/tools/dist/templates/stable-release-ann.ezt
+++ b/tools/dist/templates/stable-release-ann.ezt
@@ -34,6 +34,10 @@ PGP Signatures are available at:
 For this release, the following people have provided PGP signatures:
 
 [siginfo]
+These public keys are available at:
+
+    https://www.apache.org/dist/subversion/subversion-[version].KEYS
+
 Release notes for the [major-minor].x release series may be found at:
 
     https://subversion.apache.org/docs/release-notes/[major-minor].html
diff --git a/tools/examples/svnlook.py b/tools/examples/svnlook.py
index c289aeb..a576d3f 100755
--- a/tools/examples/svnlook.py
+++ b/tools/examples/svnlook.py
@@ -21,7 +21,7 @@
 #    under the License.
 ######################################################################
 #
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/examples/svnlook.py $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/tools/examples/svnlook.py $
 # $LastChangedDate: 2013-11-14 11:11:07 +0000 (Thu, 14 Nov 2013) $
 # $LastChangedRevision: 1541878 $
 
diff --git a/tools/examples/svnshell.py b/tools/examples/svnshell.py
index b05e7ef..9c67af4 100755
--- a/tools/examples/svnshell.py
+++ b/tools/examples/svnshell.py
@@ -56,8 +56,14 @@ class SVNShell(Cmd):
   def postcmd(self, stop, line):
     self._setup_prompt()
 
+  _errors = ["Huh?",
+             "Whatchoo talkin' 'bout, Willis?",
+             "Say what?",
+             "Nope.  Not gonna do it.",
+             "Ehh...I don't think so, chief."]
+
   def default(self, line):
-    print "Unknown command."
+    print(self._errors[randint(0, len(self._errors) - 1)])
 
   def do_cat(self, arg):
     """dump the contents of a file"""
diff --git a/tools/examples/walk-config-auth.py b/tools/examples/walk-config-auth.py
index 5841b6c..f31bf03 100755
--- a/tools/examples/walk-config-auth.py
+++ b/tools/examples/walk-config-auth.py
@@ -18,7 +18,7 @@ credentials found.
 """ % (sys.argv[0]))
   sys.exit(0)
 
-config_dir = svn.core.svn_config_get_user_config_path(None, '')
+config_dir = svn.core.svn_config_get_user_config_path(None, None)
 if len(sys.argv) > 1:
   config_dir = sys.argv[1]
 
diff --git a/tools/hook-scripts/commit-access-control.pl.in b/tools/hook-scripts/commit-access-control.pl.in
index ceb5e73..9d772e0 100755
--- a/tools/hook-scripts/commit-access-control.pl.in
+++ b/tools/hook-scripts/commit-access-control.pl.in
@@ -6,7 +6,7 @@
 # commit in repository REPOS using the permissions listed in the
 # configuration file CONF_FILE.
 #
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/hook-scripts/commit-access-control.pl.in $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/tools/hook-scripts/commit-access-control.pl.in $
 # $LastChangedDate: 2009-11-16 19:07:17 +0000 (Mon, 16 Nov 2009) $
 # $LastChangedBy: hwright $
 # $LastChangedRevision: 880911 $
diff --git a/tools/hook-scripts/mailer/mailer.conf.example b/tools/hook-scripts/mailer/mailer.conf.example
index 3887e6b..1a81c48 100644
--- a/tools/hook-scripts/mailer/mailer.conf.example
+++ b/tools/hook-scripts/mailer/mailer.conf.example
@@ -1,7 +1,7 @@
 #
 # mailer.conf: example configuration file for mailer.py
 #
-# $Id: mailer.conf.example 1777846 2017-01-07 19:35:49Z julianfoad $
+# $Id: mailer.conf.example 1872403 2020-01-07 01:08:27Z futatuki $
 
 [general]
 
@@ -23,6 +23,11 @@
 # This option specifies the hostname for delivery via SMTP.
 #smtp_hostname = localhost
 
+# This option specifies the TCP port number to connect for SMTP.
+# If it is not specified, 25 is used for SMTP and 465 is used for
+# SMTP-Over-SSL by default.
+#smtp_port = 25
+
 # Username and password for SMTP servers requiring authorisation.
 #smtp_username = example
 #smtp_password = example
diff --git a/tools/hook-scripts/mailer/mailer.py b/tools/hook-scripts/mailer/mailer.py
index b3045f3..09a6f75 100755
--- a/tools/hook-scripts/mailer/mailer.py
+++ b/tools/hook-scripts/mailer/mailer.py
@@ -22,10 +22,10 @@
 #
 # mailer.py: send email describing a commit
 #
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/hook-scripts/mailer/mailer.py $
-# $LastChangedDate: 2018-02-18 19:06:38 +0000 (Sun, 18 Feb 2018) $
-# $LastChangedBy: danielsh $
-# $LastChangedRevision: 1824690 $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py $
+# $LastChangedDate: 2020-01-07 01:08:27 +0000 (Tue, 07 Jan 2020) $
+# $LastChangedBy: futatuki $
+# $LastChangedRevision: 1872403 $
 #
 # USAGE: mailer.py commit      REPOS REVISION [CONFIG-FILE]
 #        mailer.py propchange  REPOS REVISION AUTHOR REVPROPNAME [CONFIG-FILE]
@@ -123,7 +123,7 @@ def main(pool, cmd, config_fname, repos_dir, cmd_args):
   else:
     raise UnknownSubcommand(cmd)
 
-  messenger.generate()
+  return messenger.generate()
 
 
 def remove_leading_slashes(path):
@@ -285,15 +285,73 @@ class SMTPOutput(MailedOutput):
     self.write(self.mail_headers(group, params))
 
   def finish(self):
-    if self.cfg.is_set('general.smtp_ssl') and self.cfg.general.smtp_ssl == 'yes':
-      server = smtplib.SMTP_SSL(self.cfg.general.smtp_hostname)
+    """
+    Send email via SMTP or SMTP_SSL, logging in if username is
+    specified.
+
+    Errors such as invalid recipient, which affect a particular email,
+    are reported to stderr and raise MessageSendFailure. If the caller
+    has other emails to send, it may continue doing so.
+
+    Errors caused by bad configuration, such as login failures, for
+    which too many occurrences could lead to SMTP server lockout, are
+    reported to stderr and re-raised. These should be considered fatal
+    (to minimize the chances of said lockout).
+    """
+
+    if self.cfg.is_set('general.smtp_port'):
+       smtp_port = self.cfg.general.smtp_port
     else:
-      server = smtplib.SMTP(self.cfg.general.smtp_hostname)
-    if self.cfg.is_set('general.smtp_username'):
-      server.login(self.cfg.general.smtp_username,
-                   self.cfg.general.smtp_password)
-    server.sendmail(self.from_addr, self.to_addrs, self.buffer.getvalue())
-    server.quit()
+       smtp_port = 0
+    try:
+      if self.cfg.is_set('general.smtp_ssl') and self.cfg.general.smtp_ssl == 'yes':
+        server = smtplib.SMTP_SSL(self.cfg.general.smtp_hostname, smtp_port)
+      else:
+        server = smtplib.SMTP(self.cfg.general.smtp_hostname, smtp_port)
+    except Exception as detail:
+      sys.stderr.write("mailer.py: Failed to instantiate SMTP object: %s\n" % (detail,))
+      # Any error to instantiate is fatal
+      raise
+
+    try:
+      if self.cfg.is_set('general.smtp_username'):
+        try:
+          server.login(self.cfg.general.smtp_username,
+                       self.cfg.general.smtp_password)
+        except smtplib.SMTPException as detail:
+          sys.stderr.write("mailer.py: SMTP login failed with username %s and/or password: %s\n"
+                           % (self.cfg.general.smtp_username, detail,))
+          # Any error at login is fatal
+          raise
+
+      server.sendmail(self.from_addr, self.to_addrs, self.buffer.getvalue())
+
+    ### TODO: 'raise .. from' is Python 3+. When we convert this
+    ###       script to Python 3, uncomment 'from detail' below
+    ###       (2 instances):
+
+    except smtplib.SMTPRecipientsRefused as detail:
+      sys.stderr.write("mailer.py: SMTP recipient(s) refused: %s: %s\n"
+                           % (self.to_addrs, detail,))
+      raise MessageSendFailure ### from detail
+
+    except smtplib.SMTPSenderRefused as detail:
+      sys.stderr.write("mailer.py: SMTP sender refused: %s: %s\n"
+                           % (self.from_addr, detail,))
+      raise MessageSendFailure ### from detail
+
+    except smtplib.SMTPException as detail:
+      # All other errors are fatal; this includes:
+      # SMTPHeloError, SMTPDataError, SMTPNotSupportedError
+      sys.stderr.write("mailer.py: SMTP error occurred: %s\n" % (detail,))
+      raise
+
+    finally:
+      try:
+        server.quit()
+      except smtplib.SMTPException as detail:
+        sys.stderr.write("mailer.py: Error occurred during SMTP session cleanup: %s\n"
+                             % (detail,))
 
 
 class StandardOutput(OutputBase):
@@ -421,21 +479,26 @@ class Commit(Messenger):
     ### rather than rebuilding it each time.
 
     subpool = svn.core.svn_pool_create(self.pool)
+    ret = 0
 
     # build a renderer, tied to our output stream
     renderer = TextCommitRenderer(self.output)
 
     for (group, param_tuple), (params, paths) in self.groups.items():
-      self.output.start(group, params)
+      try:
+        self.output.start(group, params)
 
-      # generate the content for this group and set of params
-      generate_content(renderer, self.cfg, self.repos, self.changelist,
-                       group, params, paths, subpool)
+        # generate the content for this group and set of params
+        generate_content(renderer, self.cfg, self.repos, self.changelist,
+                         group, params, paths, subpool)
 
-      self.output.finish()
+        self.output.finish()
+      except MessageSendFailure:
+        ret = 1
       svn.core.svn_pool_clear(subpool)
 
     svn.core.svn_pool_destroy(subpool)
+    return ret
 
 
 class PropChange(Messenger):
@@ -456,35 +519,40 @@ class PropChange(Messenger):
 
   def generate(self):
     actions = { 'A': 'added', 'M': 'modified', 'D': 'deleted' }
+    ret = 0
     for (group, param_tuple), params in self.groups.items():
-      self.output.start(group, params)
-      self.output.write('Author: %s\n'
-                        'Revision: %s\n'
-                        'Property Name: %s\n'
-                        'Action: %s\n'
-                        '\n'
-                        % (self.author, self.repos.rev, self.propname,
-                           actions.get(self.action, 'Unknown (\'%s\')' \
-                                       % self.action)))
-      if self.action == 'A' or self.action not in actions:
-        self.output.write('Property value:\n')
-        propvalue = self.repos.get_rev_prop(self.propname)
-        self.output.write(propvalue)
-      elif self.action == 'M':
-        self.output.write('Property diff:\n')
-        tempfile1 = tempfile.NamedTemporaryFile()
-        tempfile1.write(sys.stdin.read())
-        tempfile1.flush()
-        tempfile2 = tempfile.NamedTemporaryFile()
-        tempfile2.write(self.repos.get_rev_prop(self.propname))
-        tempfile2.flush()
-        self.output.run(self.cfg.get_diff_cmd(group, {
-          'label_from' : 'old property value',
-          'label_to' : 'new property value',
-          'from' : tempfile1.name,
-          'to' : tempfile2.name,
-          }))
-      self.output.finish()
+      try:
+        self.output.start(group, params)
+        self.output.write('Author: %s\n'
+                          'Revision: %s\n'
+                          'Property Name: %s\n'
+                          'Action: %s\n'
+                          '\n'
+                          % (self.author, self.repos.rev, self.propname,
+                             actions.get(self.action, 'Unknown (\'%s\')' \
+                                         % self.action)))
+        if self.action == 'A' or self.action not in actions:
+          self.output.write('Property value:\n')
+          propvalue = self.repos.get_rev_prop(self.propname)
+          self.output.write(propvalue)
+        elif self.action == 'M':
+          self.output.write('Property diff:\n')
+          tempfile1 = tempfile.NamedTemporaryFile()
+          tempfile1.write(sys.stdin.read())
+          tempfile1.flush()
+          tempfile2 = tempfile.NamedTemporaryFile()
+          tempfile2.write(self.repos.get_rev_prop(self.propname))
+          tempfile2.flush()
+          self.output.run(self.cfg.get_diff_cmd(group, {
+            'label_from' : 'old property value',
+            'label_to' : 'new property value',
+            'from' : tempfile1.name,
+            'to' : tempfile2.name,
+            }))
+        self.output.finish()
+      except MessageSendFailure:
+        ret = 1
+    return ret
 
 
 def get_commondir(dirlist):
@@ -564,21 +632,26 @@ class Lock(Messenger):
                                        self.dirlist[0], self.pool)
 
   def generate(self):
+    ret = 0
     for (group, param_tuple), (params, paths) in self.groups.items():
-      self.output.start(group, params)
+      try:
+        self.output.start(group, params)
 
-      self.output.write('Author: %s\n'
-                        '%s paths:\n' %
-                        (self.author, self.do_lock and 'Locked' or 'Unlocked'))
+        self.output.write('Author: %s\n'
+                          '%s paths:\n' %
+                          (self.author, self.do_lock and 'Locked' or 'Unlocked'))
 
-      self.dirlist.sort()
-      for dir in self.dirlist:
-        self.output.write('   %s\n\n' % dir)
+        self.dirlist.sort()
+        for dir in self.dirlist:
+          self.output.write('   %s\n\n' % dir)
 
-      if self.do_lock:
-        self.output.write('Comment:\n%s\n' % (self.lock.comment or ''))
+        if self.do_lock:
+          self.output.write('Comment:\n%s\n' % (self.lock.comment or ''))
 
-      self.output.finish()
+        self.output.finish()
+      except MessageSendFailure:
+        ret = 1
+    return ret
 
 
 class DiffSelections:
@@ -1394,6 +1467,8 @@ class UnknownMappingSpec(Exception):
   pass
 class UnknownSubcommand(Exception):
   pass
+class MessageSendFailure(Exception):
+  pass
 
 
 if __name__ == '__main__':
@@ -1455,8 +1530,9 @@ if the property was added, modified or deleted, respectively.
   if not os.path.exists(config_fname):
     raise MissingConfig(config_fname)
 
-  svn.core.run_app(main, cmd, config_fname, repos_dir,
-                   sys.argv[3:3+expected_args])
+  ret = svn.core.run_app(main, cmd, config_fname, repos_dir,
+                         sys.argv[3:3+expected_args])
+  sys.exit(1 if ret else 0)
 
 # ------------------------------------------------------------------------
 # TODO
diff --git a/tools/hook-scripts/svn2feed.py b/tools/hook-scripts/svn2feed.py
index e2fe2f3..9e21f9c 100755
--- a/tools/hook-scripts/svn2feed.py
+++ b/tools/hook-scripts/svn2feed.py
@@ -70,7 +70,7 @@ Options:
 #   is actually set only on initial feed creation, and thereafter simply
 #   re-used from the pickle each time.
 
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/hook-scripts/svn2feed.py $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/tools/hook-scripts/svn2feed.py $
 # $LastChangedDate: 2016-04-30 08:16:53 +0000 (Sat, 30 Apr 2016) $
 # $LastChangedBy: stefan2 $
 # $LastChangedRevision: 1741723 $
diff --git a/tools/hook-scripts/svnperms.py b/tools/hook-scripts/svnperms.py
index f029db0..7655ca5 100755
--- a/tools/hook-scripts/svnperms.py
+++ b/tools/hook-scripts/svnperms.py
@@ -21,7 +21,7 @@
 #
 #
 
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/hook-scripts/svnperms.py $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/tools/hook-scripts/svnperms.py $
 # $LastChangedDate: 2016-04-30 08:16:53 +0000 (Sat, 30 Apr 2016) $
 # $LastChangedBy: stefan2 $
 # $LastChangedRevision: 1741723 $
diff --git a/tools/hook-scripts/validate-files.py b/tools/hook-scripts/validate-files.py
index 7169251..7f58ad8 100755
--- a/tools/hook-scripts/validate-files.py
+++ b/tools/hook-scripts/validate-files.py
@@ -19,7 +19,13 @@
 """Subversion pre-commit hook script that runs user configured commands
 to validate files in the commit and reject the commit if the commands
 exit with a non-zero exit code.  The script expects a validate-files.conf
-file placed in the conf dir under the repo the commit is for."""
+file placed in the conf dir under the repo the commit is for.
+
+Note: As changed file paths $FILE are always represented as a Unicode (Py3)
+      or UTF-8 (Py2) strings, you might need to set apropriate locale and
+      PYTHONIOENCODING environment variable for this script and
+      commands to handle non-ascii path and command outputs, especially
+      you want to use svnlook cat command to inspect file contents."""
 
 import sys
 import os
@@ -30,11 +36,13 @@ import fnmatch
 try:
     # Python >= 3.0
     import configparser
+    ConfigParser = configparser.ConfigParser
 except ImportError:
     # Python < 3.0
     import ConfigParser as configparser
+    ConfigParser = configparser.SafeConfigParser
 
-class Config(configparser.SafeConfigParser):
+class Config(ConfigParser):
     """Superclass of SafeConfigParser with some customizations
     for this script"""
     def optionxform(self, option):
@@ -80,18 +88,26 @@ class Commands:
             line = p.stdout.readline()
             if not line:
                 break
-            line = line.decode().strip()
+            line = line.strip()
             text_mod = line[0:1]
             # Only if the contents of the file changed (by addition or update)
             # directories always end in / in the svnlook changed output
-            if line[-1] != "/" and (text_mod == "A" or text_mod == "U"):
-                changed.append(line[4:])
+            if line[-1:] != b"/" and (text_mod == b"A" or text_mod == b"U"):
+                changed_path = line[4:]
+                if not isinstance(changed_path, str):
+                    # svnlook always uses UTF-8 for internal path
+                    changed_path = changed_path.decode('utf-8')
+                changed.append(changed_path)
 
         # wait on the command to finish so we can get the
         # returncode/stderr output
         data = p.communicate()
         if p.returncode != 0:
-            sys.stderr.write(data[1].decode())
+            err_mesg = data[1]
+            if sys.stderr.encoding:
+                err_mesg =err_mesg.decode(sys.stderr.encoding,
+                                          'backslashreplace')
+            sys.stderr.write(err_mesg)
             sys.exit(2)
 
         return changed
@@ -109,7 +125,11 @@ class Commands:
         cmd_env['FILE'] = fn
         p = subprocess.Popen(cmd, shell=True, env=cmd_env, stderr=subprocess.PIPE)
         data = p.communicate()
-        return (p.returncode, data[1].decode())
+        err_mesg = data[1]
+        if sys.stderr.encoding:
+            err_mesg = err_mesg.decode(sys.stderr.encoding,
+                                       'backslashreplace')
+        return (p.returncode, err_mesg)
 
 def main(repo, txn):
     exitcode = 0
diff --git a/tools/server-side/fsfs-reshard.py b/tools/server-side/fsfs-reshard.py
index d491c51..025e866 100755
--- a/tools/server-side/fsfs-reshard.py
+++ b/tools/server-side/fsfs-reshard.py
@@ -46,7 +46,7 @@
 #    under the License.
 # ====================================================================
 #
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/server-side/fsfs-reshard.py $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/tools/server-side/fsfs-reshard.py $
 # $LastChangedDate: 2016-04-30 08:16:53 +0000 (Sat, 30 Apr 2016) $
 # $LastChangedBy: stefan2 $
 # $LastChangedRevision: 1741723 $
diff --git a/tools/server-side/svn-backup-dumps.py b/tools/server-side/svn-backup-dumps.py
index 2f3a231..e7a1a26 100755
--- a/tools/server-side/svn-backup-dumps.py
+++ b/tools/server-side/svn-backup-dumps.py
@@ -377,38 +377,48 @@ class SvnBackup:
             return self.exec_cmd_unix(cmd, output, printerr)
 
     def exec_cmd_unix(self, cmd, output=None, printerr=False):
+        if printerr:
+            if sys.hexversion >= 0x3000000:
+                sys.stdout.flush()
+                errout = sys.stdout.buffer
+            else:
+                errout = sys.stdout
+        else:
+            errout = PIPE
         try:
-            proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
+            proc = Popen(cmd, stdout=PIPE, stderr=errout, shell=False)
         except:
             return (256, "", "Popen failed (%s ...):\n  %s" % (cmd[0],
                     str(sys.exc_info()[1])))
-        stdout = proc.stdout
-        stderr = proc.stderr
-        self.set_nonblock(stdout)
-        self.set_nonblock(stderr)
-        readfds = [ stdout, stderr ]
-        selres = select.select(readfds, [], [])
-        bufout = ""
-        buferr = ""
-        while len(selres[0]) > 0:
-            for fd in selres[0]:
-                buf = fd.read(16384)
-                if len(buf) == 0:
-                    readfds.remove(fd)
-                elif fd == stdout:
-                    if output:
+        if output is None:
+            bufout, buferr = proc.communicate()
+            rc = proc.returncode
+            if buferr is None:
+                buferr = b""
+        else:
+            stdout = proc.stdout
+            self.set_nonblock(stdout)
+            readfds = [ stdout ]
+            if not printerr:
+                stderr = proc.stderr
+                self.set_nonblock(stderr)
+                readfds.append(stderr)
+            selres = select.select(readfds, [], [])
+            bufout = b""
+            buferr = b""
+            while len(selres[0]) > 0:
+                for fd in selres[0]:
+                    buf = fd.read(16384)
+                    if len(buf) == 0:
+                        readfds.remove(fd)
+                    elif fd == stdout:
                         output.write(buf)
                     else:
-                        bufout += buf
-                else:
-                    if printerr:
-                        sys.stdout.write("%s " % buf)
-                    else:
                         buferr += buf
-            if len(readfds) == 0:
-                break
-            selres = select.select(readfds, [], [])
-        rc = proc.wait()
+                if len(readfds) == 0:
+                    break
+                selres = select.select(readfds, [], [])
+            rc = proc.wait()
         if printerr:
             print("")
         return (rc, bufout, buferr)
@@ -420,8 +430,8 @@ class SvnBackup:
             return (256, "", "Popen failed (%s ...):\n  %s" % (cmd[0],
                     str(sys.exc_info()[1])))
         stdout = proc.stdout
-        bufout = ""
-        buferr = ""
+        bufout = b""
+        buferr = b""
         buf = stdout.read(16384)
         while len(buf) > 0:
             if output:
diff --git a/win-tests.py b/win-tests.py
index a0bdfa6..2c91acb 100644
--- a/win-tests.py
+++ b/win-tests.py
@@ -24,7 +24,7 @@ Driver for running the tests on Windows.
 For a list of options, run this script with the --help option.
 """
 
-# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/win-tests.py $
+# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.14.x/win-tests.py $
 # $LastChangedRevision: 1813897 $
 
 import os, sys, subprocess